VED-765: review based on changes

Author: Akol125

lambdas/id_sync/src/ieds_db_operations.py

@@ -2,7 +2,7 @@
 from os_vars import get_ieds_table_name
 from common.aws_dynamodb import get_dynamodb_table
 from common.clients import logger, dynamodb_client
-from utils import log_status, BATCH_SIZE
+from utils import make_status, BATCH_SIZE
 from exceptions.id_sync_exception import IdSyncException
 
 ieds_table = None
@@ -21,10 +21,10 @@ def ieds_update_patient_id(old_id: str, new_id: str, items_to_update: list | Non
     """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():
-        return log_status("Old ID and New ID cannot be empty", old_id, "error")
+        return make_status("Old ID and New ID cannot be empty", old_id, "error")
 
     if old_id == new_id:
-        return log_status(f"No change in patient ID: {old_id}", old_id)
+        return make_status(f"No change in patient ID: {old_id}", old_id)
 
     try:
         logger.info(f"Updating patient ID in IEDS from {old_id} to {new_id}")
@@ -37,7 +37,7 @@ def ieds_update_patient_id(old_id: str, new_id: str, items_to_update: list | Non
 
         if not items_to_update:
             logger.warning(f"No items found to update for patient ID: {old_id}")
-            return log_status(f"No items found to update for patient ID: {old_id}", old_id)
+            return make_status(f"No items found to update for patient ID: {old_id}", old_id)
 
         logger.info(f"Items to update: {len(items_to_update)}")
 
@@ -52,12 +52,12 @@ def ieds_update_patient_id(old_id: str, new_id: str, items_to_update: list | Non
             f"All batches complete. Total batches: {total_batches}, All successful: {all_batches_successful}")
 
         if all_batches_successful:
-            return log_status(
+            return make_status(
                 f"IEDS update, patient ID: {old_id}=>{new_id}. {len(items_to_update)} updated {total_batches}.",
                 old_id,
             )
         else:
-            return log_status(f"Failed to update some batches for patient ID: {old_id}", old_id, "error")
+            return make_status(f"Failed to update some batches for patient ID: {old_id}", old_id, "error")
 
     except Exception as e:
         logger.exception("Error updating patient ID")

lambdas/id_sync/src/record_processor.py

@@ -6,7 +6,7 @@
     extract_patient_resource_from_item,
     get_items_from_patient_id,
 )
-from utils import log_status
+from utils import make_status
 import json
 import ast
 
@@ -43,33 +43,35 @@ def process_nhs_number(nhs_number: str) -> Dict[str, Any]:
     new_nhs_number = pds_get_patient_id(nhs_number)
 
     if not new_nhs_number:
-        return log_status("No patient ID found for NHS number", nhs_number)
+        return make_status("No patient ID found for NHS number", nhs_number)
 
     if new_nhs_number == nhs_number:
-        return log_status("No update required", nhs_number)
+        return make_status("No update required", nhs_number)
+
     logger.info("Update patient ID from %s to %s", nhs_number, new_nhs_number)
 
     try:
-        pds_details, ieds_details = fetch_demographic_details(nhs_number)
+        # Fetch PDS Patient resource and IEDS resources for the old NHS number
+        pds_patient_resource, ieds_resources = fetch_pds_and_ieds_resources(nhs_number)
     except Exception as e:
         logger.exception("process_nhs_number: failed to fetch demographic details: %s", e)
-        return log_status(str(e), nhs_number, "error")
+        return make_status(str(e), nhs_number, "error")
 
-    if not ieds_details:
+    if not ieds_resources:
         logger.info("No IEDS records returned for NHS number: %s", nhs_number)
-        return log_status(f"No records returned for ID: {nhs_number}", nhs_number)
+        return make_status(f"No records returned for ID: {nhs_number}", nhs_number)
 
     # Compare demographics from PDS to each IEDS item, keep only matching records
     matching_records, discarded_records = [], []
-    for detail in ieds_details:
-        if demographics_match(pds_details, detail):
+    for detail in ieds_resources:
+        if demographics_match(pds_patient_resource, detail):
             matching_records.append(detail)
         else:
             discarded_records.append(detail)
 
     if not matching_records:
         logger.info("No records matched PDS demographics: %d", len(discarded_records))
-        return log_status("No records matched PDS demographics; update skipped", nhs_number)
+        return make_status("No records matched PDS demographics; update skipped", nhs_number)
 
     response = ieds_update_patient_id(
         nhs_number, new_nhs_number, items_to_update=matching_records
@@ -81,7 +83,8 @@ def process_nhs_number(nhs_number: str) -> Dict[str, Any]:
     return response
 
 
-def fetch_demographic_details(nhs_number: str):
+# Function to fetch PDS Patient details and IEDS Immunisation records
+def fetch_pds_and_ieds_resources(nhs_number: str):
     try:
         pds = pds_get_patient_details(nhs_number)
     except Exception as e:

lambdas/id_sync/src/utils.py

@@ -1,7 +1,7 @@
 from typing import Dict, Any
 
 
-def log_status(msg: str, nhs_number: str | None = None, status: str = "success") -> Dict[str, Any]:
+def make_status(msg: str, nhs_number: str | None = None, status: str = "success") -> Dict[str, Any]:
     """Return a simple status dict used by record processing for observability.
 
     If `nhs_number` is None the key is omitted which keeps the output shape

lambdas/id_sync/tests/test_ieds_db_operations.py

@@ -539,3 +539,71 @@ def test_get_items_from_patient_id_no_records(self):
 
         # Assert
         self.assertEqual(result, [])
+
+
+class TestIedsDbOperationsConditional(unittest.TestCase):
+    def setUp(self):
+        # Patch logger to suppress output
+        self.logger_patcher = patch('ieds_db_operations.logger')
+        self.mock_logger = self.logger_patcher.start()
+
+        # Patch get_ieds_table_name and get_ieds_table
+        self.get_ieds_table_name_patcher = patch('ieds_db_operations.get_ieds_table_name')
+        self.mock_get_ieds_table_name = self.get_ieds_table_name_patcher.start()
+        self.mock_get_ieds_table_name.return_value = 'test-table'
+
+        self.get_ieds_table_patcher = patch('ieds_db_operations.get_ieds_table')
+        self.mock_get_ieds_table = self.get_ieds_table_patcher.start()
+
+        # Patch dynamodb client
+        self.dynamodb_client_patcher = patch('ieds_db_operations.dynamodb_client')
+        self.mock_dynamodb_client = self.dynamodb_client_patcher.start()
+
+    def tearDown(self):
+        patch.stopall()
+
+    def test_ieds_update_patient_id_empty_inputs(self):
+        res = ieds_db_operations.ieds_update_patient_id('', '')
+        self.assertEqual(res['status'], 'error')
+
+    def test_ieds_update_patient_id_same_ids(self):
+        res = ieds_db_operations.ieds_update_patient_id('a', 'a')
+        self.assertEqual(res['status'], 'success')
+
+    def test_ieds_update_with_items_to_update_uses_provided_list(self):
+        items = [{'PK': 'Patient#1'}, {'PK': 'Patient#1#r2'}]
+        # patch transact_write_items to return success
+        self.mock_dynamodb_client.transact_write_items = MagicMock(
+            return_value={'ResponseMetadata': {'HTTPStatusCode': 200}})
+
+        res = ieds_db_operations.ieds_update_patient_id('1', '2', items_to_update=items)
+        self.assertEqual(res['status'], 'success')
+        # ensure transact called at least once
+        self.mock_dynamodb_client.transact_write_items.assert_called()
+
+    def test_ieds_update_batches_multiple_calls(self):
+        # create 60 items to force 3 batches (25,25,10)
+        items = [{'PK': f'Patient#old#{i}'} for i in range(60)]
+        called = []
+
+        def fake_transact(TransactItems):
+            called.append(len(TransactItems))
+            return {'ResponseMetadata': {'HTTPStatusCode': 200}}
+
+        self.mock_dynamodb_client.transact_write_items = MagicMock(side_effect=fake_transact)
+
+        res = ieds_db_operations.ieds_update_patient_id('old', 'new', items_to_update=items)
+        self.assertEqual(res['status'], 'success')
+        # should have been called 3 times
+        self.assertEqual(len(called), 3)
+        self.assertEqual(called[0], 25)
+        self.assertEqual(called[1], 25)
+        self.assertEqual(called[2], 10)
+
+    def test_ieds_update_non_200_response(self):
+        items = [{'PK': 'Patient#1'}]
+        self.mock_dynamodb_client.transact_write_items = MagicMock(
+            return_value={'ResponseMetadata': {'HTTPStatusCode': 500}})
+
+        res = ieds_db_operations.ieds_update_patient_id('1', '2', items_to_update=items)
+        self.assertEqual(res['status'], 'error')