VED-897 Follow-up: improve traceability in id sync without PID (#974)

Author: dlzhry2nhs

lambdas/id_sync/src/ieds_db_operations.py

@@ -10,6 +10,8 @@
 
 ieds_table = None
 BATCH_SIZE = 25  # DynamoDB TransactWriteItems max batch size
+PATIENT_KEY = "PatientPK"
+IDENTIFIER_KEY = "IdentifierPK"
 
 
 def get_ieds_table():
@@ -82,7 +84,7 @@ def paginate_items_for_patient_pk(patient_pk: str) -> list:
     while True:
         query_args = {
             "IndexName": "PatientGSI",
-            "KeyConditionExpression": Key("PatientPK").eq(patient_pk),
+            "KeyConditionExpression": Key(PATIENT_KEY).eq(patient_pk),
         }
         if last_evaluated_key:
             query_args["ExclusiveStartKey"] = last_evaluated_key
@@ -146,7 +148,7 @@ def build_transact_items(old_id: str, new_id: str, items_to_update: list) -> lis
     new_patient_pk = f"Patient#{new_id}"
 
     for item in items_to_update:
-        old_patient_pk = item.get("PatientPK", f"Patient#{old_id}")
+        old_patient_pk = item.get(PATIENT_KEY, f"Patient#{old_id}")
 
         transact_items.append(
             {
@@ -155,8 +157,8 @@ def build_transact_items(old_id: str, new_id: str, items_to_update: list) -> lis
                     "Key": {
                         "PK": {"S": item["PK"]},
                     },
-                    "UpdateExpression": "SET PatientPK = :new_val",
-                    "ConditionExpression": "PatientPK = :expected_old",
+                    "UpdateExpression": f"SET {PATIENT_KEY} = :new_val",
+                    "ConditionExpression": f"{PATIENT_KEY} = :expected_old",
                     "ExpressionAttributeValues": {
                         ":new_val": {"S": new_patient_pk},
                         ":expected_old": {"S": old_patient_pk},

lambdas/id_sync/src/record_processor.py

@@ -4,6 +4,7 @@
 from common.clients import logger
 from exceptions.id_sync_exception import IdSyncException
 from ieds_db_operations import (
+    IDENTIFIER_KEY,
     extract_patient_resource_from_item,
     get_items_from_patient_id,
     ieds_update_patient_id,
@@ -55,22 +56,26 @@ def process_nhs_number(nhs_number: str) -> Dict[str, Any]:
         logger.exception("process_nhs_number: failed to fetch ieds resources: %s", e)
         return make_status(str(e), status="error")
 
-    logger.info(
-        "Fetched IEDS resources. IEDS count: %d",
-        len(ieds_resources) if ieds_resources else 0,
-    )
-
     if not ieds_resources:
         logger.info("No IEDS records returned for NHS number")
         return make_status("No records returned for NHS Number")
 
+    logger.info("Fetched IEDS resources. IEDS count: %d", len(ieds_resources))
+
     # Compare demographics from PDS to each IEDS item, keep only matching records
     matching_records = []
     discarded_count = 0
+
     for detail in ieds_resources:
+        immunisation_identifier = detail.get(IDENTIFIER_KEY)
+
         if demographics_match(pds_patient_resource, detail):
+            logger.info("Update required for imms identifier: %s. Demographic data matched", immunisation_identifier)
             matching_records.append(detail)
         else:
+            logger.info(
+                "No update required for imms identifier: %s. Demographic data did not match", immunisation_identifier
+            )
             discarded_count += 1
 
     if not matching_records:

lambdas/id_sync/tests/test_record_processor.py

@@ -1,6 +1,6 @@
 import json
 import unittest
-from unittest.mock import patch
+from unittest.mock import call, patch
 
 from exceptions.id_sync_exception import IdSyncException
 from record_processor import process_record
@@ -12,6 +12,7 @@ class TestRecordProcessor(unittest.TestCase):
         "gender": "male",
         "birthDate": "1980-01-01",
     }
+    MOCK_IMMUNISATION_IDENTIFIER_PK = {"IdentifierPK": "someSystem#12345"}
 
     def setUp(self):
         """Set up test fixtures and mocks"""
@@ -64,7 +65,10 @@ def test_process_record_success_update_required(self):
         pds_id = "9000000008"
         nhs_number = "9000000009"
 
-        test_sqs_record = {"body": json.dumps({"subject": nhs_number})}
+        test_sqs_record = {
+            "body": json.dumps({"subject": nhs_number, "id": "test-mns-event-id"}),
+            "messageId": "test-sqs-message-id",
+        }
 
         # pds_get_patient_details should return details used by demographics_match
         self.mock_pds_get_patient_details.return_value = {
@@ -79,6 +83,7 @@ def test_process_record_success_update_required(self):
 
         # Provide one IEDS item that will match demographics via demographics_match
         matching_item = {
+            **self.MOCK_IMMUNISATION_IDENTIFIER_PK,
             "Resource": {
                 "resourceType": "Immunization",
                 "contained": [
@@ -90,7 +95,7 @@ def test_process_record_success_update_required(self):
                         "birthDate": "1980-01-01",
                     }
                 ],
-            }
+            },
         }
         self.mock_get_items_from_patient_id.return_value = [matching_item]
 
@@ -103,13 +108,25 @@ def test_process_record_success_update_required(self):
         # Assert
         self.assertEqual(result, success_response)
         self.mock_pds_get_patient_details.assert_called_once_with(nhs_number)
+        self.mock_logger.info.assert_has_calls(
+            [
+                call("Processing record with SQS messageId: %s", "test-sqs-message-id"),
+                call("Processing MNS event with id: %s", "test-mns-event-id"),
+                call("NHS Number has changed. Performing updates on relevant IEDS records"),
+                call("Fetched IEDS resources. IEDS count: %d", 1),
+                call("Update required for imms identifier: %s. Demographic data matched", "someSystem#12345"),
+            ]
+        )
 
     def test_process_record_demographics_mismatch_skips_update(self):
         """If no IEDS item matches demographics, the update should be skipped"""
         # Arrange
         pds_id = "pds-1"
         nhs_number = "nhs-1"
-        test_sqs_record = {"body": json.dumps({"subject": nhs_number})}
+        test_sqs_record = {
+            "body": json.dumps({"subject": nhs_number, "id": "test-mns-event-id"}),
+            "messageId": "test-sqs-message-id",
+        }
 
         self.mock_pds_get_patient_details.return_value = {
             "name": [{"given": ["Alice"], "family": "Smith"}],
@@ -125,6 +142,7 @@ def test_process_record_demographics_mismatch_skips_update(self):
 
         # IEDS items exist but do not match demographics
         non_matching_item = {
+            **self.MOCK_IMMUNISATION_IDENTIFIER_PK,
             "Resource": {
                 "resourceType": "Immunization",
                 "contained": [
@@ -136,7 +154,7 @@ def test_process_record_demographics_mismatch_skips_update(self):
                         "birthDate": "1990-01-01",
                     }
                 ],
-            }
+            },
         }
         self.mock_get_items_from_patient_id.return_value = [non_matching_item]
 
@@ -146,6 +164,16 @@ def test_process_record_demographics_mismatch_skips_update(self):
         # Assert
         self.assertEqual(result["status"], "success")
         self.assertEqual(result["message"], "No records matched PDS demographics; update skipped")
+        self.mock_logger.info.assert_has_calls(
+            [
+                call("Processing record with SQS messageId: %s", "test-sqs-message-id"),
+                call("Processing MNS event with id: %s", "test-mns-event-id"),
+                call("NHS Number has changed. Performing updates on relevant IEDS records"),
+                call("Fetched IEDS resources. IEDS count: %d", 1),
+                call("No update required for imms identifier: %s. Demographic data did not match", "someSystem#12345"),
+                call("No records matched PDS demographics: %d", 1),
+            ]
+        )
 
     def test_invalid_body_parsing_returns_error(self):
         """When body is a malformed string, process_record should return an error"""