VED-755: refactor process_nhs_number

Author: Akol125

lambdas/id_sync/src/ieds_db_operations.py

@@ -151,7 +151,6 @@ def extract_patient_resource_from_item(item: dict) -> dict | None:
     if not isinstance(patient_resource, dict):
         return None
 
-    # Otherwise, check contained
     for response in patient_resource.get("contained", []):
         if isinstance(response, dict) and response.get("resourceType") == "Patient":
             return response

lambdas/id_sync/src/record_processor.py

@@ -57,55 +57,46 @@ def process_nhs_number(nhs_number: str) -> Dict[str, Any]:
         }
     logger.info("Update patient ID from %s to %s", nhs_number, new_nhs_number)
 
-    if ieds_check_exist(nhs_number):
-        # Fetch PDS details for demographic comparison
-        try:
-            pds_details = pds_get_patient_details(nhs_number)
-        except Exception:
-            logger.exception("process_nhs_number: failed to fetch PDS details, aborting update")
-            return {
-                "status": "error",
-                "message": "Failed to fetch PDS details for demographic comparison",
-                "nhs_number": nhs_number,
-            }
-
-        # Get IEDS items for this patient id and compare demographics
-        try:
-            items = get_items_from_patient_id(nhs_number)
-        except Exception:
-            logger.exception("process_nhs_number: failed to fetch IEDS items, aborting update")
-            return {
+    if not ieds_check_exist(nhs_number):
+        logger.info("No IEDS record found for: %s", nhs_number)
+        response = {"status": "success", "message": f"No records returned for ID: {nhs_number}"}
+        return response
+    try:
+        pds_details, ieds_details = fetch_demographic_details(nhs_number)
+    except Exception as e:
+        logger.exception("process_nhs_number: %s, aborting update", e)
+        return {
                 "status": "error",
-                "message": "Failed to fetch IEDS items for demographic comparison",
+                "message": str(e),
                 "nhs_number": nhs_number,
-            }
+        }
 
-        # If at least one IEDS item matches demographics, proceed with update
-        match_found = False
-        for item in items:
-            try:
-                if demographics_match(pds_details, item):
-                    match_found = True
-                    break
-            except Exception:
-                logger.exception("process_nhs_number: error while comparing demographics for item: %s", item)
-
-        if not match_found:
-            logger.info("process_nhs_number: No IEDS items matched PDS demographics. Skipping update for %s", nhs_number)
-            response = {
-                "status": "success",
-                "message": "No IEDS items matched PDS demographics; update skipped",
-            }
-        else:
-            response = ieds_update_patient_id(nhs_number, new_nhs_number)
-    else:
-        logger.info("No IEDS record found for: %s", nhs_number)
-        response = {"status": "success", "message": f"No records returned for ID: {nhs_number}"}
+    # 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)
+        return {
+            "status": "success",
+            "message": "Not all IEDS items matched PDS demographics; update skipped",
+            "nhs_number": nhs_number,
+        }
 
+    response = ieds_update_patient_id(nhs_number, new_nhs_number)
     response["nhs_number"] = nhs_number
     return response
 
 
+def fetch_demographic_details(nhs_number: str):
+    try:
+        pds = pds_get_patient_details(nhs_number)
+    except Exception as e:
+        raise RuntimeError("Failed to fetch PDS details") from e
+    try:
+        ieds = get_items_from_patient_id(nhs_number)
+    except Exception as e:
+        raise RuntimeError("Failed to fetch IEDS items") from e
+    return pds, ieds
+
+
 def extract_normalized_name_from_patient(patient: dict) -> str | None:
     """Return a normalized 'given family' name string from a Patient resource or None."""
     if not patient:

lambdas/id_sync/tests/test_record_processor.py

@@ -129,7 +129,7 @@ def test_process_record_demographics_mismatch_skips_update(self):
 
         # Assert
         self.assertEqual(result["status"], "success")
-        self.assertIn("update skipped", result["message"])
+        self.assertEqual(result["message"], "Not all IEDS items 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"""
@@ -182,8 +182,8 @@ def test_update_called_on_match(self):
         self.mock_pds_get_patient_details.return_value = {
             "name": [
                 {
-                    "given": ["Tom"],
-                    "family": "Hanks"}
+                    "given": ["Sarah"],
+                    "family": "Fowley"}
                 ],
             "gender": "male",
             "birthDate": "1956-07-09"
@@ -194,7 +194,7 @@ def test_update_called_on_match(self):
                 "contained": [{
                     "resourceType": "Patient",
                     "id": "PatM",
-                    "name": [{"given": ["Tom"], "family": "Hanks"}],
+                    "name": [{"given": ["Sarah"], "family": "Fowley"}],
                     "gender": "male", "birthDate": "1956-07-09"}
                 ]}
             }
@@ -215,8 +215,6 @@ def test_process_record_no_records_exist(self):
             # Act
             result = process_record(test_record)
 
-            # Assert
-            self.assertEqual(result["status"], "success")
             self.assertEqual(result["message"], f"No records returned for ID: {test_id}")
 
             # Verify PDS was not called
@@ -307,15 +305,16 @@ def test_process_record_birthdate_mismatch_skips_update(self):
                             "family": "Doe"
                         }],
                         "gender": "male",
-                        "birthDate": "1980-01-02"}
+                        "birthDate": "1980-01-02"
+                    }
                 ]
             }
         }
         self.mock_get_items_from_patient_id.return_value = [item]
 
         result = process_record(test_sqs_record)
         self.assertEqual(result["status"], "success")
-        self.assertIn("update skipped", result["message"])
+        self.assertEqual(result["message"], "Not all IEDS items 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"""
@@ -342,14 +341,17 @@ def test_process_record_gender_mismatch_skips_update(self):
                             "given": ["Alex"],
                             "family": "Smith"
                         }],
-                        "gender": "male", "birthDate": "1992-03-03"}
+                        "gender": "male",
+                        "birthDate": "1992-03-03"
+                    }
                 ]
-            }}
+            }
+        }
         self.mock_get_items_from_patient_id.return_value = [item]
 
         result = process_record(test_sqs_record)
         self.assertEqual(result["status"], "success")
-        self.assertIn("update skipped", result["message"])
+        self.assertEqual(result["message"], "Not all IEDS items 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)"""
@@ -373,11 +375,13 @@ def test_process_record_no_comparable_fields_skips_update(self):
                             "family": "Lee"
                         }],
                         "gender": "female",
-                        "birthDate": "2000-01-01"}
+                        "birthDate": "2000-01-01"
+                    }
                 ]
-            }}
+            }
+        }
         self.mock_get_items_from_patient_id.return_value = [item]
 
         result = process_record(test_sqs_record)
         self.assertEqual(result["status"], "success")
-        self.assertIn("update skipped", result["message"])
+        self.assertEqual(result["message"], "Not all IEDS items matched PDS demographics; update skipped")