Fixed unit test and refactored filter function

Author: robertnovac1

backend/src/filter.py

@@ -104,10 +104,10 @@ def read(imms: dict) -> dict:
     def search(imms: dict, patient_full_url: str, bundle_patient: dict = None) -> dict:
         """Apply filtering for an individual FHIR Immunization Resource as part of SEARCH request"""
         imms = remove_reference_to_contained_practitioner(imms)
-        imms_patient_data = get_contained_patient(imms)
-        imms.pop("contained")
-        imms["patient"] = create_reference_to_patient_resource(patient_full_url, imms_patient_data)
+        imms["patient"] = create_reference_to_patient_resource(patient_full_url, get_contained_patient(imms))
         imms = add_use_to_identifier(imms)
+        imms.pop("contained")
+        
         return imms
 
     @staticmethod

backend/tests/test_fhir_service.py

@@ -824,19 +824,15 @@ def test_immunization_resources_are_filtered_for_search(self):
         # Arrange
         imms_ids = ["imms-1", "imms-2"]
         imms_list = [
-            create_covid_19_immunization_dict(imms_id, occurrence_date_time="2021-02-07T13:28:17+00:00")
+            create_covid_19_immunization_dict(imms_id, NHS_NUMBER_USED_IN_SAMPLE_DATA, occurrence_date_time="2021-02-07T13:28:17+00:00")
             for imms_id in imms_ids
         ]
-        self.pds_service.get_patient_details.return_value = {
-            **deepcopy(self.sample_patient_resource),
-            "meta": {"security": [{"code": "U"}]},
-        }
-        nhs_number = NHS_NUMBER_USED_IN_SAMPLE_DATA
+        
         vaccine_types = [VaccineTypes.covid_19]
         self.imms_repo.find_immunizations.return_value = deepcopy(imms_list)
 
         # When
-        result = self.fhir_service.search_immunizations(nhs_number, vaccine_types, "")
+        result = self.fhir_service.search_immunizations(NHS_NUMBER_USED_IN_SAMPLE_DATA, vaccine_types, "")
         searched_imms = [
             json.loads(entry.json(), parse_float=Decimal)
             for entry in result.entry
@@ -860,50 +856,6 @@ def test_immunization_resources_are_filtered_for_search(self):
             expected_output_resource["id"] = imms_ids[i]
             self.assertEqual(entry["resource"], expected_output_resource)
 
-    def test_immunization_resources_are_filtered_for_search_and_s_flag(self):
-        """
-        Test that each immunization resource returned is filtered to include only the appropriate fields for a search
-        response when the patient is Restricted
-        """
-        # Arrange
-        imms_ids = ["imms-1", "imms-2"]
-        imms_list = [
-            create_covid_19_immunization_dict(imms_id, occurrence_date_time="2021-02-07T13:28:17+00:00")
-            for imms_id in imms_ids
-        ]
-        self.pds_service.get_patient_details.return_value = {
-            **deepcopy(self.sample_patient_resource),
-            "meta": {"security": [{"code": "R"}]},
-        }
-        nhs_number = NHS_NUMBER_USED_IN_SAMPLE_DATA
-        vaccine_types = [VaccineTypes.covid_19]
-        self.imms_repo.find_immunizations.return_value = deepcopy(imms_list)
-
-        # When
-        result = self.fhir_service.search_immunizations(nhs_number, vaccine_types, "")
-        searched_imms = [
-            json.loads(entry.json(), parse_float=Decimal)
-            for entry in result.entry
-            if entry.resource.resource_type == "Immunization"
-        ]
-        searched_patient = [
-            json.loads(entry.json()) for entry in result.entry if entry.resource.resource_type == "Patient"
-        ][0]
-
-        # Then
-        expected_output_resource = load_json_data(
-            "completed_covid19_immunization_event_filtered_for_search_and_s_flag_using_bundle_patient_resource.json"
-        )
-        expected_output_resource["patient"]["reference"] = searched_patient["fullUrl"]
-
-        for i, entry in enumerate(searched_imms):
-            # Check that entry has correct resource id
-            self.assertEqual(entry["resource"]["id"], imms_ids[i])
-
-            # Check that output is as expected (filtered, with id added)
-            expected_output_resource["id"] = imms_ids[i]
-            self.assertEqual(entry["resource"], expected_output_resource)
-
     def test_matches_contain_fullUrl(self):
         """All matches must have a fullUrl consisting of their id.
         See http://hl7.org/fhir/R4B/bundle-definitions.html#Bundle.entry.fullUrl.