refactor all functions

Author: Akol125

lambdas/id_sync/src/ieds_db_operations.py

@@ -1,4 +1,3 @@
-import json
 from boto3.dynamodb.conditions import Key
 from os_vars import get_ieds_table_name
 from common.aws_dynamodb import get_dynamodb_table
@@ -143,40 +142,17 @@ def get_items_from_patient_id(id: str, limit=BATCH_SIZE) -> list:
             exception=e
         )
 
-def extract_patient_resource_from_item(item: dict) -> dict | None:
-    """Extract a Patient resource dict from an IEDS item.
 
-    Accepts common shapes: item['Resource'] (dict or JSON string), item['resource'], or a wrapper with 'resource'.
-    Returns the patient resource dict or None if not found/parsible.
+def extract_patient_resource_from_item(item: dict) -> dict | None:
     """
-    if not isinstance(item, dict):
+    Extract a Patient resource dict from an IEDS database.
+    """
+    patient_resource = item.get("Resource", None)
+    if not isinstance(patient_resource, dict):
         return None
 
-    candidate = item.get("Resource") or item.get("resource") or item.get("Body") or item.get("body")
-    if not candidate:
-        return None
+    for res in patient_resource.get("contained", []):
+        if isinstance(res, dict) and res.get("resourceType") == "Patient":
+            return res
 
-    # candidate might be a JSON string
-    if isinstance(candidate, str):
-        try:
-            candidate = json.loads(candidate)
-        except Exception:
-            return None
-
-    if isinstance(candidate, dict):
-        # if wrapped like {"resource": {...}}
-        if "resource" in candidate and isinstance(candidate["resource"], dict):
-            candidate = candidate["resource"]
-
-        # If this dict is the Patient resource itself
-        if candidate.get("resourceType") == "Patient":
-            return candidate
-
-        # If it's a bundle/entry, search for Patient
-        if isinstance(candidate.get("entry"), list):
-            for entry in candidate.get("entry", []):
-                r = entry.get("resource") or entry.get("Resource")
-                if isinstance(r, dict) and r.get("resourceType") == "Patient":
-                    return r
-
-    return None
+    return None

lambdas/id_sync/tests/test_ieds_db_operations.py

@@ -673,6 +673,39 @@ 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)
 
-    # ✅ Remove tests that are no longer relevant:
-    # - test_ieds_check_exist_missing_count_field (no longer uses Count)
-    # - test_ieds_check_exist_count_greater_than_one (no longer uses Count)
+
+
+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)