[PRMP-540] - Fix unit test post-merge conflicts

Author: MohammadIqbalAD-NHS

lambdas/services/bulk_upload_metadata_processor_service.py

@@ -248,7 +248,7 @@ def validate_expedite_file(self, s3_object_key: str):
         return nhs_number, file_name, ods_code, scan_date
 
     def handle_expedite_event(self, event):
-        """Process S3 EventBridge expedite uploads: ensure 1of1, extract identifiers, and send metadata to SQS."""
+        """Process S3 EventBridge expedite uploads: enforce virus scan, ensure 1of1, extract identifiers, and send metadata to SQS."""
         try:
             unparsed_s3_object_key = event["detail"]["object"]["key"]
             s3_object_key = urllib.parse.unquote_plus(
@@ -258,6 +258,9 @@ def handle_expedite_event(self, event):
             if s3_object_key.startswith("expedite/"):
                 logger.info("Processing file from expedite folder")
 
+                self.enforce_virus_scanner(s3_object_key)
+                self.check_file_status(s3_object_key)
+
                 sqs_metadata = [self.create_expedite_sqs_metadata(s3_object_key)]
 
                 self.send_metadata_to_fifo_sqs(sqs_metadata)
@@ -339,7 +342,7 @@ def enforce_virus_scanner(self, file_key: str):
 
         try:
             result = self.s3_repo.check_file_tag_status_on_staging_bucket(file_key)
-            if(result != ""):
+            if result != "":
                 logger.info("The file has been scanned before")
                 return
             logger.info(f"Virus scan tag missing for {file_key}.")
@@ -355,27 +358,6 @@ def enforce_virus_scanner(self, file_key: str):
             else:
                 raise
 
-    def handle_expedite_event(self, event):
-        try:
-            key_string = event["detail"]["object"]["key"]
-            key = urllib.parse.unquote_plus(key_string, encoding="utf-8")
-
-            if key.startswith("expedite/"):
-                logger.info("Processing file from expedite folder")
-
-                self.enforce_virus_scanner(key)
-                self.check_file_status(key)
-
-                return  # To be added upon by ticket PRMP-540
-            else:
-                failure_msg = f"Unexpected directory or file location received from EventBridge: {key_string}"
-                logger.error(failure_msg)
-                raise BulkUploadMetadataException(failure_msg)
-        except KeyError as e:
-            failure_msg = f"Failed due to missing key: {str(e)}"
-            logger.error(failure_msg)
-            raise BulkUploadMetadataException(failure_msg)
-
 
 def get_formatter_service(raw_pre_format_type):
     try:

lambdas/tests/unit/handlers/test_bulk_upload_metadata_processor_handler.py

@@ -73,7 +73,7 @@ def test_metadata_processor_lambda_handler_s3_event_uses_general_by_default(
 
     mock_metadata_service.process_metadata.assert_not_called()
     mock_metadata_service.handle_expedite_event.assert_called_once_with(event)
-    mocked_general_cls.assert_called_once_with("expedite")
+    mocked_general_cls.assert_called_once_with("")
 
 
 def test_s3_event_with_expedite_key_processes(

lambdas/tests/unit/services/test_bulk_upload_metadata_processor_service.py

@@ -638,6 +638,12 @@ def test_handle_expedite_event_happy_path_sends_sqs(test_service, mocker):
     key = f"expedite/{ods}/1of1_1234567890_record.pdf"
     event = {"detail": {"object": {"key": key}}}
 
+    mocker.patch.object(
+        BulkUploadMetadataProcessorService, "enforce_virus_scanner"
+    )
+    mocker.patch.object(
+        BulkUploadMetadataProcessorService, "check_file_status"
+    )
     mocked_send = mocker.patch.object(
         BulkUploadMetadataProcessorService, "send_metadata_to_fifo_sqs"
     )
@@ -686,6 +692,12 @@ def test_handle_expedite_event_missing_key_raises(test_service, mocker):
 
 
 def test_handle_expedite_event_rejects_non_1of1(test_service, mocker):
+    mocker.patch.object(
+        BulkUploadMetadataProcessorService, "enforce_virus_scanner"
+    )
+    mocker.patch.object(
+        BulkUploadMetadataProcessorService, "check_file_status"
+    )
     mocked_send = mocker.patch.object(
         BulkUploadMetadataProcessorService, "send_metadata_to_fifo_sqs"
     )
@@ -972,6 +984,9 @@ def test_handle_expedite_event_calls_enforce_for_expedite_key(mocker, test_servi
     encoded_key = urllib.parse.quote_plus("expedite/folder/some file.pdf")
     event = {"detail": {"object": {"key": encoded_key}}}
 
+    mocker.patch.object(
+        BulkUploadMetadataProcessorService, "create_expedite_sqs_metadata"
+    )
     mocked_enforce = mocker.patch.object(test_service, "enforce_virus_scanner")
     mocked_check_status = mocker.patch.object(test_service, "check_file_status")