CCM-12858: WIP fixes

Author: nhsd-angel-pastor

lambdas/core-notifier-lambda/src/__tests__/app/parse-sqs-message.test.ts

@@ -5,13 +5,6 @@ import { parseSqsRecord } from 'app/parse-sqs-message';
 import { InvalidPdmResourceAvailableEvent } from 'domain/invalid-pdm-resource-available-event';
 import { validPdmEvent } from '__tests__/constants';
 
-// Import the mocked validator after the mock setup
-import { messagePDMResourceAvailableValidator } from 'digital-letters-events/PDMResourceAvailable.js';
-
-jest.mock('digital-letters-events/PDMResourceAvailable.js', () => ({
-  messagePDMResourceAvailableValidator: jest.fn(),
-}));
-
 const mockLogger = mock<Logger>();
 
 describe('parseSqsRecord', () => {
@@ -20,9 +13,7 @@ describe('parseSqsRecord', () => {
   const createSqsRecord = (detail: any): SQSRecord => ({
     messageId,
     receiptHandle: 'receipt-handle',
-    body: JSON.stringify({
-      detail,
-    }),
+    body: JSON.stringify(detail),
     attributes: {
       ApproximateReceiveCount: '1',
       SentTimestamp: '1234567890',
@@ -43,56 +34,43 @@ describe('parseSqsRecord', () => {
   describe('when SQS record contains a valid PDMResourceAvailable event', () => {
     it('parses and returns the PDMResourceAvailable event', () => {
       const sqsRecord = createSqsRecord(validPdmEvent);
-      (messagePDMResourceAvailableValidator as jest.Mock).mockReturnValueOnce(
-        true,
-      );
 
       const result = parseSqsRecord(sqsRecord, mockLogger);
 
       expect(result).toEqual(validPdmEvent);
       expect(mockLogger.info).toHaveBeenCalledWith('Parsing SQS Record', {
         messageId,
+        body: sqsRecord.body,
       });
       expect(mockLogger.info).toHaveBeenCalledWith(
         'Parsed valid PDMResourceAvailable Event',
         {
           messageId,
+          messageReference: validPdmEvent.data.messageReference,
+          senderId: validPdmEvent.data.senderId,
+          resourceId: validPdmEvent.data.resourceId,
         },
       );
-      expect(messagePDMResourceAvailableValidator).toHaveBeenCalledWith(
-        validPdmEvent,
-      );
     });
   });
 
   describe('when SQS record contains an invalid PDMResourceAvailable event', () => {
     it('logs error and throws InvalidPdmResourceAvailableEvent', () => {
       const invalidEvent = { ...validPdmEvent, data: {} };
       const sqsRecord = createSqsRecord(invalidEvent);
-      const validationErrors = [
-        {
-          instancePath: '/data',
-          schemaPath: '#/properties/data/required',
-          keyword: 'required',
-          params: { missingProperty: 'senderId' },
-          message: "must have required property 'senderId'",
-        },
-      ];
-      (messagePDMResourceAvailableValidator as jest.Mock).mockReturnValueOnce(
-        false,
-      );
-      messagePDMResourceAvailableValidator.errors = validationErrors;
 
       expect(() => parseSqsRecord(sqsRecord, mockLogger)).toThrow(
         InvalidPdmResourceAvailableEvent,
       );
 
-      expect(mockLogger.error).toHaveBeenCalledWith({
-        err: validationErrors,
-        description:
-          'The SQS message does not contain a valid PDMResourceAvailable event',
-        messageId,
-      });
+      expect(mockLogger.error).toHaveBeenCalledWith(
+        expect.objectContaining({
+          description:
+            'The SQS message does not contain a valid PDMResourceAvailable event',
+          messageId,
+          err: expect.any(Array),
+        }),
+      );
     });
   });
 
@@ -118,6 +96,7 @@ describe('parseSqsRecord', () => {
       expect(() => parseSqsRecord(sqsRecord, mockLogger)).toThrow(SyntaxError);
       expect(mockLogger.info).toHaveBeenCalledWith('Parsing SQS Record', {
         messageId,
+        body: sqsRecord.body,
       });
     });
   });

lambdas/core-notifier-lambda/src/__tests__/constants.ts

@@ -60,19 +60,20 @@ export const mockResponse: SingleMessageResponse = {
 
 export const validPdmEvent: PDMResourceAvailable = {
   id: 'event-id-123',
-  source: 'urn:nhs:names:services:notify:pdm',
+  source:
+    '/nhs/england/notify/development/dev-12345/data-plane/digitalletters/pdm',
   specversion: '1.0',
   type: 'uk.nhs.notify.digital.letters.pdm.resource.available.v1',
   time: '2025-12-15T10:00:00Z',
   datacontenttype: 'application/json',
   subject: 'message-subject-123',
-  traceparent: '00-trace-parent',
+  traceparent: '00-0af7651916cd43dd8448eb211c80319c-b7ad6b7169203331-01',
   recordedtime: '2025-12-15T10:00:00Z',
   severitynumber: 2,
   data: {
     senderId: 'sender-123',
     messageReference: 'msg-ref-123',
-    resourceId: 'ResourceId-123',
+    resourceId: 'f5524783-e5d7-473e-b2a0-29582ff231da',
     nhsNumber: '9991234566',
     odsCode: 'A12345',
   },

lambdas/core-notifier-lambda/src/app/parse-sqs-message.ts

@@ -2,23 +2,20 @@ import { SQSRecord } from 'aws-lambda';
 import { Logger } from 'utils';
 import { PDMResourceAvailable } from 'digital-letters-events';
 import { InvalidPdmResourceAvailableEvent } from 'domain/invalid-pdm-resource-available-event';
-import { messagePDMResourceAvailableValidator } from 'digital-letters-events/PDMResourceAvailable.js';
-
-const eventValidator = messagePDMResourceAvailableValidator as (
-  d: unknown,
-) => d is PDMResourceAvailable;
+import messagePDMResourceAvailableValidator from 'digital-letters-events/PDMResourceAvailable.js';
 
 export const parseSqsRecord = (
   sqsRecord: SQSRecord,
   logger: Logger,
 ): PDMResourceAvailable => {
   logger.info('Parsing SQS Record', {
     messageId: sqsRecord.messageId,
+    body: sqsRecord.body,
   });
+
   const sqsEventBody = JSON.parse(sqsRecord.body);
-  const sqsEventDetail = sqsEventBody.detail;
-  const isEventValid = eventValidator(sqsEventDetail);
-  if (!isEventValid) {
+
+  if (!messagePDMResourceAvailableValidator(sqsEventBody)) {
     logger.error({
       err: messagePDMResourceAvailableValidator.errors,
       description:
@@ -30,7 +27,10 @@ export const parseSqsRecord = (
 
   logger.info('Parsed valid PDMResourceAvailable Event', {
     messageId: sqsRecord.messageId,
+    messageReference: sqsEventBody.data.messageReference,
+    senderId: sqsEventBody.data.senderId,
+    resourceId: sqsEventBody.data.resourceId,
   });
 
-  return sqsEventDetail;
+  return sqsEventBody;
 };