[PRMP-1579] Add DLQ to MNS (#558)

* [PRMP-1579] enable MNS on sandbox

* [PRMP-1579] comment out sending message back to MNS queue

* [PRMP-1579] remove method to send back to queue

* [PRMP-1579] raise errors from the service

* [PRMP-1579] remove decorators from handler

* [PRMP-1579] remove if statement in lambda deployment for MNS

* [PRMP-1579] add log for nhs number being processed

* [PRMP-1579] enable MNS subscription for ndrd

* [PRMP-1579] disable MNS subscription on ndrd

* [PRMP-1579] readd decorator

Author: steph-torres-nhs

.github/workflows/base-lambdas-reusable-deploy-all.yml

@@ -437,7 +437,6 @@ jobs:
       AWS_ASSUME_ROLE: ${{ secrets.AWS_ASSUME_ROLE }}
 
   deploy_mns_notification_lambda:
-    if: ${{ ! inputs.is_sandbox }}
     name: Deploy mns notification lambda
     uses: ./.github/workflows/base-lambdas-reusable-deploy.yml
     with:

lambdas/handlers/mns_notification_handler.py

@@ -6,7 +6,6 @@
 from services.process_mns_message_service import MNSNotificationService
 from utils.audit_logging_setup import LoggingService
 from utils.decorators.ensure_env_var import ensure_environment_variables
-from utils.decorators.handle_lambda_exceptions import handle_lambda_exceptions
 from utils.decorators.override_error_check import override_error_check
 from utils.decorators.set_audit_arg import set_request_context_for_logging
 from utils.request_context import request_context
@@ -24,7 +23,6 @@
     ]
 )
 @override_error_check
-@handle_lambda_exceptions
 def lambda_handler(event, context):
     logger.info(f"Received MNS notification event: {event}")
     notification_service = MNSNotificationService()
@@ -38,13 +36,18 @@ def lambda_handler(event, context):
             MNSSQSMessage.model_validate(mns_message)
 
             request_context.patient_nhs_no = mns_message.subject.nhs_number
+            logger.info(
+                f"Processing SQS message for nhs number: {mns_message.subject.nhs_number}"
+            )
 
             if mns_message.type in MNSNotificationTypes.__members__.values():
                 notification_service.handle_mns_notification(mns_message)
 
         except ValidationError as error:
             logger.error("Malformed MNS notification message")
             logger.error(error)
+            raise error
         except Exception as error:
             logger.error(f"Error processing SQS message: {error}.")
+            raise error
         logger.info("Continuing to next message.")

lambdas/services/process_mns_message_service.py

@@ -34,15 +34,20 @@ def handle_mns_notification(self, message: MNSSQSMessage):
                     logger.info("Handling death status notification.")
                     self.handle_death_notification(message)
 
-        except PdsErrorException:
+        except PdsErrorException as e:
             logger.info("An error occurred when calling PDS")
-            self.send_message_back_to_queue(message)
+            logger.info(
+                f"Unable to process message: {message.id}, of type: {message.type}"
+            )
+            logger.info(f"{e}")
+            raise (e)
 
         except ClientError as e:
             logger.info(
                 f"Unable to process message: {message.id}, of type: {message.type}"
             )
             logger.info(f"{e}")
+            raise (e)
 
     def handle_gp_change_notification(self, message: MNSSQSMessage):
         patient_document_references = self.get_patient_documents(
@@ -131,12 +136,6 @@ def get_updated_gp_ods(self, nhs_number: str) -> str:
         patient_details = self.pds_service.fetch_patient_details(nhs_number)
         return patient_details.general_practice_ods
 
-    def send_message_back_to_queue(self, message: MNSSQSMessage):
-        logger.info("Sending message back to queue...")
-        self.sqs_service.send_message_standard(
-            queue_url=self.queue, message_body=message.model_dump_json(by_alias=True)
-        )
-
     def patient_is_present_in_ndr(self, dynamo_response):
         if len(dynamo_response) < 1:
             logger.info("Patient is not held in the National Document Repository.")

lambdas/tests/unit/services/test_process_mns_message_service.py

@@ -18,7 +18,6 @@
     MOCK_EMPTY_RESPONSE,
     MOCK_SEARCH_RESPONSE,
 )
-from utils.exceptions import PdsErrorException
 
 
 @pytest.fixture
@@ -198,13 +197,3 @@ def test_handle_gp_change_updates_gp_ods_code(mns_service):
         ),
     ]
     mns_service.dynamo_service.update_item.assert_has_calls(calls, any_order=False)
-
-
-def test_messages_is_put_back_on_the_queue_when_pds_error_raised(
-    mns_service, mocker, mock_handle_gp_change
-):
-    mns_service.handle_gp_change_notification.side_effect = PdsErrorException()
-    mocker.patch.object(mns_service, "send_message_back_to_queue")
-    mns_service.handle_mns_notification(gp_change_message)
-
-    mns_service.send_message_back_to_queue.assert_called_with(gp_change_message)