VED-350: improve coverage for form_json generic utils

Author: Akol125

backend/Makefile

@@ -8,4 +8,10 @@ package: build
 test:
 	@PYTHONPATH=src:tests python -m unittest
 
+coverage-run:
+	@PYTHONPATH=src:tests coverage run -m unittest discover
+
+coverage-report:
+	coverage report -m 
+
 .PHONY: build package test

backend/tests/utils/generic_utils.py

@@ -94,48 +94,69 @@ def update_contained_resource_field(
     return json_data
 
 
+import unittest
+
+# from your_module import form_json  # <-- import your function
+
 class TestFormJson(unittest.TestCase):
     def setUp(self):
         self.baseurl = "https://api.service.nhs.uk/immunisation-fhir-api/Immunization"
         self.identifier = "abc123"
+        # matches your repo wrapper shape
         self.response = {
-            "resource": {"resourceType": "Immunization", "id": "abc123"},
+            "resource": {"resourceType": "Immunization", "id": "abc123", "status": "completed"},
             "id": "abc123",
-            "version": 1,
+            "version": 2,
         }
 
     def test_no_response(self):
-        result = form_json(None, None, self.identifier, self.baseurl)
-        self.assertEqual(result["total"], 0)
-        self.assertEqual(result["entry"], [])
-        self.assertIn("link", result)
-
-    def test_identifier_only(self):
-        result = form_json(self.response, None, self.identifier, self.baseurl)
-        self.assertEqual(result["total"], 1)
-        self.assertEqual(result["entry"][0]["resource"], self.response["resource"])
-        self.assertEqual(result["entry"][0]["fullUrl"],
-                         f"{self.baseurl}/{self.response['id']}")
-
-    def test_identifier_with_id_element(self):
-        result = form_json(self.response, "id", self.identifier, self.baseurl)
-        resource = result["entry"][0]["resource"]
-        self.assertEqual(resource["resourceType"], "Immunization")
-        self.assertEqual(resource["id"], self.response["id"])
-        self.assertNotIn("meta", resource)
-
-    def test_identifier_with_meta_element(self):
-        result = form_json(self.response, "meta", self.identifier, self.baseurl)
-        resource = result["entry"][0]["resource"]
-        self.assertEqual(resource["resourceType"], "Immunization")
-        self.assertEqual(resource["id"], self.response["id"])
-        self.assertEqual(resource["meta"]["versionId"], str(self.response["version"]))
-
-    def test_identifier_with_id_and_meta_elements(self):
-        result = form_json(self.response, "id,meta", self.identifier, self.baseurl)
-        resource = result["entry"][0]["resource"]
-        self.assertEqual(resource["id"], self.response["id"])
-        self.assertEqual(resource["meta"]["versionId"], str(self.response["version"]))
+        out = form_json(None, None, self.identifier, self.baseurl)
+        self.assertEqual(out["resourceType"], "Bundle")
+        self.assertEqual(out["type"], "searchset")
+        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}")
+        self.assertEqual(out["entry"], [])
+        self.assertEqual(out["total"], 0)
+
+    def test_identifier_only_returns_full_resource(self):
+        out = form_json(self.response, None, self.identifier, self.baseurl)
+        self.assertEqual(out["total"], 1)
+        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}")
+        self.assertDictEqual(out["entry"][0]["resource"], self.response["resource"])
+        self.assertEqual(out["entry"][0]["fullUrl"], f"{self.baseurl}/{self.response['id']}")
+
+    def test_identifier_with_id_element_truncates_to_id(self):
+        out = form_json(self.response, "id", self.identifier, self.baseurl)
+        res = out["entry"][0]["resource"]
+        self.assertEqual(out["total"], 1)
+        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}&_elements=id")
+        self.assertEqual(res["resourceType"], "Immunization")
+        self.assertEqual(res["id"], self.response["id"])
+        self.assertNotIn("meta", res)
+
+    def test_identifier_with_meta_element_truncates_to_meta(self):
+        out = form_json(self.response, "meta", self.identifier, self.baseurl)
+        res = out["entry"][0]["resource"]
+        self.assertEqual(out["total"], 1)
+        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}&_elements=meta")
+        self.assertEqual(res["resourceType"], "Immunization")
+        self.assertEqual(res["id"], self.response["id"])
+        self.assertIn("meta", res)
+        self.assertEqual(res["meta"]["versionId"], str(self.response["version"]))
+
+    def test_identifier_with_id_and_meta_elements_truncates_both(self):
+        out = form_json(self.response, "id,meta", self.identifier, self.baseurl)
+        res = out["entry"][0]["resource"]
+        self.assertEqual(out["total"], 1)
+        self.assertEqual(out["link"][0]["url"], f"{self.baseurl}?identifier={self.identifier}&_elements=id,meta")
+        self.assertEqual(res["resourceType"], "Immunization")
+        self.assertEqual(res["id"], self.response["id"])
+        self.assertEqual(res["meta"]["versionId"], str(self.response["version"]))
+
+    def test_elements_whitespace_and_case_are_handled(self):
+        out = form_json(self.response, "  ID ,  MeTa  ", self.identifier, self.baseurl)
+        res = out["entry"][0]["resource"]
+        self.assertEqual(res["id"], self.response["id"])
+        self.assertEqual(res["meta"]["versionId"], str(self.response["version"]))
 
 if __name__ == "__main__":
     unittest.main()