VED-755: update records whose vaccination match

Author: Akol125

lambdas/id_sync/src/ieds_db_operations.py

@@ -19,7 +19,7 @@ def get_ieds_table():
 BATCH_SIZE = 25
 
 
-def ieds_update_patient_id(old_id: str, new_id: str) -> dict:
+def ieds_update_patient_id(old_id: str, new_id: str, items_to_update: list | None = None) -> dict:
     """Update the patient ID in the IEDS table."""
     logger.info(f"ieds_update_patient_id. Update patient ID from {old_id} to {new_id}")
     if not old_id or not new_id or not old_id.strip() or not new_id.strip():
@@ -33,8 +33,11 @@ def ieds_update_patient_id(old_id: str, new_id: str) -> dict:
 
         new_patient_pk = f"Patient#{new_id}"
 
-        logger.info("Getting items to update in IEDS table...")
-        items_to_update = get_items_from_patient_id(old_id)
+        if items_to_update is None:
+            logger.info("Getting items to update in IEDS table...")
+            items_to_update = get_items_from_patient_id(old_id)
+        else:
+            logger.info("Using provided items_to_update list, size=%d", len(items_to_update))
 
         if not items_to_update:
             logger.warning(f"No items found to update for patient ID: {old_id}")

lambdas/id_sync/src/record_processor.py

@@ -1,5 +1,5 @@
 from common.clients import logger
-from typing import Dict, Any
+from typing import Dict, List, Any
 from pds_details import pds_get_patient_id, pds_get_patient_details
 from ieds_db_operations import (
     ieds_update_patient_id,
@@ -77,16 +77,34 @@ def process_nhs_number(nhs_number: str) -> Dict[str, Any]:
         }
 
     # If at least one IEDS item matches demographics, proceed with update
-    if not all(demographics_match(pds_details, detail) for detail in ieds_details):
-        logger.info("Not all IEDS items matched PDS demographics; skipping update for %s", nhs_number)
+    matching_records: List[Dict[str, Any]] = []
+    discarded_records: List[Dict[str, Any]] = []
+    for detail in ieds_details:
+        if demographics_match(pds_details, detail):
+            matching_records.append(detail)
+        else:
+            discarded_records.append(detail)
+
+    if not matching_records:
+        logger.info(
+            "No records matched PDS demographics; skipping update for %s",
+            nhs_number,
+        )
         return {
             "status": "success",
-            "message": "Not all IEDS items matched PDS demographics; update skipped",
+            "message": "No records matched PDS demographics; update skipped",
             "nhs_number": nhs_number,
+            "matched": 0,
+            "discarded": len(discarded_records),
         }
 
-    response = ieds_update_patient_id(nhs_number, new_nhs_number)
+    response = ieds_update_patient_id(
+        nhs_number, new_nhs_number, items_to_update=matching_records
+    )
     response["nhs_number"] = nhs_number
+    # add counts for observability
+    response["matched"] = len(matching_records)
+    response["discarded"] = len(discarded_records)
     return response
 
 
@@ -144,16 +162,17 @@ def normalize_strings(item: Any) -> str | None:
             logger.debug("demographics_match: no patient resource in IEDS table item")
             return False
 
-        # normalize patient name
+        # normalize patient fields from IEDS
         ieds_name = normalize_strings(extract_normalized_name_from_patient(patient))
-
         ieds_gender = normalize_strings(patient.get("gender"))
-        ieds_birth = patient.get("birthDate")
+        ieds_birth = normalize_strings(patient.get("birthDate"))
 
+        # All required fields must be present
         if not all([pds_name, pds_gender, pds_birth, ieds_name, ieds_gender, ieds_birth]):
             logger.debug("demographics_match: missing required demographics")
             return False
 
+        # Compare fields
         if pds_birth != ieds_birth:
             logger.debug("demographics_match: birthDate mismatch %s != %s", pds_birth, ieds_birth)
             return False

lambdas/id_sync/tests/test_record_processor.py

@@ -121,12 +121,12 @@ def test_process_record_demographics_mismatch_skips_update(self):
         }
         self.mock_get_items_from_patient_id.return_value = [non_matching_item]
 
-        # Act
+    # Act
         result = process_record(test_sqs_record)
 
         # Assert
         self.assertEqual(result["status"], "success")
-        self.assertEqual(result["message"], "Not all IEDS items matched PDS demographics; update skipped")
+        self.assertEqual(result["message"], "No records matched PDS demographics; update skipped")
 
     def test_invalid_body_parsing_returns_error(self):
         """When body is a malformed string, process_record should return an error"""
@@ -200,7 +200,7 @@ def test_update_called_on_match(self):
 
         result = process_record(test_sqs_record)
         self.assertEqual(result["status"], "success")
-        self.mock_ieds_update_patient_id.assert_called_once_with(nhs_number, pds_id)
+        self.mock_ieds_update_patient_id.assert_called_once_with(nhs_number, pds_id, items_to_update=[item])
 
     def test_process_record_no_records_exist(self):
         """Test when no records exist for the patient ID"""
@@ -315,7 +315,7 @@ def test_process_record_birthdate_mismatch_skips_update(self):
 
         result = process_record(test_sqs_record)
         self.assertEqual(result["status"], "success")
-        self.assertEqual(result["message"], "Not all IEDS items matched PDS demographics; update skipped")
+        self.assertEqual(result["message"], "No records matched PDS demographics; update skipped")
 
     def test_process_record_gender_mismatch_skips_update(self):
         """If gender differs between PDS and IEDS, update should be skipped"""
@@ -352,7 +352,7 @@ def test_process_record_gender_mismatch_skips_update(self):
 
         result = process_record(test_sqs_record)
         self.assertEqual(result["status"], "success")
-        self.assertEqual(result["message"], "Not all IEDS items matched PDS demographics; update skipped")
+        self.assertEqual(result["message"], "No records matched PDS demographics; update skipped")
 
     def test_process_record_no_comparable_fields_skips_update(self):
         """If PDS provides no comparable fields, do not update (skip)"""
@@ -385,4 +385,4 @@ def test_process_record_no_comparable_fields_skips_update(self):
 
         result = process_record(test_sqs_record)
         self.assertEqual(result["status"], "success")
-        self.assertEqual(result["message"], "Not all IEDS items matched PDS demographics; update skipped")
+        self.assertEqual(result["message"], "No records matched PDS demographics; update skipped")