refactor test and generic utils

Author: Akol125

backend/src/models/utils/generic_utils.py

@@ -137,6 +137,7 @@ def create_diagnostics_error(value):
 
 def form_json(response, _element, identifier, baseurl):
     self_url = f"{baseurl}?identifier={identifier}" + (f"&_elements={_element}" if _element else "")
+    meta = {"versionId": response["version"]} if response and "version" in response else {}
     json = {
             "resourceType": "Bundle",
             "type": "searchset",
@@ -152,7 +153,7 @@ def form_json(response, _element, identifier, baseurl):
     # Full Immunization payload to be returned if only the identifier parameter was provided
     if identifier and not _element:
         resource = response["resource"]
-        resource["meta"] = {"versionId": response["version"]}
+        resource["meta"] = meta
 
     elif identifier and _element:
         element = {e.strip().lower() for e in _element.split(",") if e.strip()}
@@ -165,7 +166,7 @@ def form_json(response, _element, identifier, baseurl):
         # Add 'meta' if specified
         if "meta" in element:
             resource["id"] = response["id"]
-            resource["meta"] = {"versionId": response["version"]}
+            resource["meta"] = meta
 
     json["entry"] = [{
         "fullUrl": f"https://api.service.nhs.uk/immunisation-fhir-api/Immunization/{response['id']}",

backend/tests/sample_data/completed_covid19_immunization_event.json

@@ -51,6 +51,7 @@
   ],
   "identifier": [
     {
+      "use": "official",
       "system": "https://supplierABC/identifiers/vacc",
       "value": "ACME-vacc123456"
     }

backend/tests/sample_data/completed_covid19_immunization_event_for_read.json

@@ -50,6 +50,7 @@
     }
   ],"identifier": [
     {
+      "use": "official",
       "system": "https://supplierABC/identifiers/vacc",
       "value": "ACME-vacc123456"
     }

backend/tests/test_fhir_service.py

@@ -320,17 +320,17 @@ def tearDown(self):
 
     def test_get_immunization_by_identifier(self):
         """it should find an Immunization by id"""
-        imms = "an-id#an-id"
+        imms_id = "an-id#an-id"
         identifier = "test"
         element = "id,mEta,DDD"
         self.imms_repo.get_immunization_by_identifier.return_value = None
 
         # When
-        service_resp = self.fhir_service.get_immunization_by_identifier(imms, "COVID19.S", identifier, element)
+        service_resp = self.fhir_service.get_immunization_by_identifier(imms_id, "COVID19.S", identifier, element)
         act_imms = service_resp
 
         # Then
-        self.imms_repo.get_immunization_by_identifier.assert_called_once_with(imms, "COVID19.S")
+        self.imms_repo.get_immunization_by_identifier.assert_called_once_with(imms_id, "COVID19.S")
 
         self.assertEqual(act_imms["resourceType"], "Bundle")
 
@@ -339,7 +339,7 @@ def test_immunization_not_found(self):
         imms_id = "none"
         identifier = "test"
         element = "id"
-        self.imms_repo.get_immunization_by_identifier.return_value = {}
+        self.imms_repo.get_immunization_by_identifier.return_value = None
 
         # When
         act_imms = self.fhir_service.get_immunization_by_identifier(imms_id, "COVID19.CRUDS", identifier, element)

backend/tests/utils/immunization_utils.py

@@ -27,6 +27,7 @@ def create_covid_19_immunization_dict(
 
     return immunization_json
 
+
 def create_covid_19_immunization_dict_no_id(
     nhs_number=VALID_NHS_NUMBER, occurrence_date_time="2021-02-07T13:28:17.271+00:00"
 ):