VED-755: Adding demographics logic

Author: Akol125

lambdas/id_sync/src/ieds_db_operations.py

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

lambdas/id_sync/src/record_processor.py

@@ -128,54 +128,44 @@ def extract_normalized_name_from_patient(patient: dict) -> str | None:
 
 
 def demographics_match(pds_details: dict, ieds_item: dict) -> bool:
-    """Compare PDS patient details to an IEDS item (FHIR Patient resource).
-
-    Parameters:
-    - pds_details: dict returned by PDS (patient details)
-    - ieds_item: dict representing a single IEDS item containing a FHIR Patient resource
-
+    """Compare PDS patient details from PDS to an IEDS item (FHIR Patient resource).
     Returns True if name, birthDate and gender match (when present in both sources).
     If required fields are missing or unparsable on the IEDS side the function returns False.
     """
     try:
-        # extract pds values
-        pds_name = normalize_name_from_pds(pds_details) if isinstance(pds_details, dict) else None
-        pds_gender = pds_details.get("gender") if isinstance(pds_details, dict) else None
-        pds_birth = pds_details.get("birthDate") if isinstance(pds_details, dict) else None
-
+         
+        def normalize_strings(item: Any) -> str | None:
+            return str(item).strip().lower() if item else None
+        
+        # Retrieve patient resource from PDS
+        pds_name = normalize_strings(normalize_name_from_pds(pds_details))
+        pds_gender = normalize_strings(pds_details.get("gender"))
+        pds_birth = normalize_strings(pds_details.get("birthDate"))
+
+        # Retrieve patient resource from IEDS item
         patient = extract_patient_resource_from_item(ieds_item)
         if not patient:
-            logger.debug("demographics_match: no patient resource in item")
+            logger.debug("demographics_match: no patient resource in IEDS table item")
             return False
 
-        # normalize incoming patient name
-        incoming_name = extract_normalized_name_from_patient(patient)
-
-        incoming_gender = patient.get("gender")
-        incoming_birth = patient.get("birthDate")
+        # normalize patient name
+        ieds_name = extract_normalized_name_from_patient(patient)
 
-        def _norm_str(x):
-            return str(x).strip().lower() if x is not None else None
+        ieds_gender = normalize_strings(patient.get("gender"))
+        ieds_birth = patient.get("birthDate")
 
-        # Compare birthDate (strict if both present)
-        if pds_birth and incoming_birth:
-            if str(pds_birth).strip() != str(incoming_birth).strip():
-                logger.debug("demographics_match: birthDate mismatch %s != %s", pds_birth, incoming_birth)
-                return False
+        if pds_birth and ieds_birth and pds_birth != ieds_birth:
+            logger.debug("demographics_match: birthDate mismatch %s != %s", pds_birth, ieds_birth)
+            return False
 
-        # Compare gender (case-insensitive)
-        if pds_gender and incoming_gender:
-            if _norm_str(pds_gender) != _norm_str(incoming_gender):
-                logger.debug("demographics_match: gender mismatch %s != %s", pds_gender, incoming_gender)
-                return False
+        if pds_gender and ieds_gender and pds_gender != ieds_gender:
+            logger.debug("demographics_match: gender mismatch %s != %s", pds_gender, ieds_gender)
+            return False
 
-        # Compare names if both present (normalized)
-        if pds_name and incoming_name:
-            if _norm_str(pds_name) != _norm_str(incoming_name):
-                logger.debug("demographics_match: name mismatch %s != %s", pds_name, incoming_name)
-                return False
+        if pds_name and ieds_name and pds_name != ieds_name:
+            logger.debug("demographics_match: name mismatch %s != %s", pds_name, ieds_name)
+            return False
 
-        # If we reached here, all present fields matched (or were not present to compare)
         return True
     except Exception:
         logger.exception("demographics_match: comparison failed with exception")

lambdas/id_sync/tests/test_ieds_db_operations.py

@@ -673,39 +673,3 @@ def test_ieds_check_exist_limit_parameter(self):
         # Assert - Verify the limit parameter is correctly passed
         self.mock_get_items_from_patient_id.assert_called_once_with(patient_id, 1)
 
-
-
-class TestExtractPatientResource(TestIedsDbOperations):
-    def test_extract_patient_from_immunization_contained(self):
-        """Should return the contained Patient resource from an Immunization Resource"""
-        item = {
-            "Resource": {
-                "resourceType": "Immunization",
-                "contained": [
-                    {
-                        "resourceType": "Patient",
-                        "id": "Pat1",
-                        "name": [{"family": "Taylor", "given": ["Sarah"]}],
-                        "gender": "unknown",
-                        "birthDate": "1965-02-28"
-                    }
-                ]
-            }
-        }
-
-        patient = ieds_db_operations.extract_patient_resource_from_item(item)
-        self.assertIsNotNone(patient)
-        self.assertEqual(patient.get("resourceType"), "Patient")
-        self.assertEqual(patient.get("id"), "Pat1")
-
-    def test_extract_returns_none_when_no_patient_in_contained(self):
-        """Should return None when contained exists but has no Patient entries"""
-        item = {"Resource": {"resourceType": "Immunization", "contained": [{"resourceType": "Practitioner"}]}}
-        patient = ieds_db_operations.extract_patient_resource_from_item(item)
-        self.assertIsNone(patient)
-
-    def test_extract_returns_none_when_resource_not_dict(self):
-        """Should return None when Resource attribute is present but not a dict"""
-        item = {"Resource": '{"not": "a dict string"}'}
-        patient = ieds_db_operations.extract_patient_resource_from_item(item)
-        self.assertIsNone(patient)