Unit tests

Author: nhsd-david-wass

lambdas/upsert-letter/src/handler/__tests__/upsert-handler.test.ts

@@ -75,6 +75,48 @@ function createPreparedV1Event(
   };
 }
 
+function createSupplierStatusChangeEventWithoutSupplier(
+  overrides: Partial<any> = {},
+): LetterEvent {
+  const now = new Date().toISOString();
+
+  return $LetterEvent.parse({
+    data: {
+      domainId: overrides.domainId ?? "f47ac10b-58cc-4372-a567-0e02b2c3d479",
+      groupId: "client_template",
+      origin: {
+        domain: "letter-rendering",
+        event: "f47ac10b-58cc-4372-a567-0e02b2c3d479",
+        source: "/data-plane/letter-rendering/prod/render-pdf",
+        subject:
+          "client/00f3b388-bbe9-41c9-9e76-052d37ee8988/letter-request/0o5Fs0EELR0fUjHjbCnEtdUwQe4_0o5Fs0EELR0fUjHjbCnEtdUwQe5",
+      },
+      reasonCode: "R07",
+      reasonText: "No such address",
+      specificationId: "1y3q9v1zzzz",
+      billingRef: "1y3q9v1zzzz",
+      status: "RETURNED",
+      supplierId: "",
+    },
+    datacontenttype: "application/json",
+    dataschema:
+      "https://notify.nhs.uk/cloudevents/schemas/supplier-api/letter.RETURNED.1.0.0.schema.json",
+    dataschemaversion: "1.0.0",
+    id: overrides.id ?? "23f1f09c-a555-4d9b-8405-0b33490bc920",
+    plane: "data",
+    recordedtime: now,
+    severitynumber: 2,
+    severitytext: "INFO",
+    source: "/data-plane/supplier-api/prod/update-status",
+    specversion: "1.0",
+    subject:
+      "letter-origin/letter-rendering/letter/f47ac10b-58cc-4372-a567-0e02b2c3d479",
+    time: now,
+    traceparent: "00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01",
+    type: "uk.nhs.notify.supplier-api.letter.RETURNED.v1",
+  });
+}
+
 function createPreparedV2Event(
   overrides: Partial<any> = {},
 ): LetterRequestPreparedEventV2 {
@@ -129,6 +171,26 @@ function createSupplierStatusChangeEvent(
   });
 }
 
+// Mock aws-embedded-metrics
+let mockMetrics: any;
+jest.mock("aws-embedded-metrics", () => ({
+  metricScope: (
+    handler: (metrics: any) => (event: SQSEvent) => Promise<any>,
+  ) => {
+    return async (event: SQSEvent) => {
+      mockMetrics = {
+        setNamespace: jest.fn(),
+        putDimensions: jest.fn(),
+        putMetric: jest.fn(),
+      };
+      return handler(mockMetrics)(event);
+    };
+  },
+  Unit: {
+    Count: "Count",
+  },
+}));
+
 describe("createUpsertLetterHandler", () => {
   const mockedDeps: jest.Mocked<Deps> = {
     letterRepo: {
@@ -213,6 +275,40 @@ describe("createUpsertLetterHandler", () => {
     expect(updatedLetter.reasonCode).toBe("R07");
     expect(updatedLetter.reasonText).toBe("No such address");
     expect(updatedLetter.supplierId).toBe("supplier1");
+    expect(mockMetrics.setNamespace).toHaveBeenCalledWith("upsertLetter");
+    expect(mockMetrics.putDimensions).toHaveBeenCalledWith({
+      Supplier: "supplier1",
+    });
+    expect(mockMetrics.putMetric).toHaveBeenCalledWith(
+      "MessagesProcessed",
+      3,
+      "Count",
+    );
+  });
+
+  test("unknown supplier has metric emitted with 'unknown' supplier dimension", async () => {
+    const letterEvent = createSupplierStatusChangeEventWithoutSupplier();
+
+    const message = {
+      letterEvent,
+      operationType: "uk.nhs.notify.supplier-api.letter.RETURNED.v1",
+      supplierSpec: undefined,
+    };
+    const evt: SQSEvent = createSQSEvent([
+      createSqsRecord("unknown-supplier", JSON.stringify(message)),
+    ]);
+
+    await createUpsertLetterHandler(mockedDeps)(evt, {} as any, {} as any);
+
+    expect(mockMetrics.setNamespace).toHaveBeenCalledWith("upsertLetter");
+    expect(mockMetrics.putDimensions).toHaveBeenCalledWith({
+      Supplier: "unknown",
+    });
+    expect(mockMetrics.putMetric).toHaveBeenCalledWith(
+      "MessagesProcessed",
+      1,
+      "Count",
+    );
   });
 
   test("invalid JSON produces batch failure and logs error", async () => {
@@ -235,6 +331,15 @@ describe("createUpsertLetterHandler", () => {
       "Error processing upsert of record bad-json",
     );
     expect(mockedDeps.letterRepo.putLetter).not.toHaveBeenCalled();
+    expect(mockMetrics.setNamespace).toHaveBeenCalledWith("upsertLetter");
+    expect(mockMetrics.putDimensions).toHaveBeenCalledWith({
+      Supplier: "unknown",
+    });
+    expect(mockMetrics.putMetric).toHaveBeenCalledWith(
+      "MessageFailed",
+      1,
+      "Count",
+    );
   });
 
   test("invalid letter event schema produces batch failure", async () => {
@@ -260,6 +365,16 @@ describe("createUpsertLetterHandler", () => {
     expect(result.batchItemFailures).toHaveLength(1);
     expect(result.batchItemFailures[0].itemIdentifier).toBe("bad-schema");
     expect(mockedDeps.letterRepo.putLetter).not.toHaveBeenCalled();
+    expect(mockMetrics.setNamespace).toHaveBeenCalledWith("upsertLetter");
+    expect(mockMetrics.putDimensions).toHaveBeenCalledWith({
+      Supplier: "supplier1",
+    });
+    expect(mockMetrics.putMetric).toHaveBeenCalledWith(
+      "MessageFailed",
+      1,
+      "Count",
+    );
+
   });
 
   test("unknown operation type produces batch failure", async () => {
@@ -283,6 +398,16 @@ describe("createUpsertLetterHandler", () => {
     if (!result) throw new Error("expected BatchResponse, got void");
     expect(result.batchItemFailures).toHaveLength(1);
     expect(result.batchItemFailures[0].itemIdentifier).toBe("unknown-op");
+
+    expect(mockMetrics.setNamespace).toHaveBeenCalledWith("upsertLetter");
+    expect(mockMetrics.putDimensions).toHaveBeenCalledWith({
+      Supplier: "supplier1",
+    });
+    expect(mockMetrics.putMetric).toHaveBeenCalledWith(
+      "MessageFailed",
+      1,
+      "Count",
+    );
   });
 
   test("processes multiple records with mixed results", async () => {

lambdas/upsert-letter/src/handler/upsert-handler.ts

@@ -136,7 +136,6 @@ async function emitMetrics(
   }
 }
 
-
 function getSupplierEventId(letterEvent: any): string {
   if (letterEvent && letterEvent.data && letterEvent.data.supplierId) {
     return letterEvent.data.supplierId;