CCM-12858: WIP fixes

Author: nhsd-angel-pastor

infrastructure/terraform/components/dl/lambda_event_source_mapping_core_notifier_lambda.tf

@@ -1,26 +1,10 @@
 resource "aws_lambda_event_source_mapping" "core_notifier_lambda" {
   event_source_arn                   = module.sqs_core_notifier.sqs_queue_arn
   function_name                      = module.core_notifier.function_arn
-  starting_position                  = "TRIM_HORIZON"
-  batch_size                         = 50
-  maximum_batching_window_in_seconds = 10
-  maximum_retry_attempts             = 3
+  batch_size                         = var.queue_batch_size
+  maximum_batching_window_in_seconds = var.queue_batch_window_seconds
 
   function_response_types = [
     "ReportBatchItemFailures"
   ]
-
-  destination_config {
-    on_failure {
-      destination_arn = module.sqs_core_notifier_errors.sqs_queue_arn
-    }
-  }
-
-  filter_criteria {
-    filter {
-      pattern = jsonencode({
-        eventName : ["REMOVE"]
-      })
-    }
-  }
 }

infrastructure/terraform/components/dl/module_lambda_core_notifier.tf

@@ -40,6 +40,7 @@ module "core_notifier" {
     "APIM_ACCESS_TOKEN_SSM_PARAMETER_NAME" = local.apim_access_token_ssm_parameter_name
     "EVENT_PUBLISHER_EVENT_BUS_ARN"        = aws_cloudwatch_event_bus.main.arn
     "EVENT_PUBLISHER_DLQ_URL"              = module.sqs_event_publisher_errors.sqs_queue_url
+    "ENVIRONMENT"                          = var.environment
   }
 }
 

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

@@ -6,10 +6,10 @@ import { InvalidPdmResourceAvailableEvent } from 'domain/invalid-pdm-resource-av
 import { validPdmEvent } from '__tests__/constants';
 
 // Import the mocked validator after the mock setup
-import { messageDownloadedValidator } from 'digital-letters-events/PDMResourceAvailable.js';
+import { messagePDMResourceAvailableValidator } from 'digital-letters-events/PDMResourceAvailable.js';
 
 jest.mock('digital-letters-events/PDMResourceAvailable.js', () => ({
-  messageDownloadedValidator: jest.fn(),
+  messagePDMResourceAvailableValidator: jest.fn(),
 }));
 
 const mockLogger = mock<Logger>();
@@ -43,7 +43,9 @@ describe('parseSqsRecord', () => {
   describe('when SQS record contains a valid PDMResourceAvailable event', () => {
     it('parses and returns the PDMResourceAvailable event', () => {
       const sqsRecord = createSqsRecord(validPdmEvent);
-      (messageDownloadedValidator as jest.Mock).mockReturnValueOnce(true);
+      (messagePDMResourceAvailableValidator as jest.Mock).mockReturnValueOnce(
+        true,
+      );
 
       const result = parseSqsRecord(sqsRecord, mockLogger);
 
@@ -57,7 +59,9 @@ describe('parseSqsRecord', () => {
           messageId,
         },
       );
-      expect(messageDownloadedValidator).toHaveBeenCalledWith(validPdmEvent);
+      expect(messagePDMResourceAvailableValidator).toHaveBeenCalledWith(
+        validPdmEvent,
+      );
     });
   });
 
@@ -74,8 +78,10 @@ describe('parseSqsRecord', () => {
           message: "must have required property 'senderId'",
         },
       ];
-      (messageDownloadedValidator as jest.Mock).mockReturnValueOnce(false);
-      messageDownloadedValidator.errors = validationErrors;
+      (messagePDMResourceAvailableValidator as jest.Mock).mockReturnValueOnce(
+        false,
+      );
+      messagePDMResourceAvailableValidator.errors = validationErrors;
 
       expect(() => parseSqsRecord(sqsRecord, mockLogger)).toThrow(
         InvalidPdmResourceAvailableEvent,

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

@@ -2,7 +2,11 @@ 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 { messageDownloadedValidator } from 'digital-letters-events/PDMResourceAvailable.js';
+import { messagePDMResourceAvailableValidator } from 'digital-letters-events/PDMResourceAvailable.js';
+
+const eventValidator = messagePDMResourceAvailableValidator as (
+  d: unknown,
+) => d is PDMResourceAvailable;
 
 export const parseSqsRecord = (
   sqsRecord: SQSRecord,
@@ -13,10 +17,10 @@ export const parseSqsRecord = (
   });
   const sqsEventBody = JSON.parse(sqsRecord.body);
   const sqsEventDetail = sqsEventBody.detail;
-  const isEventValid = messageDownloadedValidator(sqsEventDetail);
+  const isEventValid = eventValidator(sqsEventDetail);
   if (!isEventValid) {
     logger.error({
-      err: messageDownloadedValidator.errors,
+      err: messagePDMResourceAvailableValidator.errors,
       description:
         'The SQS message does not contain a valid PDMResourceAvailable event',
       messageId: sqsRecord.messageId,
@@ -28,5 +32,5 @@ export const parseSqsRecord = (
     messageId: sqsRecord.messageId,
   });
 
-  return sqsEventDetail as PDMResourceAvailable;
+  return sqsEventDetail;
 };

lambdas/core-notifier-lambda/src/infra/event-publisher-facade.ts

@@ -8,6 +8,18 @@ import messageRequestSubmittedValidator from 'digital-letters-events/MessageRequ
 import messageRequestRejectedValidator from 'digital-letters-events/MessageRequestRejected.js';
 import messageRequestSkippedValidator from 'digital-letters-events/MessageRequestSkipped.js';
 
+const submittedEventValidator = messageRequestSubmittedValidator as (
+  d: unknown,
+) => d is MessageRequestSubmitted;
+
+const rejectedEventValidator = messageRequestRejectedValidator as (
+  d: unknown,
+) => d is MessageRequestRejected;
+
+const skippedEventValidator = messageRequestSkippedValidator as (
+  d: unknown,
+) => d is MessageRequestSkipped;
+
 export class EventPublisherFacade {
   constructor(
     private readonly messageRequestSubmittedEventPublisher: EventPublisher,
@@ -24,7 +36,7 @@ export class EventPublisherFacade {
     );
     this.messageRequestSubmittedEventPublisher.sendEvents<MessageRequestSubmitted>(
       [event],
-      messageRequestSubmittedValidator,
+      submittedEventValidator,
     );
   }
 
@@ -36,7 +48,7 @@ export class EventPublisherFacade {
     );
     this.messageRequestRejectedEventPublisher.sendEvents<MessageRequestRejected>(
       [event],
-      messageRequestRejectedValidator,
+      rejectedEventValidator,
     );
   }
 
@@ -48,7 +60,7 @@ export class EventPublisherFacade {
     );
     this.messageRequestSkippedEventPublisher.sendEvents<MessageRequestSkipped>(
       [event],
-      messageRequestSkippedValidator,
+      skippedEventValidator,
     );
   }
 }