VED-350: refactor repository to return full resource and filter per params

Author: Akol125

backend/src/fhir_repository.py

@@ -100,6 +100,7 @@ def get_immunization_by_identifier(
             if not validate_permissions(imms_vax_type_perms,ApiOperationCode.SEARCH, [vaccine_type]):
                 raise UnauthorizedVaxError()
             resource = json.loads(item["Resource"])
+            resp = dict(resource)
             resp["id"] = resource.get("id")
             resp["version"] = int(response["Items"][0]["Version"])
             return resp

backend/src/models/utils/generic_utils.py

@@ -136,52 +136,53 @@ def create_diagnostics_error(value):
 
 
 def form_json(response, _element, identifier, baseurl):
-    # Elements to include, based on the '_element' parameter
+
+    resource = response
+    self_url = f"{baseurl}?identifier={identifier}"
+    if _element:
+        self_url += f"&_elements={_element}"
+
     if not response:
         json = {
             "resourceType": "Bundle",
             "type": "searchset",
             "link": [
-                {"relation": "self", "url": f"{baseurl}?identifier={identifier}&_elements={_element}"}
+                {"relation": "self", "url": f"{baseurl}?identifier={identifier}"}
             ],
             "entry": [],
             "total": 0,
         }
         return json
 
-    # Basic structure for the JSON output
+    # Full Immunization payload to be returned if only the identifier parameter was provided
+    if identifier and _element:
+        __elements = _element.lower()
+        element = __elements.split(",")
+
+        resource = {"resourceType": "Immunization"}
+
+        # Add 'id' if specified
+        if "id" in element:
+            json["entry"][0]["resource"]["id"] = response["id"]
+
+        # Add 'meta' if specified
+        if "meta" in element:
+            resource["id"] = response["id"]
+            resource["meta"] = {"versionId": response["version"]}
+
     json = {
         "resourceType": "Bundle",
         "type": "searchset",
         "link": [{"relation": "self", "url": f"{baseurl}?identifier={identifier}&_elements={_element}"}],
         "entry": [
             {
                 "fullUrl": f"https://api.service.nhs.uk/immunisation-fhir-api/Immunization/{response['id']}",
-                "resource": {"resourceType": "Immunization"},
+                "resource": resource,
             }
         ],
         "total": 1,
     }
 
-    # Full Immunization payload to be returned if only the identifier parameter was provided
-    if identifier and (not _element):
-        json["entry"].append({
-            "fullUrl": f"https://api.service.nhs.uk/immunisation-fhir-api/Immunization/{response.get('id')}",
-            "resource": response,
-        })
-        return json
-
-    __elements = _element.lower()
-    element = __elements.split(",")
-    # Add 'id' if specified
-    if "id" in element:
-        json["entry"][0]["resource"]["id"] = response["id"]
-
-    # Add 'meta' if specified
-    if "meta" in element:
-        json["entry"][0]["resource"]["id"] = response["id"]
-        json["entry"][0]["resource"]["meta"] = {"versionId": response["version"]}
-
     return json
 
 

backend/tests/test_fhir_repository.py

@@ -53,7 +53,7 @@ def test_get_immunization_by_identifier(self):
         """it should find an Immunization by id"""
         imms_id = "a-id#an-id"
         resource = dict()
-        resource["Resource"] = {"id": "test", "version": 1}
+        resource["Resource"] = {"foo": "bar", "id": "test", "version": 1}
         self.table.query = MagicMock(
             return_value={
                 "Items": [