debug

Author: nhsdevws

backend/src/fhir_controller.py

@@ -405,10 +405,13 @@ def search_immunizations(self, aws_event: APIGatewayProxyEventV1) -> dict:
         if search_params is None:
             raise Exception("Failed to parse parameters.")
 
+        logger.info("SAW: fhir_controller. search_params: %s", search_params)
         # Check vaxx type permissions- start
         try:
             if aws_event.get("headers"):
                 supplier_system = self._identify_supplier_system(aws_event)
+                logger.info("SAW: Supplier system identified: %s", supplier_system)
+                logger.info("SAW: Get supplier permissions for: %s", supplier_system)
                 imms_vax_type_perms = get_supplier_permissions(supplier_system)
                 if len(imms_vax_type_perms) == 0:
                     raise UnauthorizedVaxError()

backend/src/fhir_service.py

@@ -288,42 +288,42 @@ def search_immunizations(
         Finds all instances of Immunization(s) for a specified patient which are for the specified vaccine type(s).
         Bundles the resources with the relevant patient resource and returns the bundle.
         """
-        logger.info("SAW: search_immunizations for nhs_number: %s, vaccine_types: %s, date_from: %s, date_to: %s", 
+        logger.info("SAW: search_immunizations...1 nhs_number: %s, vaccine_types: %s, date_from: %s, date_to: %s", 
                      nhs_number, vaccine_types, date_from, date_to)
         # TODO: is disease type a mandatory field? (I assumed it is)
         #  i.e. Should we provide a search option for getting Patient's entire imms history?
 
-        logger.info("checking nhs_number_mod11_check for nhs_number: %s", nhs_number)
+        logger.info("SAW: search_immunizations...2 check nhs_number_mod11_check for nhs_number: %s", nhs_number)
         if not nhs_number_mod11_check(nhs_number):
             return create_diagnostics()
 
-        logger.info("SAW:obtain resources for nhs_number: %s, vaccine_types: %s, date_from: %s, date_to: %s",
+        logger.info("SAW: search_immunizations...3 obtain resources for nhs_number: %s, vaccine_types: %s, date_from: %s, date_to: %s",
                      nhs_number, vaccine_types, date_from, date_to)
         # Obtain all resources which are for the requested nhs number and vaccine type(s) and within the date range
         resources = [
             r
             for r in self.immunization_repo.find_immunizations(nhs_number, vaccine_types)
             if self.is_valid_date_from(r, date_from) and self.is_valid_date_to(r, date_to)
         ]
-
+        logger.info("SAW: search_immunizations...4 no of resources found: %d", len(resources))
         # 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())}"
 
-        logger.info("SAW: call get_contained_patient")
+        logger.info("SAW: search_immunizations...5 call get_contained_patient")
         imms_patient_record = get_contained_patient(resources[-1]) if resources else None
 
-        logger.info("SAW: filter resources for search")
+        logger.info("SAW: search_immunizations...6 filter resources for search")
         # log pretty resources for debug
-        logger.info("SAW: resources: %s", [
+        logger.info("SAW: search_immunizations...7 resources: %s", [
             Immunization.parse_obj(r).json(indent=2) for r in resources
         ])
 # Filter and amend the immunization resources for the SEARCH response
         resources_filtered_for_search = [Filter.search(imms, patient_full_url) for imms in resources]
-        logger.info("SAW: no of items in filtered resources: %d", len(resources_filtered_for_search))
+        logger.info("SAW: search_immunizations...8 no of items in filtered resources: %d", len(resources_filtered_for_search))
         # Add bundle entries for each of the immunization resources
         entries = [
             BundleEntry(
@@ -336,11 +336,11 @@ def search_immunizations(
         ]
 
 
-        logger.info("SAW: entries created for bundle: %d", len(entries))
-        
+        logger.info("SAW: search_immunizations...9 entries created for bundle: %d", len(entries))
+
         for entry in entries:
-            logger.debug("SAW: entry: %s", entry.resource.json(indent=2))                       
-        
+            logger.debug("SAW: search_immunizations...10 entry: %s", entry.resource.json(indent=2))
+
         # Add patient resource if there is at least one immunization resource
         if len(resources) > 0:
             entries.append(