Removed PDS call from search and used Patient resource from last immunisation Contained resource in the final response

Author: robertnovac1

backend/src/fhir_service.py

@@ -19,7 +19,7 @@
 from models.field_names import FieldNames
 from models.errors import InvalidPatientId, CustomValidationError, UnhandledResponseError
 from models.fhir_immunization import ImmunizationValidator
-from models.utils.generic_utils import nhs_number_mod11_check, get_occurrence_datetime, create_diagnostics, form_json
+from models.utils.generic_utils import nhs_number_mod11_check, get_occurrence_datetime, create_diagnostics, form_json, get_contained_patient
 from models.constants import Constants
 from models.errors import MandatoryError
 from pds_service import PdsService
@@ -316,25 +316,22 @@ def search_immunizations(
             if self.is_valid_date_from(r, date_from) and self.is_valid_date_to(r, date_to)
         ]
 
-        # Check whether the Superseded NHS number present in PDS
-        if pds_patient := self.pds_service.get_patient_details(nhs_number):
-            if pds_patient["identifier"][0]["value"] != nhs_number:
-                return create_diagnostics()
-
         # Create the patient URN for the fullUrl field.
         # NOTE: This UUID is assigned when a SEARCH request is received and used only for referencing the patient
         # resource from immunisation resources within the bundle. The fullUrl value we are using is a urn (hence the
         # FHIR key name of "fullUrl" is somewhat misleading) which cannot be used to locate any externally stored
         # patient resource. This is as agreed with VDS team for backwards compatibility with Immunisation History API.
         patient_full_url = f"urn:uuid:{str(uuid4())}"
-
-        # Filter and amend the immunization resources for the SEARCH response
-        resources_filtered_for_search = [Filter.search(imms, patient_full_url, pds_patient) for imms in resources]
+        
+        imms_patient_record = get_contained_patient(resources[-1]) if resources else None
+        
+        # Filter and amend the immunization resources for the SEARCH response            
+        resources_filtered_for_search = [Filter.search(imms, patient_full_url, []) for imms in resources]
 
         # Add bundle entries for each of the immunization resources
         entries = [
             BundleEntry(
-                resource=Immunization.parse_obj(handle_s_flag(imms, pds_patient)),
+                resource=Immunization.parse_obj(imms),
                 search=BundleEntrySearch(mode="match"),
                 fullUrl=f"https://api.service.nhs.uk/immunisation-fhir-api/Immunization/{imms['id']}",
             )
@@ -345,7 +342,7 @@ def search_immunizations(
         if len(resources) > 0:
             entries.append(
                 BundleEntry(
-                    resource=self.process_patient_for_bundle(pds_patient),
+                    resource=self.process_patient_for_bundle(imms_patient_record),
                     search=BundleEntrySearch(mode="include"),
                     fullUrl=patient_full_url,
                 )

backend/src/filter.py

@@ -1,6 +1,6 @@
 """Functions for filtering a FHIR Immunization Resource"""
 
-from models.utils.generic_utils import is_actor_referencing_contained_resource, get_contained_practitioner
+from models.utils.generic_utils import is_actor_referencing_contained_resource, get_contained_practitioner, get_contained_patient
 from constants import Urls
 
 
@@ -104,8 +104,9 @@ 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, bundle_patient)
+        imms["patient"] = create_reference_to_patient_resource(patient_full_url, imms_patient_data)
         imms = add_use_to_identifier(imms)
         return imms