debug

Author: nhsdevws

backend/src/fhir_controller.py

@@ -10,6 +10,7 @@
 from aws_lambda_typing.events import APIGatewayProxyEventV1
 from fhir.resources.R4B.immunization import Immunization
 from boto3 import client as boto3_client
+from clients import logger
 
 from authorization import Authorization, UnknownPermission
 from fhir_repository import ImmunizationRepository, create_table
@@ -391,10 +392,13 @@ def delete_immunization(self, aws_event):
             return self.create_response(403, unauthorized.to_operation_outcome())
 
     def search_immunizations(self, aws_event: APIGatewayProxyEventV1) -> dict:
+        logger.info("SAW: search_immunizations")
+        
         if response := self.authorize_request(aws_event):
             return response
-
+        logger.info("SAW: Authorised request")
         try:
+            logger.info("SAW: Processing search parameters")
             search_params = process_search_params(process_params(aws_event))
         except ParameterException as e:
             return self._create_bad_request(e.message)
@@ -427,7 +431,7 @@ def search_immunizations(self, aws_event: APIGatewayProxyEventV1) -> dict:
         except UnauthorizedVaxError as unauthorized:
             return self.create_response(403, unauthorized.to_operation_outcome())
         # Check vaxx type permissions on the existing record - end
-
+        logger.info("SAW: Searching immunizations...")
         result = self.fhir_service.search_immunizations(
             search_params.patient_identifier,
             vax_type_perm,

backend/src/fhir_service.py

@@ -288,11 +288,16 @@ 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",)
         # 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)
         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",
+                     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
@@ -307,21 +312,27 @@ def search_immunizations(
         # 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")
         imms_patient_record = get_contained_patient(resources[-1]) if resources else None
 
+        logger.info("SAW: filter resources for search")
         # 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))
         # Add bundle entries for each of the immunization resources
         entries = [
             BundleEntry(
                 resource=Immunization.parse_obj(imms),
                 search=BundleEntrySearch(mode="match"),
                 fullUrl=f"https://api.service.nhs.uk/immunisation-fhir-api/Immunization/{imms['id']}",
             )
-            for imms in resources_filtered_for_search
+            # get imms and log for debug
+            for imms in resources_filtered_for_search:
+                logger.debug("SAW: filtered immunization resource: %s", imms)
         ]
 
+
+        logger.info("SAW: entries created for bundle: %d", len(entries))
         # Add patient resource if there is at least one immunization resource
         if len(resources) > 0:
             entries.append(

backend/src/search_imms_handler.py

@@ -25,7 +25,7 @@ def search_imms_handler(event: events.APIGatewayProxyEventV1, _context: context_
 
 def search_imms(event: events.APIGatewayProxyEventV1, controller: FhirController):
     try:
-        logger.info("SAW: Search event: %s", json.dumps(event, indent=2))
+        logger.info("SAW: Search event") #   %s", json.dumps(event, indent=2))
         query_params = event.get("queryStringParameters", {})
         body = event.get("body")
         logger.info("SAW: Query parameters: %s", query_params)