Place SNS records on queue

Author: stevebux

lambdas/allocation/src/__tests__/allocator.test.ts

@@ -79,7 +79,7 @@ describe("allocator", () => {
   });
 
   describe("createAllocator", () => {
-    it("should process a single SNS record and send message to SQS", async () => {
+    it("should place the SNS event unchanged on the SQS queue", async () => {
       const letterEvent = createLetterEvent("id1");
       const snsEvent = createSNSEvent([
         createSNSEventRecord(JSON.stringify(letterEvent)),
@@ -92,8 +92,8 @@ describe("allocator", () => {
         expect.objectContaining({
           input: {
             QueueUrl: mockQueueUrl,
-            MessageBody: JSON.stringify(letterEvent),
-            MessageGroupId: "id1",
+            MessageBody: JSON.stringify(snsEvent.Records[0]),
+            MessageGroupId: expect.any(String),
           },
         }),
       );
@@ -120,8 +120,8 @@ describe("allocator", () => {
         expect.objectContaining({
           input: {
             QueueUrl: mockQueueUrl,
-            MessageBody: JSON.stringify(letterEvent1),
-            MessageGroupId: "id1",
+            MessageBody: JSON.stringify(snsEvent.Records[0]),
+            MessageGroupId: expect.any(String),
           },
         }),
       );
@@ -130,8 +130,8 @@ describe("allocator", () => {
         expect.objectContaining({
           input: {
             QueueUrl: mockQueueUrl,
-            MessageBody: JSON.stringify(letterEvent2),
-            MessageGroupId: "id2",
+            MessageBody: JSON.stringify(snsEvent.Records[1]),
+            MessageGroupId: expect.any(String),
           },
         }),
       );
@@ -140,8 +140,8 @@ describe("allocator", () => {
         expect.objectContaining({
           input: {
             QueueUrl: mockQueueUrl,
-            MessageBody: JSON.stringify(letterEvent3),
-            MessageGroupId: "id3",
+            MessageBody: JSON.stringify(snsEvent.Records[2]),
+            MessageGroupId: expect.any(String),
           },
         }),
       );

lambdas/allocation/src/allocator.ts

@@ -1,18 +1,16 @@
 import { SNSEvent, SNSEventRecord, SNSHandler } from "aws-lambda";
 import { SendMessageCommand } from "@aws-sdk/client-sqs";
-import {
-  $LetterEvent,
-  LetterEvent,
-} from "@nhsdigital/nhs-notify-event-schemas-supplier-api/src";
+import { randomUUID } from "node:crypto";
+
 import { Deps } from "./deps";
 
 export default function createAllocator(deps: Deps): SNSHandler {
   return async (event: SNSEvent): Promise<void> => {
     // Allocation will be done under a future ticket. For now, just place events on the queue,
     // adding a message group ID to permit the use of a FIFO queue
     const sqsCommands: SendMessageCommand[] = event.Records.map((record) =>
-      extractLetterEvent(record),
-    ).map((letterEvent) => buildSendMessageCommand(letterEvent, deps.queueUrl));
+      buildSendMessageCommand(record, deps.queueUrl),
+    );
 
     for (const sqsCommand of sqsCommands) {
       deps.logger.info({
@@ -24,14 +22,12 @@ export default function createAllocator(deps: Deps): SNSHandler {
   };
 }
 
-function extractLetterEvent(record: SNSEventRecord): LetterEvent {
-  return $LetterEvent.parse(JSON.parse(record.Sns.Message));
-}
-
-function buildSendMessageCommand(letterEvent: LetterEvent, queueUrl: string) {
+function buildSendMessageCommand(snsRecord: SNSEventRecord, queueUrl: string) {
   return new SendMessageCommand({
     QueueUrl: queueUrl,
-    MessageBody: JSON.stringify(letterEvent),
-    MessageGroupId: letterEvent.data.domainId,
+    MessageBody: JSON.stringify(snsRecord),
+    // Using a random UUID here effectively means that the amendments queue is not FIFO for new pending
+    // letters. Pragmatically this is OK because we shouldn't be getting updates from the supplier yet.
+    MessageGroupId: randomUUID(),
   });
 }