get unit tests to pass

Author: Vlasis-Perdikidis

lambdas/supplier-allocator/src/handler/__tests__/allocate-handler.test.ts

@@ -69,7 +69,7 @@ function createPreparedV1Event(
       requestItemId: "requestItem1",
       requestItemPlanId: "requestItemPlan1",
       clientId: "client1",
-      campaignId: "campaign1",
+      campaignId: overrides.campaignId ?? "campaign1",
       templateId: "template1",
       url: overrides.url ?? "s3://letterDataBucket/letter1.pdf",
       sha256Hash:
@@ -230,6 +230,37 @@ describe("createSupplierAllocatorHandler", () => {
     });
   });
 
+  test("parses SNS notification and sends message to SQS queue for v2 event without a campaignId", async () => {
+    const preparedEvent = createPreparedV2Event({ campaignId: "" });
+    const evt: SQSEvent = createSQSEvent([
+      createSqsRecord("msg1", JSON.stringify(preparedEvent)),
+    ]);
+
+    setupDefaultMocks();
+    process.env.UPSERT_LETTERS_QUEUE_URL = "https://sqs.test.queue";
+
+    const handler = createSupplierAllocatorHandler(mockedDeps);
+    const result = await handler(evt, {} as any, {} as any);
+
+    expect(result).toBeDefined();
+    if (!result) throw new Error("expected BatchResponse, got void");
+
+    expect(result.batchItemFailures).toHaveLength(0);
+
+    expect(mockSqsClient.send).toHaveBeenCalledTimes(1);
+    const sendCall = (mockSqsClient.send as jest.Mock).mock.calls[0][0];
+    expect(sendCall).toBeInstanceOf(SendMessageCommand);
+
+    const messageBody = JSON.parse(sendCall.input.MessageBody);
+    expect(messageBody.letterEvent).toEqual(preparedEvent);
+    expect(messageBody.supplierSpec).toEqual({
+      supplierId: "supplier1",
+      specId: "spec1",
+      priority: 1,
+      billingId: "billing1",
+    });
+  });
+
   test("parses SNS notification and sends message to SQS queue for v1 event", async () => {
     const preparedEvent = createPreparedV1Event();
 

lambdas/supplier-allocator/src/handler/allocate-handler.ts

@@ -151,12 +151,12 @@ function emitSupCampaignClientMetric(
   deps: Deps,
 ) {
   const namespace = "supplier-allocator";
-  const clientId = getClientId(letterEvent);
-  const campaignId = getCampaignId(letterEvent);
+  const { campaignId, clientId } = letterEvent.data;
+  console.log("VLASIS and the campaignId is:", campaignId);
   const dimensions: Record<string, string> = {
     Supplier: supplier,
     ClientId: clientId,
-    CampaignId: campaignId,
+    CampaignId: campaignId || "unknown",
   };
   const metric: MetricEntry = {
     key: status,
@@ -166,20 +166,6 @@ function emitSupCampaignClientMetric(
   deps.logger.info(buildEMFObject(namespace, dimensions, metric));
 }
 
-function getClientId(letterEvent: PreparedEvents): string {
-  if (letterEvent && letterEvent.data && letterEvent.data.clientId) {
-    return letterEvent.data.clientId;
-  }
-  return "unknown";
-}
-
-function getCampaignId(letterEvent: PreparedEvents): string {
-  if (letterEvent && letterEvent.data && letterEvent.data.campaignId) {
-    return letterEvent.data.campaignId;
-  }
-  return "unknown";
-}
-
 export default function createSupplierAllocatorHandler(deps: Deps): SQSHandler {
   return async (event: SQSEvent) => {
     const batchItemFailures: SQSBatchItemFailure[] = [];