VED-740: review and add more bundle and entry level test

Author: Akol125

backend/src/fhir_service.py

@@ -2,7 +2,6 @@
 from uuid import uuid4
 import datetime
 import os
-import json
 from enum import Enum
 from typing import Optional, Union
 

backend/src/models/utils/generic_utils.py

@@ -140,29 +140,29 @@ def create_diagnostics_error(value):
     exp_error = {"diagnostics": diagnostics}
     return exp_error
 
-def empty_bundle(self_url: str) -> Dict[str, Any]:
+def make_empty_bundle(self_url: str) -> Dict[str, Any]:
     return {
         "resourceType": "Bundle",
         "type": "searchset",
         "link": [{"relation": "self", "url": self_url}],
-        "total": 0,
         "entry": [],
+        "total": 0, 
     }
 
 def form_json(response, _elements, identifier, baseurl):
     self_url = f"{baseurl}?identifier={identifier}" + (f"&_elements={_elements}" if _elements else "")
 
     if not response:
-        return empty_bundle(self_url)
+        return make_empty_bundle(self_url)
 
     meta = {"versionId": response["version"]} if "version" in response else {}
 
     # Full Immunization payload to be returned if only the identifier parameter was provided and truncated when _elements is used
     if _elements:
-        element = {e.strip().lower() for e in _elements.split(",") if e.strip()}
+        elements = {e.strip().lower() for e in _elements.split(",") if e.strip()}
         resource = {"resourceType": "Immunization"}
-        if "id" in element: resource["id"] = response["id"]
-        if "meta" in element and meta: resource["meta"] = meta
+        if "id" in elements: resource["id"] = response["id"]
+        if "meta" in elements and meta: resource["meta"] = meta
 
     else:
         resource = response["resource"]
@@ -179,7 +179,7 @@ def form_json(response, _elements, identifier, baseurl):
         entry=[entry], 
         total=1)
 
-
+    # Reassigned total to ensure it appears last in the response to match expected output
     data = json.loads(fhir_bundle.json(by_alias=True))
     data["total"] = data.pop("total")
     return data

backend/tests/test_fhir_service.py

@@ -337,6 +337,14 @@ def test_get_immunization_by_identifier(self):
         self.imms_repo.get_immunization_by_identifier.assert_called_once_with(imms_id, "COVID19.S")
 
         self.assertEqual(act_imms["resourceType"], "Bundle")
+        self.assertEqual(service_resp.get("type"), "searchset")
+        self.assertIn("entry", service_resp)
+        self.assertEqual(len(service_resp["entry"]), 1)
+        self.assertIn("total", service_resp)
+        self.assertEqual(service_resp["total"], 1)
+        res = service_resp["entry"][0]["resource"]
+        self.assertEqual(res["resourceType"], "Immunization")
+        self.assertEqual(res["id"], imms_id)
 
     def test_immunization_not_found(self):
         """it should return None if Immunization doesn't exist"""