CCM-12858: lint fixes

Author: nhsd-angel-pastor

lambdas/core-notifier-lambda/src/__tests__/apis/sqs-handler.test.ts

@@ -5,7 +5,7 @@ import { PDMResourceAvailable } from 'digital-letters-events';
 import { NotifyMessageProcessor } from 'app/notify-message-processor';
 import { SenderManagement } from 'sender-management';
 import { EventPublisherFacade } from 'infra/event-publisher-facade';
-import { createHandler, SqsHandlerDependencies } from 'apis/sqs-handler';
+import { SqsHandlerDependencies, createHandler } from 'apis/sqs-handler';
 import { parseSqsRecord } from 'app/parse-sqs-message';
 import { InvalidPdmResourceAvailableEvent } from 'domain/invalid-pdm-resource-available-event';
 import { RequestNotifyError } from 'domain/request-notify-error';
@@ -165,7 +165,7 @@ describe('createHandler', () => {
     it('marks the message as failed for retry', async () => {
       const sqsEvent = createSqsEvent(1);
       const handler = createHandler(dependencies);
-      const messageId = sqsEvent.Records[0].messageId;
+      const { messageId } = sqsEvent.Records[0];
 
       mockParseSqsRecord.mockImplementationOnce(() => {
         throw new InvalidPdmResourceAvailableEvent(messageId);
@@ -191,7 +191,7 @@ describe('createHandler', () => {
     it('marks the message as failed for retry since error lacks messageReference', async () => {
       const sqsEvent = createSqsEvent(1);
       const handler = createHandler(dependencies);
-      const messageId = sqsEvent.Records[0].messageId;
+      const { messageId } = sqsEvent.Records[0];
       const errorCode = 'VALIDATION_ERROR';
       const correlationId = 'corr-123';
       const error = new RequestNotifyError(
@@ -224,7 +224,7 @@ describe('createHandler', () => {
     it('publishes rejected event when error has messageReference property', async () => {
       const sqsEvent = createSqsEvent(1);
       const handler = createHandler(dependencies);
-      const messageId = sqsEvent.Records[0].messageId;
+      const { messageId } = sqsEvent.Records[0];
       const errorCode = 'VALIDATION_ERROR';
       const correlationId = 'corr-123';
       const error = new RequestNotifyError(
@@ -269,7 +269,7 @@ describe('createHandler', () => {
     it('marks the message as failed for retry', async () => {
       const sqsEvent = createSqsEvent(1);
       const handler = createHandler(dependencies);
-      const messageId = sqsEvent.Records[0].messageId;
+      const { messageId } = sqsEvent.Records[0];
       const error = new Error('Unexpected error');
 
       mockParseSqsRecord.mockReturnValueOnce(mockPdmEvent);
@@ -325,7 +325,7 @@ describe('createHandler', () => {
 
       mockParseSqsRecord.mockReturnValueOnce(mockPdmEvent);
       mockSenderManagement.getSender.mockReturnValueOnce(mockSender);
-      mockNotifyMessageProcessor.process.mockResolvedValueOnce(undefined);
+      mockNotifyMessageProcessor.process.mockResolvedValueOnce();
 
       const result = await handler(sqsEvent);
 

lambdas/core-notifier-lambda/src/__tests__/app/notify-api-client.test.ts

@@ -10,7 +10,6 @@ import type { Logger } from 'utils';
 import { mockRequest1, mockResponse } from '__tests__/constants';
 import { IAccessTokenRepository, NotifyClient } from 'app/notify-api-client';
 import { RequestAlreadyReceivedError } from 'domain/request-already-received-error';
-import { RequestNotifyError } from 'domain/request-notify-error';
 
 jest.mock('utils');
 jest.mock('node:crypto');

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

@@ -5,15 +5,15 @@ import { parseSqsRecord } from 'app/parse-sqs-message';
 import { InvalidPdmResourceAvailableEvent } from 'domain/invalid-pdm-resource-available-event';
 import { PDMResourceAvailable } from 'digital-letters-events';
 
+// Import the mocked validator after the mock setup
+import { messageDownloadedValidator } from 'digital-letters-events/PDMResourceAvailable.js';
+
 jest.mock('digital-letters-events/PDMResourceAvailable.js', () => ({
   messageDownloadedValidator: jest.fn(),
 }));
 
 const mockLogger = mock<Logger>();
 
-// Import the mocked validator after the mock setup
-const { messageDownloadedValidator } = require('digital-letters-events/PDMResourceAvailable.js');
-
 describe('parseSqsRecord', () => {
   const messageId = 'test-message-id-123';
   const validPdmEvent: PDMResourceAvailable = {
@@ -89,7 +89,7 @@ describe('parseSqsRecord', () => {
         },
       ];
       (messageDownloadedValidator as jest.Mock).mockReturnValueOnce(false);
-      (messageDownloadedValidator as any).errors = validationErrors;
+      messageDownloadedValidator.errors = validationErrors;
 
       expect(() => parseSqsRecord(sqsRecord, mockLogger)).toThrow(
         InvalidPdmResourceAvailableEvent,

lambdas/core-notifier-lambda/src/__tests__/index.test.ts

@@ -8,78 +8,63 @@ import { mock } from 'jest-mock-extended';
 jest.mock('container');
 jest.mock('apis/sqs-handler');
 
+const createSqsEvent = (recordCount: number): SQSEvent => ({
+  Records: Array.from(
+    { length: recordCount },
+    (_, i): SQSRecord => ({
+      messageId: `message-id-${i + 1}`,
+      receiptHandle: `receipt-handle-${i + 1}`,
+      body: JSON.stringify({
+        detail: {
+          id: `event-id-${i + 1}`,
+          source: 'test',
+          specversion: '1.0',
+          type: 'test.event',
+          time: '2025-12-16T10:00:00Z',
+          datacontenttype: 'application/json',
+          data: {},
+        },
+      }),
+      attributes: {
+        ApproximateReceiveCount: '1',
+        SentTimestamp: '1234567890',
+        SenderId: 'sender-id',
+        ApproximateFirstReceiveTimestamp: '1234567890',
+      },
+      messageAttributes: {},
+      md5OfBody: 'md5',
+      eventSource: 'aws:sqs',
+      eventSourceARN: 'arn:aws:sqs:region:account:queue',
+      awsRegion: 'eu-west-2',
+    }),
+  ),
+});
+
 describe('Lambda handler', () => {
   const mockContainer = mock<SqsHandlerDependencies>();
   const mockSqsHandler = jest.fn();
   const mockCreateContainer = jest.mocked(createContainer);
   const mockCreateSqsHandler = jest.mocked(createSqsHandler);
 
-  const createSqsEvent = (recordCount: number): SQSEvent => ({
-    Records: Array.from(
-      { length: recordCount },
-      (_, i): SQSRecord => ({
-        messageId: `message-id-${i + 1}`,
-        receiptHandle: `receipt-handle-${i + 1}`,
-        body: JSON.stringify({
-          detail: {
-            id: `event-id-${i + 1}`,
-            source: 'test',
-            specversion: '1.0',
-            type: 'test.event',
-            time: '2025-12-16T10:00:00Z',
-            datacontenttype: 'application/json',
-            data: {},
-          },
-        }),
-        attributes: {
-          ApproximateReceiveCount: '1',
-          SentTimestamp: '1234567890',
-          SenderId: 'sender-id',
-          ApproximateFirstReceiveTimestamp: '1234567890',
-        },
-        messageAttributes: {},
-        md5OfBody: 'md5',
-        eventSource: 'aws:sqs',
-        eventSourceARN: 'arn:aws:sqs:region:account:queue',
-        awsRegion: 'eu-west-2',
-      }),
-    ),
-  });
-
   beforeEach(() => {
     jest.clearAllMocks();
     mockCreateContainer.mockResolvedValue(mockContainer);
     mockCreateSqsHandler.mockReturnValue(mockSqsHandler);
     mockSqsHandler.mockResolvedValue({ batchItemFailures: [] });
   });
 
-  it('creates a container', async () => {
-    const sqsEvent = createSqsEvent(1);
-
-    await handler(sqsEvent);
-
-    expect(mockCreateContainer).toHaveBeenCalledTimes(1);
-  });
-
-  it('creates an SQS handler with the container dependencies', async () => {
+  it('creates an SQS handler with the container dependencies and handler being invoked', async () => {
     const sqsEvent = createSqsEvent(1);
 
     await handler(sqsEvent);
 
     expect(mockCreateSqsHandler).toHaveBeenCalledTimes(1);
     expect(mockCreateSqsHandler).toHaveBeenCalledWith(mockContainer);
-  });
-
-  it('invokes the SQS handler with the event', async () => {
-    const sqsEvent = createSqsEvent(2);
-
-    await handler(sqsEvent);
-
     expect(mockSqsHandler).toHaveBeenCalledTimes(1);
     expect(mockSqsHandler).toHaveBeenCalledWith(sqsEvent);
   });
 
-  it('returns the result from the SQS handler', async () => {
+  it('when fails to process a message it returns the id of the failed message', async () => {
     const sqsEvent = createSqsEvent(1);
     const expectedResult = {
       batchItemFailures: [{ itemIdentifier: 'message-id-1' }],

lambdas/core-notifier-lambda/src/__tests__/infra/config.test.ts

@@ -1,4 +1,4 @@
-import { loadConfig, NotifySendMessageConfig } from 'infra/config';
+import { NotifySendMessageConfig, loadConfig } from 'infra/config';
 import { defaultConfigReader } from 'utils';
 
 jest.mock('utils', () => ({
@@ -40,10 +40,7 @@ describe('loadConfig', () => {
       1,
       'EVENT_PUBLISHER_EVENT_BUS_ARN',
     );
-    expect(mockGetValue).toHaveBeenNthCalledWith(
-      2,
-      'EVENT_PUBLISHER_DLQ_URL',
-    );
+    expect(mockGetValue).toHaveBeenNthCalledWith(2, 'EVENT_PUBLISHER_DLQ_URL');
     expect(mockGetValue).toHaveBeenNthCalledWith(
       3,
       'APIM_ACCESS_TOKEN_SSM_PARAMETER_NAME',

lambdas/core-notifier-lambda/src/app/notify-api-client.ts

@@ -1,4 +1,4 @@
-import axios, { Axios, AxiosInstance, isAxiosError } from 'axios';
+import axios, { AxiosInstance, isAxiosError } from 'axios';
 import type { AxiosError } from 'axios';
 import type { Readable } from 'node:stream';
 import { constants as HTTP2_CONSTANTS } from 'node:http2';

lambdas/core-notifier-lambda/src/app/notify-message-processor.ts

@@ -3,7 +3,6 @@ import type { NotifyClient } from 'app/notify-api-client';
 import type { SingleMessageRequest } from 'domain/request';
 import { RequestAlreadyReceivedError } from 'domain/request-already-received-error';
 import { EventPublisherFacade } from 'infra/event-publisher-facade';
-import { RequestNotifyError } from 'domain/request-notify-error';
 
 type Dependencies = {
   nhsNotifyClient: NotifyClient;
@@ -42,7 +41,7 @@ export class NotifyMessageProcessor {
         this.logger.info('Request has already been received by Notify', {
           messageReference,
         });
-        return;
+        return undefined;
       }
 
       this.logger.error('Failed processing request', {

lambdas/core-notifier-lambda/src/domain/mapper.ts

@@ -58,7 +58,8 @@ export function mapPdmEventToMessageRequestSubmitted(
     time: new Date().toISOString(),
     recordedtime: new Date().toISOString(),
     type: 'uk.nhs.notify.digital.letters.messages.request.submitted.v1',
-    dataschema: 'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-message-request-submitted-data.schema.json',
+    dataschema:
+      'https://notify.nhs.uk/cloudevents/schemas/digital-letters/2025-10-draft/data/digital-letters-message-request-submitted-data.schema.json',
     source: pdmResourceAvailable.source.replace(/\/pdm$/, '/messages'),
     data: {
       messageReference,