retry with common filter module

Author: Akol125

backend/src/fhir_service.py

@@ -67,13 +67,17 @@ def get_immunization_by_identifier(
         imms_resp = self.immunization_repo.get_immunization_by_identifier(
             identifier_pk, imms_vax_type_perms
         )
-        if not imms_resp:
+
+        patient_full_url = f"urn:uuid:{str(uuid4())}"
+        filtered_response = [Filter.search(imms, patient_full_url) for imms in imms_resp]
+
+        if not filtered_response:
             base_url = f"{get_service_url()}/Immunization"
-            response = form_json(imms_resp, None, None, base_url)
+            response = form_json(filtered_response[0], None, None, base_url)
             return response
         else:
             base_url = f"{get_service_url()}/Immunization"
-            response = form_json(imms_resp, element, identifier, base_url)
+            response = form_json(filtered_response[0], element, identifier, base_url)
             return response
 
     def get_immunization_by_id(self, imms_id: str, imms_vax_type_perms: list[str]) -> Optional[dict]:

backend/src/models/utils/generic_utils.py

@@ -152,9 +152,6 @@ 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.pop("contained", None)
-        if "use" not in response["identifier"][0]:
-            resource["identifier"][0]["use"] = "official"
 
     elif identifier and _element:
         element = {e.strip().lower() for e in _element.split(",") if e.strip()}
@@ -167,7 +164,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"] = {"versionId": response.get("version")}
 
     json["entry"] = [{
         "fullUrl": f"https://api.service.nhs.uk/immunisation-fhir-api/Immunization/{response['id']}",

backend/tests/test_fhir_service.py

@@ -321,9 +321,11 @@ def tearDown(self):
     def test_get_immunization_by_identifier(self):
         """it should find an Immunization by id"""
         imms = "an-id#an-id"
+        imms_ids = ["imms-1", "imms-2"]
+        imms_list = [create_covid_19_immunization_dict(imms_id) for imms_id in imms_ids]
         identifier = "test"
-        element = "id,mEta,DDD"
-        self.imms_repo.get_immunization_by_identifier.return_value = {}
+        element = "id,meta"
+        self.imms_repo.get_immunization_by_identifier.return_value = deepcopy(imms_list)
 
         # When
         service_resp = self.fhir_service.get_immunization_by_identifier(imms, "COVID19:search", identifier, element)
@@ -337,15 +339,17 @@ def test_get_immunization_by_identifier(self):
     def test_immunization_not_found(self):
         """it should return None if Immunization doesn't exist"""
         imms_id = "none"
+        imms_ids = ["imms-1", "imms-2"]
+        imms_list = [create_covid_19_immunization_dict(imms_id) for imms_id in imms_ids]
         identifier = "test"
         element = "id"
-        self.imms_repo.get_immunization_by_identifier.return_value = None
+        self.imms_repo.get_immunization_by_identifier.return_value = deepcopy(imms_list)
 
         # When
-        act_imms = self.fhir_service.get_immunization_by_identifier(imms_id, "COVID19:search", identifier, element)
+        act_imms = self.fhir_service.get_immunization_by_identifier(imms_id, "COVID19.S", identifier, element)
 
         # Then
-        self.imms_repo.get_immunization_by_identifier.assert_called_once_with(imms_id, "COVID19:search")
+        self.imms_repo.get_immunization_by_identifier.assert_called_once_with(imms_id, "COVID19.S")
 
         self.assertEqual(act_imms["entry"], [])