use factory pattern for publishing notification

Author: motola

infrastructure/instance/modules/mns_publisher/sqs_test_publish_mns.tf

@@ -4,7 +4,7 @@
 resource "aws_sqs_queue" "mns_test_notification" {
   name                       = "${var.mns_test_notification_name_prefix}-queue"
   fifo_queue                 = false
-  message_retention_seconds  = 14400
+  message_retention_seconds  = 86400
   visibility_timeout_seconds = 300
 }
 

lambdas/mns_publisher/src/mns_test_queue.py

@@ -6,9 +6,9 @@
 
 from common.api_clients.mns_service import MnsService
 from common.api_clients.mns_setup import get_mns_service
+from common.api_clients.mock_mns_service import MockMnsService
 from common.clients import logger
 from create_notification import create_mns_notification
-from mns_test_queue import send_notification_to_test_queue
 
 mns_env = os.getenv("MNS_ENV", "int")
 MNS_TEST_QUEUE_URL = os.getenv("MNS_TEST_QUEUE_URL")
@@ -39,7 +39,7 @@ def process_records(records: list[SQSMessage]) -> dict[str, list]:
     return {"batchItemFailures": batch_item_failures}
 
 
-def process_record(record: SQSMessage, mns_service: MnsService) -> None:
+def process_record(record: SQSMessage, mns_service: MnsService | MockMnsService) -> None:
     """
     Process a single SQS record.
     Args:
@@ -64,14 +64,8 @@ def process_record(record: SQSMessage, mns_service: MnsService) -> None:
         },
     )
 
-    # TODO: Remove when MNS platform authorizes imms-vaccinations-1 event type
-    # Temporary SQS queue for testing MNS notifications until MNS HTTP endpoint is available
-    if MNS_TEST_QUEUE_URL:
-        send_notification_to_test_queue(mns_notification_payload)
-        logger.info("Notification Successfully sent to SQS", extra={"notification_id": notification_id})
-    else:
-        mns_service.publish_notification(mns_notification_payload)
-        logger.info("Successfully created MNS notification", extra={"mns_notification_id": notification_id})
+    mns_service.publish_notification(mns_notification_payload)
+    logger.info("Successfully created MNS notification", extra={"mns_notification_id": notification_id})
 
 
 def extract_trace_ids(record: SQSMessage) -> Tuple[str, str | None]:

lambdas/mns_publisher/src/process_records.py

@@ -5,21 +5,25 @@
 
 from common.api_clients.authentication import AppRestrictedAuth, Service
 from common.api_clients.mns_service import MnsService
+from common.api_clients.mock_mns_service import MockMnsService
 from common.cache import Cache
 
 logging.basicConfig(level=logging.INFO)
 
 
 def get_mns_service(mns_env: str = "int"):
-    boto_config = Config(region_name="eu-west-2")
-    cache = Cache(directory="/tmp")  # NOSONAR(S5443)
-    logging.info("Creating authenticator...")
-    authenticator = AppRestrictedAuth(
-        service=Service.PDS,
-        secret_manager_client=boto3.client("secretsmanager", config=boto_config),
-        environment=mns_env,
-        cache=cache,
-    )
+    if mns_env == "dev":
+        return MockMnsService()
+    else:
+        boto_config = Config(region_name="eu-west-2")
+        cache = Cache(directory="/tmp")  # NOSONAR(S5443)
+        logging.info("Creating authenticator...")
+        authenticator = AppRestrictedAuth(
+            service=Service.PDS,
+            secret_manager_client=boto3.client("secretsmanager", config=boto_config),
+            environment=mns_env,
+            cache=cache,
+        )
 
-    logging.info("Authentication Initiated...")
-    return MnsService(authenticator)
+        logging.info("Authentication Initiated...")
+        return MnsService(authenticator)

lambdas/mns_publisher/tests/test_mns_test_queue.py

@@ -0,0 +1,36 @@
+import json
+import os
+
+import boto3
+
+from common.clients import logger
+
+MNS_TEST_QUEUE_URL = os.getenv("MNS_TEST_QUEUE_URL")
+
+
+class MockMnsService:
+    def __init__(self, queue_url):
+        self.queue_url = queue_url
+        self.sqs_client = self._get_sqs_client()
+        logger.info(f"MockMnsService initialized with queue: {queue_url}")
+
+    def _get_sqs_client(self):
+        return boto3.client("sqs", region_name="eu-west-2")
+
+    def publish_notification(self, mns_payload: dict) -> None:
+        """
+        Send MNS notification payload to test SQS queue as fallback.
+        Args: payload: MNS notification payload
+        """
+        try:
+            response = self._get_sqs_client.send_message(
+                QueueUrl=MNS_TEST_QUEUE_URL,
+                MessageBody=json.dumps(mns_payload),
+                MessageAttributes={"source": {"StringValue": "mns-publisher-lambda", "DataType": "String"}},
+            )
+            logger.info(
+                "Mock MNS: Successfully sent notification to test queue", extra={"message_id": response["MessageId"]}
+            )
+        except Exception:
+            logger.exception("Mock MNS: Failed to send to test SQS queue")
+            raise