VED-736:Search by identifier

Author: Akol125

backend/src/fhir_service.py

@@ -67,16 +67,16 @@ def get_immunization_by_identifier(
         imms_resp = self.immunization_repo.get_immunization_by_identifier(
             identifier_pk, imms_vax_type_perms
         )
-        patient_full_url = f"urn:uuid:{str(uuid4())}"
-        filtered_resource = Filter.search(imms_resp['resource'], patient_full_url)
-        imms_resp['resource'] = filtered_resource
 
         if not imms_resp:
             base_url = f"{get_service_url()}/Immunization"
-            response = form_json(imms_resp, None, None, base_url)
+            response = form_json(imms_resp, None, None, base_url) 
             return response
         else:
             base_url = f"{get_service_url()}/Immunization"
+            patient_full_url = f"urn:uuid:{str(uuid4())}"
+            filtered_resource = Filter.search(imms_resp['resource'], patient_full_url)
+            imms_resp['resource'] = filtered_resource
             response = form_json(imms_resp, element, identifier, base_url)
             return response
 

backend/tests/test_fhir_service.py

@@ -323,14 +323,14 @@ def test_get_immunization_by_identifier(self):
         imms = "an-id#an-id"
         identifier = "test"
         element = "id,mEta,DDD"
-        self.imms_repo.get_immunization_by_identifier.return_value = {}
+        self.imms_repo.get_immunization_by_identifier.return_value = None
 
         # When
-        service_resp = self.fhir_service.get_immunization_by_identifier(imms, "COVID19:search", identifier, element)
+        service_resp = self.fhir_service.get_immunization_by_identifier(imms, "COVID19.S", identifier, element)
         act_imms = service_resp
 
         # Then
-        self.imms_repo.get_immunization_by_identifier.assert_called_once_with(imms, "COVID19:search")
+        self.imms_repo.get_immunization_by_identifier.assert_called_once_with(imms, "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 = None
+        self.imms_repo.get_immunization_by_identifier.return_value = {}
 
         # When
         act_imms = self.fhir_service.get_immunization_by_identifier(imms_id, "COVID19:search", identifier, element)