debug

Author: nhsdevws

backend/src/parameter_parser.py

@@ -6,7 +6,7 @@
 from typing import Optional
 from urllib.parse import parse_qs, urlencode, quote
 
-from clients import redis_client
+from clients import redis_client, logger
 from models.errors import ParameterException
 from models.constants import Constants
 
@@ -85,7 +85,7 @@ def process_search_params(params: ParamContainer) -> SearchParams:
 
     :raises ParameterException:
     """
-
+    logger.info("SAW: process_search_params: %s", params)
     # patient.identifier
     patient_identifiers = params.get(patient_identifier_key, [])
     patient_identifier = patient_identifiers[0] if len(patient_identifiers) == 1 else None
@@ -101,6 +101,7 @@ def process_search_params(params: ParamContainer) -> SearchParams:
                       f"e.g. \"{patient_identifier_system}|9000000009\"")
 
     patient_identifier = patient_identifier.split("|")[1]
+    logger.info("SAW: patient_identifier: %s", patient_identifier)
 
     # immunization.target
     params[immunization_target_key] = list(set(params.get(immunization_target_key, [])))
@@ -116,6 +117,7 @@ def process_search_params(params: ParamContainer) -> SearchParams:
 
     # date.from
     date_froms = params.get(date_from_key, [])
+    logger.info("SAW: date.from: %s", date_froms)
 
     if len(date_froms) > 1:
         raise ParameterException(f"Search parameter {date_from_key} may have one value at most.")
@@ -125,7 +127,7 @@ def process_search_params(params: ParamContainer) -> SearchParams:
             if len(date_froms) == 1 else date_from_default
     except ValueError:
         raise ParameterException(f"Search parameter {date_from_key} must be in format: YYYY-MM-DD")
-
+    logger.info("SAW: date.from: %s", date_from)
     # date.to
     date_tos = params.get(date_to_key, [])
 
@@ -137,6 +139,7 @@ def process_search_params(params: ParamContainer) -> SearchParams:
             if len(date_tos) == 1 else date_to_default
     except ValueError:
         raise ParameterException(f"Search parameter {date_to_key} must be in format: YYYY-MM-DD")
+    logger.info("SAW: date.to: %s", date_to)
 
     if date_from and date_to and date_from > date_to:
         raise ParameterException(f"Search parameter {date_from_key} must be before {date_to_key}")

backend/src/search_imms_handler.py

@@ -25,8 +25,11 @@ 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))
         query_params = event.get("queryStringParameters", {})
         body = event.get("body")
+        logger.info("SAW: Query parameters: %s", query_params)
+        logger.info("SAW: Body: %s", body)
         body_has_immunization_identifier = False
         query_string_has_immunization_identifier = False
         query_string_has_element = False
@@ -46,16 +49,18 @@ def search_imms(event: events.APIGatewayProxyEventV1, controller: FhirController
                 # Check for 'immunization.identifier' in body
                 body_has_immunization_identifier = "immunization.identifier" in parsed_body
                 body_has_immunization_element = "_element" in parsed_body
+            
+            logger.info("SAW: Query string has immunization identifier: %s", query_string_has_immunization_identifier)
             if (
                 query_string_has_immunization_identifier
                 or body_has_immunization_identifier
                 or query_string_has_element
                 or body_has_immunization_element
             ):
+                logger.info("SAW: Searching by immunization identifier")
                 return controller.get_immunization_by_identifier(event)
-            response = controller.search_immunizations(event)
-        else:
-            response = controller.search_immunizations(event)
+        logger.info("SAW: Searching by immunization")
+        response = controller.search_immunizations(event)
 
         result_json = json.dumps(response)
         result_size = len(result_json.encode("utf-8"))