logging and double parse

Author: nhsd-david-wass

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

@@ -222,9 +222,9 @@ describe("createUpsertLetterHandler", () => {
     };
 
     const evt: SQSEvent = createSQSEvent([
-      createSqsRecord("msg1", JSON.stringify(v2message)),
-      createSqsRecord("msg2", JSON.stringify(v1message)),
-      createSqsRecord("msg3", JSON.stringify(updateMessage)),
+      createSqsRecord("msg1", JSON.stringify(JSON.stringify(v2message))),
+      createSqsRecord("msg2", JSON.stringify(JSON.stringify(v1message))),
+      createSqsRecord("msg3", JSON.stringify(JSON.stringify(updateMessage))),
     ]);
 
     const result = await createUpsertLetterHandler(mockedDeps)(
@@ -288,7 +288,10 @@ describe("createUpsertLetterHandler", () => {
       supplierSpec: undefined,
     };
     const evt: SQSEvent = createSQSEvent([
-      createSqsRecord("unknown-supplier", JSON.stringify(message)),
+      createSqsRecord(
+        "unknown-supplier",
+        JSON.stringify(JSON.stringify(message)),
+      ),
     ]);
 
     await createUpsertLetterHandler(mockedDeps)(evt, {} as any, {} as any);
@@ -344,7 +347,7 @@ describe("createUpsertLetterHandler", () => {
     };
 
     const evt: SQSEvent = createSQSEvent([
-      createSqsRecord("bad-event-type", JSON.stringify(message)),
+      createSqsRecord("bad-event-type", JSON.stringify(JSON.stringify(message))),
     ]);
 
     const result = await createUpsertLetterHandler(mockedDeps)(
@@ -373,7 +376,7 @@ describe("createUpsertLetterHandler", () => {
     };
 
     const evt: SQSEvent = createSQSEvent([
-      createSqsRecord("bad-event-type", JSON.stringify(message)),
+      createSqsRecord("bad-event-type", JSON.stringify(JSON.stringify(message))),
     ]);
 
     const result = await createUpsertLetterHandler(mockedDeps)(
@@ -402,7 +405,7 @@ describe("createUpsertLetterHandler", () => {
       supplierSpec: { supplierId: "supplier1", specId: "spec1" },
     };
     const evt: SQSEvent = createSQSEvent([
-      createSqsRecord("bad-event", JSON.stringify(message)),
+      createSqsRecord("bad-event", JSON.stringify(JSON.stringify(message))),
     ]);
 
     const result = await createUpsertLetterHandler(mockedDeps)(
@@ -443,7 +446,7 @@ describe("createUpsertLetterHandler", () => {
     };
 
     const evt: SQSEvent = createSQSEvent([
-      createSqsRecord("bad-event-schema", JSON.stringify(message)),
+      createSqsRecord("bad-event-schema", JSON.stringify(JSON.stringify(message))),
     ]);
 
     const result = await createUpsertLetterHandler(mockedDeps)(
@@ -486,8 +489,8 @@ describe("createUpsertLetterHandler", () => {
       supplierSpec: { supplierId: "supplier1", specId: "spec1" },
     };
     const evt: SQSEvent = createSQSEvent([
-      createSqsRecord("ok-msg", JSON.stringify(message1)),
-      createSqsRecord("fail-msg", JSON.stringify(message2)),
+      createSqsRecord("ok-msg", JSON.stringify(JSON.stringify(message1))),
+      createSqsRecord("fail-msg", JSON.stringify(JSON.stringify(message2))),
     ]);
 
     const result = await createUpsertLetterHandler(mockedDeps)(

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

@@ -175,7 +175,12 @@ export default function createUpsertLetterHandler(deps: Deps): SQSHandler {
       const tasks = event.Records.map(async (record) => {
         let supplier = "unknown";
         try {
-          const queueMessage = JSON.parse(record.body);
+          deps.logger.info({
+            description: "Received message from SQS",
+            messageId: record.messageId,
+            body: record.body,
+          });
+          const queueMessage = JSON.parse(JSON.parse(record.body));
 
           const { letterEvent, supplierSpec } = queueMessage;