VED-350: resolve internal server error and remove id, version from full resource

Author: Akol125

backend/src/fhir_repository.py

@@ -95,15 +95,16 @@ def get_immunization_by_identifier(
         )
         if "Items" in response and len(response["Items"]) > 0:
             item = response["Items"][0]
-            resp = dict()
             vaccine_type = self._vaccine_type(item["PatientSK"])
             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
+            version = int(response["Items"][0]["Version"])
+            return {
+                "resource": resource,
+                "id": resource.get("id"),
+                "version": version
+            }
         else:
             return None
 

backend/src/models/utils/generic_utils.py

@@ -136,8 +136,6 @@ def create_diagnostics_error(value):
 
 
 def form_json(response, _element, identifier, baseurl):
-
-    resource = response
     self_url = f"{baseurl}?identifier={identifier}"
     if _element:
         self_url += f"&_elements={_element}"
@@ -155,15 +153,18 @@ def form_json(response, _element, identifier, baseurl):
         return json
 
     # Full Immunization payload to be returned if only the identifier parameter was provided
-    if identifier and _element:
+    if identifier and not _element:
+        resource = response["resource"]
+
+    elif 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"]
+            resource["id"] = response["id"]
 
         # Add 'meta' if specified
         if "meta" in element:

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"] = {"foo": "bar", "id": "test", "version": 1}
+        resource["Resource"] = {"foo": "bar", "id": "test"}
         self.table.query = MagicMock(
             return_value={
                 "Items": [
@@ -69,7 +69,9 @@ def test_get_immunization_by_identifier(self):
         imms = self.repository.get_immunization_by_identifier(imms_id, ["COVID19.CRUDS"])
 
         # Validate the results
-        self.assertDictEqual(resource["Resource"], imms)
+        self.assertDictEqual(resource["Resource"], imms["resource"])
+        self.assertEqual(imms["version"], 1)
+        self.assertEqual(imms["id"], "test")
         # self.table.get_item.assert_called_once_with(Key={"PK": (imms_id)})
         self.table.query.assert_called_once_with(
             IndexName="IdentifierGSI",