improve coverage

Author: Akol125

lambdas/id_sync/src/ieds_db_operations.py

@@ -3,8 +3,6 @@
 from common.aws_dynamodb import get_dynamodb_table
 from common.clients import logger, dynamodb_client
 import json
-import ast
-
 from utils import make_status
 from exceptions.id_sync_exception import IdSyncException
 
@@ -136,37 +134,27 @@ def paginate_items_for_patient_pk(patient_pk: str) -> list:
 
 def extract_patient_resource_from_item(item: dict) -> dict | None:
     """
-    Extract a Patient resource dict from an IEDS database.
+    Extract a Patient resource from an IEDS database.
     """
     patient_resource = item.get("Resource", None)
     logger.info(f"patient_resource (raw): {patient_resource}")
 
-    # Accept either a dict (preferred) or a JSON / Python-literal string
     if isinstance(patient_resource, str):
-        # Try JSON first, then fall back to ast.literal_eval for single-quotes
         try:
             patient_resource_parsed = json.loads(patient_resource)
-        except Exception:
-            try:
-                patient_resource_parsed = ast.literal_eval(patient_resource)
-            except Exception:
-                logger.debug("extract_patient_resource_from_item: Resource is a string but could not be parsed")
-                return None
+        except json.JSONDecodeError:
+            logger.warning("Failed to decode patient_resource JSON string")
+            return None
         patient_resource = patient_resource_parsed
 
     if not isinstance(patient_resource, dict):
         return None
 
-    # The Patient resource may be nested under 'contained' or be the resource itself
     contained = patient_resource.get("contained") or []
     for response in contained:
         if isinstance(response, dict) and response.get("resourceType") == "Patient":
             return response
 
-    # Fallback: if the resource is itself a Patient, return it
-    if patient_resource.get("resourceType") == "Patient":
-        return patient_resource
-
     return None
 
 

lambdas/id_sync/tests/test_ieds_db_operations.py

@@ -1,10 +1,51 @@
 import unittest
+
+from ieds_db_operations import extract_patient_resource_from_item
 from unittest.mock import patch, MagicMock
 from exceptions.id_sync_exception import IdSyncException
-
 import ieds_db_operations
 
 
+class TestExtractPatientResourceFromItem(unittest.TestCase):
+
+    def test_extract_from_dict_with_contained_patient(self):
+        item = {
+            "Resource": {
+                "resourceType": "Immunization",
+                "contained": [
+                    {"resourceType": "Patient", "id": "P1", "name": [{"family": "Doe"}]}
+                ],
+            }
+        }
+
+        patient = extract_patient_resource_from_item(item)
+        self.assertIsNotNone(patient)
+        self.assertIsInstance(patient, dict)
+        self.assertEqual(patient.get("resourceType"), "Patient")
+        self.assertEqual(patient.get("id"), "P1")
+
+    def test_extract_from_json_string(self):
+        resource_json = '{"resourceType": "Immunization", "contained": [{"resourceType": "Patient", "id": "P2"}]}'
+        item = {"Resource": resource_json}
+
+        patient = extract_patient_resource_from_item(item)
+        self.assertIsNotNone(patient)
+        self.assertEqual(patient.get("id"), "P2")
+
+    def test_malformed_json_string_returns_none(self):
+        # A malformed JSON string should not raise, but return None
+        item = {"Resource": "{not: valid json}"}
+        self.assertIsNone(extract_patient_resource_from_item(item))
+
+    def test_non_dict_resource_returns_none(self):
+        item = {"Resource": 12345}
+        self.assertIsNone(extract_patient_resource_from_item(item))
+
+    def test_missing_resource_returns_none(self):
+        item = {}
+        self.assertIsNone(extract_patient_resource_from_item(item))
+
+
 class TestIedsDbOperations(unittest.TestCase):
     """Base test class for IEDS database operations"""