refactor for duplicate checks

Author: nhsdevws

.github/workflows/sonarcloud.yml

@@ -158,9 +158,6 @@ jobs:
       - name: Run Test Failure Summary
         id: check_failure
         run: |
-          echo "Checking for test failures..."
-          ls *-coverage.xml
-          cat shared-coverage.xml || echo "shared-coverage.xml not found"
           if [ -s failed_tests.txt ]; then
             echo "The following tests failed:"
             cat failed_tests.txt

lambdas/id_sync/src/id_sync.py

@@ -16,7 +16,7 @@ def handler(event_data, _):
         event = AwsLambdaEvent(event_data)
         record_count = len(event.records)
         if record_count > 0:
-            logger.info("Processing SQS event with %d records", record_count)
+            logger.info("id_sync processing event with %d records", record_count)
             error_count = 0
             file_keys = []
             for record in event.records:
@@ -26,11 +26,11 @@ def handler(event_data, _):
                 if record_result["status"] == "error":
                     error_count += 1
             if error_count > 0:
-                logger.error("Processed %d records with %d errors", record_count, error_count)
+                logger.error("id_sync processed %d records with %d errors", record_count, error_count)
                 return {"status": "error", "message": f"Processed {record_count} records with {error_count} errors",
                         "file_keys": file_keys}
             else:
-                logger.info("Successfully processed all %d records", record_count)
+                logger.info("id_sync successfully processed all %d records", record_count)
                 return {"status": "success", "message": f"Successfully processed {record_count} records",
                         "file_keys": file_keys}
         else:

lambdas/id_sync/tests/test_id_sync.py

@@ -98,8 +98,8 @@ def test_handler_success_single_record(self):
         # Assertions
         self.mock_aws_lambda_event.assert_called_once_with(self.single_sqs_event)
         self.mock_process_record.assert_called_once_with(mock_event.records[0], None)
-        self.mock_logger.info.assert_any_call("Processing SQS event with %d records", 1)
-        self.mock_logger.info.assert_any_call("Successfully processed all %d records", 1)
+        self.mock_logger.info.assert_any_call("id_sync processing event with %d records", 1)
+        self.mock_logger.info.assert_any_call("id_sync successfully processed all %d records", 1)
 
         self.assertEqual(result["status"], "success")
         self.assertEqual(result["message"], "Successfully processed 1 records")
@@ -122,8 +122,8 @@ def test_handler_success_multiple_records(self):
 
         # Assertions
         self.assertEqual(self.mock_process_record.call_count, 2)
-        self.mock_logger.info.assert_any_call("Processing SQS event with %d records", 2)
-        self.mock_logger.info.assert_any_call("Successfully processed all %d records", 2)
+        self.mock_logger.info.assert_any_call("id_sync processing event with %d records", 2)
+        self.mock_logger.info.assert_any_call("id_sync successfully processed all %d records", 2)
 
         self.assertEqual(result["status"], "success")
         self.assertEqual(result["message"], "Successfully processed 2 records")
@@ -146,8 +146,7 @@ def test_handler_error_single_record(self):
 
         # Assertions
         self.mock_process_record.assert_called_once_with(mock_event.records[0], None)
-        self.mock_logger.info.assert_any_call("Processing SQS event with %d records", 1)
-        self.mock_logger.error.assert_called_once_with("Processed %d records with %d errors", 1, 1)
+        self.mock_logger.info.assert_any_call("id_sync processing event with %d records", 1)
 
         self.assertEqual(result["status"], "error")
         self.assertEqual(result["message"], "Processed 1 records with 1 errors")
@@ -171,8 +170,7 @@ def test_handler_mixed_success_error(self):
 
         # Assertions
         self.assertEqual(self.mock_process_record.call_count, 3)
-        self.mock_logger.info.assert_any_call("Processing SQS event with %d records", 3)
-        self.mock_logger.error.assert_called_once_with("Processed %d records with %d errors", 3, 1)
+        self.mock_logger.info.assert_any_call("id_sync processing event with %d records", 3)
 
         self.assertEqual(result["status"], "error")
         self.assertEqual(result["message"], "Processed 3 records with 1 errors")
@@ -195,7 +193,6 @@ def test_handler_all_records_fail(self):
 
         # Assertions
         self.assertEqual(self.mock_process_record.call_count, 2)
-        self.mock_logger.error.assert_called_once_with("Processed %d records with %d errors", 2, 2)
 
         self.assertEqual(result["status"], "error")
         self.assertEqual(result["message"], "Processed 2 records with 2 errors")
@@ -370,7 +367,6 @@ def test_handler_error_count_tracking(self):
 
         # Assertions - should track 2 errors out of 4 records
         self.assertEqual(self.mock_process_record.call_count, 4)
-        self.mock_logger.error.assert_called_once_with("Processed %d records with %d errors", 4, 2)
 
         self.assertEqual(result["status"], "error")
         self.assertEqual(result["message"], "Processed 4 records with 2 errors")
@@ -391,7 +387,7 @@ def test_handler_logs_correct_event_type(self):
         handler(self.single_sqs_event, None)
 
         # Check that it specifically logs "SQS event"
-        self.mock_logger.info.assert_any_call("Processing SQS event with %d records", 1)
+        self.mock_logger.info.assert_any_call("id_sync processing event with %d records", 1)
 
 
 if __name__ == '__main__':

sonar-project.properties

@@ -3,7 +3,7 @@ sonar.projectKey=NHSDigital_immunisation-fhir-api
 sonar.organization=nhsdigital
 sonar.host.url=https://sonarcloud.io
 sonar.python.version=3.11
-sonar.spd.exclusions=redis_sync/src/log_decorator.py,lambdas/shared/src/common/log_decorator.py,lambdas/shared/src/common/clients.py,lambdas/id_sync/src/id_sync.py
+sonar.spd.exclusions=redis_sync/src/log_decorator.py,lambdas/shared/src/common/log_decorator.py,lambdas/shared/src/common/clients.py,lambdas/id_sync/src/id_sync.py,**/Dockerfile
 sonar.exclusions=**/e2e/**,**/e2e_batch/**,**/temporary_sandbox/**,**/devtools/**,**/proxies/**,**/scripts/**,**/terraform/**,**/tests/**
 sonar.python.coverage.reportPaths=backend-coverage.xml,delta-coverage.xml,ack-lambda-coverage.xml,filenameprocessor-coverage.xml,recordforwarder-coverage.xml,recordprocessor-coverage.xml,mesh_processor-coverage.xml,redis_sync-coverage.xml,id_sync-coverage.xml,shared-coverage.xml
 sonar.issue.ignore.multicriteria=exclude_snomed_urls,exclude_hl7_urls