CCM-15297: Update logs

Author: lapenna-bjss

lambdas/mesh-download/mesh_download/__tests__/test_handler.py

@@ -15,7 +15,7 @@ def setup_mocks():
     mock_config.mesh_client = Mock()
 
     mock_processor = Mock()
-    mock_processor.process_sqs_message = Mock()
+    mock_processor.process_sqs_message = Mock(return_value='downloaded')
 
     return (
         mock_context,
@@ -149,9 +149,9 @@ def test_handler_partial_batch_failure(self, mock_processor_class, mock_config_c
 
         # Make second message fail
         mock_processor.process_sqs_message.side_effect = [
-            None,
+            'downloaded',
             Exception("Test error"),
-            None
+            'downloaded'
         ]
 
         event = create_sqs_event(num_records=3)

lambdas/mesh-download/mesh_download/__tests__/test_processor.py

@@ -137,8 +137,9 @@ def test_process_sqs_message_success(self, mock_datetime):
 
         sqs_record = create_sqs_record()
 
-        processor.process_sqs_message(sqs_record)
+        outcome = processor.process_sqs_message(sqs_record)
 
+        assert outcome == 'downloaded'
         config.mesh_client.retrieve_message.assert_called_once_with('test-message-123')
 
         mesh_message.read.assert_called_once()
@@ -322,8 +323,9 @@ def test_bucket_selection_with_mesh_mock_enabled(self, mock_datetime):
         config.mesh_client.retrieve_message.return_value = mesh_message
         sqs_record = create_sqs_record()
 
-        processor.process_sqs_message(sqs_record)
+        outcome = processor.process_sqs_message(sqs_record)
 
+        assert outcome == 'downloaded'
         # Verify event was published with PII bucket in URI
         event_publisher.send_events.assert_called_once()
         published_events = event_publisher.send_events.call_args[0][0]
@@ -361,8 +363,9 @@ def test_bucket_selection_with_mesh_mock_disabled(self, mock_datetime):
         config.mesh_client.retrieve_message.return_value = mesh_message
         sqs_record = create_sqs_record()
 
-        processor.process_sqs_message(sqs_record)
+        outcome = processor.process_sqs_message(sqs_record)
 
+        assert outcome == 'downloaded'
         event_publisher.send_events.assert_called_once()
         published_events = event_publisher.send_events.call_args[0][0]
         assert len(published_events) == 1
@@ -396,8 +399,9 @@ def test_duplicate_delivery_skips_publish_and_acknowledge(self):
         sqs_record = create_sqs_record()
 
         # Should complete without raising
-        processor.process_sqs_message(sqs_record)
+        outcome = processor.process_sqs_message(sqs_record)
 
+        assert outcome == 'skipped'
         bound_logger.warning.assert_called_once()
         warning_msg = bound_logger.warning.call_args[0][0]
         assert "already stored" in warning_msg

lambdas/mesh-download/mesh_download/handler.py

@@ -21,6 +21,7 @@ def handler(event, context):
     processed = {
         'retrieved': 0,
         'downloaded': 0,
+        'skipped': 0,
         'failed': 0
     }
 
@@ -58,8 +59,8 @@ def handler(event, context):
                     continue
 
                 try:
-                    processor.process_sqs_message(record)
-                    processed['downloaded'] += 1
+                    outcome = processor.process_sqs_message(record)
+                    processed[outcome] += 1
 
                 except Exception as exc:
                     processed['failed'] += 1
@@ -71,6 +72,7 @@ def handler(event, context):
         log.info("Processed SQS event",
                 retrieved=processed['retrieved'],
                 downloaded=processed['downloaded'],
+                skipped=processed['skipped'],
                 failed=processed['failed'])
 
         return {"batchItemFailures": batch_item_failures}

lambdas/mesh-download/mesh_download/processor.py

@@ -28,7 +28,7 @@ def process_sqs_message(self, sqs_record):
             logger = self.__log.bind(mesh_message_id=validated_event.data.meshMessageId)
 
             logger.info("Processing MESH download request")
-            self._handle_download(validated_event, logger)
+            return self._handle_download(validated_event, logger)
 
         except Exception as exc:
             self.__log.error(
@@ -102,6 +102,8 @@ def _handle_download(self, event, logger):
         message.acknowledge()
         logger.info("Acknowledged message")
 
+        return 'skipped' if duplicate else 'downloaded'
+
     def _store_message_content(self, sender_id, message_reference, mesh_message_id, message_content, logger):
         s3_key = self.__document_store.store_document(
             sender_id=sender_id,