hijacking json dump instead of model dump

nhsconnect · Nov 2, 2023 · f11b29f · f11b29f
1 parent 0e02bc2
commit f11b29f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/lambdas/handlers/search_patient_details_handler.py b/lambdas/handlers/search_patient_details_handler.py
@@ -1,5 +1,6 @@
 import logging
 import os
+import json
 from json import JSONDecodeError
 
 import boto3
@@ -58,14 +59,15 @@ def lambda_handler(event, context):
         pds_api_service = get_pds_service()(SSMService())
         patient_details = pds_api_service.fetch_patient_details(nhs_number)
 
-        patient_details_dict = patient_details.model_dump()
-        gp_ods = patient_details_dict('general_practice_ods')
-        logger.info(f"Patient code: {gp_ods}")
+        response = patient_details.model_dump_json(by_alias=True)
+        json_load = json.loads(response)
+        logger.info(f"json loads: {json_load}")
+        logger.info(f"json value: {json_load['general_practice_ods']}")
+        gp_ods = json_load['general_practice_ods']
+
         if gp_ods is not user_ods_code:
             raise UserNotAuthorisedException
 
-        response = patient_details.model_dump_json(by_alias=True)
-
         return ApiGatewayResponse(200, response, "GET").create_api_gateway_response()
 
     except PatientNotFoundException as e:

diff --git a/lambdas/services/patient_search_service.py b/lambdas/services/patient_search_service.py
@@ -18,9 +18,6 @@ def handle_response(self, response: Response, nhs_number: str) -> PatientDetails
             patient = Patient.model_validate(response.json())
             logging.info(f"Patient: {patient}")
             patient_details = patient.get_patient_details(nhs_number)
-            logging.info(f"Patient Details: {patient_details.model_dump}")
-            logging.info(f"Patient Details: {patient_details.model_dump(True)}")
-            logging.info(f"Patient Details: {patient_details.model_dump['general_practice_ods']}")
             return patient_details
 
         if response.status_code == 404: