debug

Author: nhsdevws

backend/src/fhir_repository.py

@@ -392,70 +392,70 @@ def delete_immunization(
                     response=error.response,
                 )
 
-def find_immunizations(self, patient_identifier: str, vaccine_types: list):
-    """it should find all of the specified patient's Immunization events for all of the specified vaccine_types"""
-    
-    # ✅ Add debug logging
-    import logging
-    logger = logging.getLogger(__name__)
-    
-    logger.info("SAW fi...1: find_immunizations called with patient_identifier: '%s', vaccine_types: %s", 
-                patient_identifier, vaccine_types)
-    
-    # Create the patient PK and log it
-    patient_pk = _make_patient_pk(patient_identifier)
-    logger.info("SAW fi...2: patient_pk created: '%s'", patient_pk)
-
-    condition = Key("PatientPK").eq(patient_pk)
-    is_not_deleted = Attr("DeletedAt").not_exists() | Attr("DeletedAt").eq("reinstated")
-
-    logger.info("SAW fi...3: executing DynamoDB query on PatientGSI index")
-
-    response = self.table.query(
-        IndexName="PatientGSI",
-        KeyConditionExpression=condition,
-        FilterExpression=is_not_deleted,
-    )
-    
-    # ✅ Log the raw DynamoDB response
-    logger.info("SAW fi...4: DynamoDB query response - Count: %s, ScannedCount: %s", 
-                response.get("Count", 0), response.get("ScannedCount", 0))
-    
-    if "Items" in response:
-        raw_items = response["Items"]
-        logger.info("SAW fi...5: total items returned from DynamoDB: %d", len(raw_items))
+    def find_immunizations(self, patient_identifier: str, vaccine_types: list):
+        """it should find all of the specified patient's Immunization events for all of the specified vaccine_types"""
+        
+        # ✅ Add debug logging
+        import logging
+        logger = logging.getLogger(__name__)
+        
+        logger.info("SAW fi...1: find_immunizations called with patient_identifier: '%s', vaccine_types: %s", 
+                    patient_identifier, vaccine_types)
+        
+        # Create the patient PK and log it
+        patient_pk = _make_patient_pk(patient_identifier)
+        logger.info("SAW fi...2: patient_pk created: '%s'", patient_pk)
+
+        condition = Key("PatientPK").eq(patient_pk)
+        is_not_deleted = Attr("DeletedAt").not_exists() | Attr("DeletedAt").eq("reinstated")
+
+        logger.info("SAW fi...3: executing DynamoDB query on PatientGSI index")
+
+        response = self.table.query(
+            IndexName="PatientGSI",
+            KeyConditionExpression=condition,
+            FilterExpression=is_not_deleted,
+        )
 
-        # Log first few items for debugging
-        if raw_items:
-            logger.info("SAW fi...6: sample raw item keys: %s", list(raw_items[0].keys()))
-            logger.info("SAW fi...7: first few PatientSK values: %s",
-                       [item.get("PatientSK", "MISSING") for item in raw_items[:3]])
+        # ✅ Log the raw DynamoDB response
+        logger.info("SAW fi...4: DynamoDB query response - Count: %s, ScannedCount: %s", 
+                    response.get("Count", 0), response.get("ScannedCount", 0))
 
-        # Filter the response to contain only the requested vaccine types
-        items = [x for x in raw_items if x["PatientSK"].split("#")[0] in vaccine_types]
+        if "Items" in response:
+            raw_items = response["Items"]
+            logger.info("SAW fi...5: total items returned from DynamoDB: %d", len(raw_items))
+            
+            # Log first few items for debugging
+            if raw_items:
+                logger.info("SAW fi...6: sample raw item keys: %s", list(raw_items[0].keys()))
+                logger.info("SAW fi...7: first few PatientSK values: %s",
+                        [item.get("PatientSK", "MISSING") for item in raw_items[:3]])
+            
+            # Filter the response to contain only the requested vaccine types
+            items = [x for x in raw_items if x["PatientSK"].split("#")[0] in vaccine_types]
+
+            logger.info("SAW fi...8: after vaccine_types filtering (%s): %d items", vaccine_types, len(items))
+
+            if items:
+                # Log the vaccine types found
+                found_vaccine_types = [item["PatientSK"].split("#")[0] for item in items]
+                logger.info("SAW fi...9: found vaccine types: %s", found_vaccine_types)
+            else:
+                # Debug why no items matched
+                all_vaccine_types = [item["PatientSK"].split("#")[0] for item in raw_items]
+                logger.warning("SAW fi...10: no items matched vaccine_types filter!")
+                logger.warning("SAW fi...11: requested vaccine_types: %s", vaccine_types)
+                logger.warning("SAW fi...12: available vaccine_types in data: %s", list(set(all_vaccine_types)))
 
-        logger.info("SAW fi...8: after vaccine_types filtering (%s): %d items", vaccine_types, len(items))
+            # Return a list of the FHIR immunization resource JSON items
+            final_resources = [json.loads(item["Resource"]) for item in items]
+            logger.info("SAW fi...13: returning %d FHIR resources", len(final_resources))
 
-        if items:
-            # Log the vaccine types found
-            found_vaccine_types = [item["PatientSK"].split("#")[0] for item in items]
-            logger.info("SAW fi...9: found vaccine types: %s", found_vaccine_types)
+            return final_resources
         else:
-            # Debug why no items matched
-            all_vaccine_types = [item["PatientSK"].split("#")[0] for item in raw_items]
-            logger.warning("SAW fi...10: no items matched vaccine_types filter!")
-            logger.warning("SAW fi...11: requested vaccine_types: %s", vaccine_types)
-            logger.warning("SAW fi...12: available vaccine_types in data: %s", list(set(all_vaccine_types)))
-
-        # Return a list of the FHIR immunization resource JSON items
-        final_resources = [json.loads(item["Resource"]) for item in items]
-        logger.info("SAW fi...13: returning %d FHIR resources", len(final_resources))
-
-        return final_resources
-    else:
-        logger.error("SAW fi...14: No 'Items' key in DynamoDB response!")
-        logger.error("SAW fi...15: Response keys: %s", list(response.keys()))
-        raise UnhandledResponseError(message=f"Unhandled error. Query failed", response=response)
+            logger.error("SAW fi...14: No 'Items' key in DynamoDB response!")
+            logger.error("SAW fi...15: Response keys: %s", list(response.keys()))
+            raise UnhandledResponseError(message=f"Unhandled error. Query failed", response=response)
 
     @staticmethod
     def _handle_dynamo_response(response):

backend/tests/test_fhir_batch_repository.py

@@ -31,10 +31,11 @@ def setUp(self):
         self.table.update_item = MagicMock(return_value = {"ResponseMetadata": {"HTTPStatusCode": 200}})
         self.redis_patcher = patch("models.utils.validation_utils.redis_client")
         self.mock_redis_client = self.redis_patcher.start()
+        self.logger_info_patcher = patch("logging.Logger.info")
+        self.mock_logger_info = self.logger_info_patcher.start()
 
     def tearDown(self):
-        self.redis_patcher.stop()
-        return super().tearDown()
+        patch.stopall()
 
 class TestCreateImmunization(TestImmunizationBatchRepository): 
 

backend/tests/test_fhir_service.py

@@ -39,11 +39,18 @@ def setUp(self):
         self.mock_logger_info = self.logger_info_patcher.start()
 
     def tearDown(self):
-        self.redis_patcher.stop()
-        self.logger_info_patcher.stop()
         super().tearDown()
+        patch.stopall()
 
 class TestServiceUrl(unittest.TestCase):
+    
+    def setUp(self):
+        self.logger_info_patcher = patch("logging.Logger.info")
+        self.mock_logger_info = self.logger_info_patcher.start()
+        
+    def tearDown(self):
+        patch.stopall()
+    
     def test_get_service_url(self):
         """it should create service url"""
         env = "int"
@@ -74,6 +81,11 @@ def setUp(self):
         self.imms_repo = create_autospec(ImmunizationRepository)
         self.validator = create_autospec(ImmunizationValidator)
         self.fhir_service = FhirService(self.imms_repo, self.validator)
+        self.logger_info_patcher = patch("logging.Logger.info")
+        self.mock_logger_info = self.logger_info_patcher.start()
+
+    def tearDown(self):
+        patch.stopall()
 
     def test_get_immunization_by_id_by_all(self):
         """it should find an Immunization by id"""
@@ -179,10 +191,6 @@ def setUp(self):
         self.imms_repo = create_autospec(ImmunizationRepository)
         self.validator = create_autospec(ImmunizationValidator)
         self.fhir_service = FhirService(self.imms_repo, self.validator)
-        self.logger_info_patcher = patch("logging.Logger.info")
-        self.mock_logger_info = self.logger_info_patcher.start()
-    def tearDown(self):
-        patch.stopall()
 
     def test_get_immunization_by_id(self):
         """it should find an Immunization by id"""
@@ -630,9 +638,9 @@ class TestSearchImmunizations(unittest.TestCase):
     """Tests for FhirService.search_immunizations"""
 
     def setUp(self):
-        self.imms_repo = create_autospec(ImmunizationRepository)
+        self.imms_repo = MagicMock()
         self.validator = create_autospec(ImmunizationValidator)
-        self.fhir_service = FhirService(self.imms_repo, self.validator)
+        self.fhir_service = FhirService(self.imms_repo, self.validator)        
         self.nhs_search_param = "patient.identifier"
         self.vaccine_type_search_param = "-immunization.target"
         self.sample_patient_resource = load_json_data("bundle_patient_resource.json")
@@ -643,12 +651,17 @@ def test_vaccine_type_search(self):
         vaccine_type = "COVID19"
         params = f"{self.nhs_search_param}={nhs_number}&{self.vaccine_type_search_param}={vaccine_type}"
 
+        self.imms_repo.find_immunizations.return_value = []
+
         # When
-        _ = self.fhir_service.search_immunizations(nhs_number, [vaccine_type], params)
+        result = self.fhir_service.search_immunizations(nhs_number, [vaccine_type], params)
 
         # Then
         self.imms_repo.find_immunizations.assert_called_once_with(nhs_number, [vaccine_type])
-
+        
+        self.assertEqual(result.type, "searchset")
+        self.assertEqual(len([e for e in result.entry if e.resource.resource_type == "Immunization"]), 0)
+        
     def test_make_fhir_bundle_from_search_result(self):
         """It should return a FHIR Bundle resource"""
         imms_ids = ["imms-1", "imms-2"]