debug

Author: nhsdevws

batch_processor_filter/src/batch_processor_filter_service.py

@@ -33,14 +33,15 @@ def apply_filter(self, batch_file_created_event: BatchFileCreatedEvent) -> None:
         vaccine_type = batch_file_created_event["vaccine_type"]
 
         # debug
-        print("SAW ----------- DEBUG -------------")
+        print("SAW ----------- apply_filter DEBUG -------------")
         print(f"filename: {filename}  ")
         print(f"message_id: {message_id}  ")
         print(f"supplier: {supplier}  ")
         print(f"vaccine_type: {vaccine_type}  ")
-        print("SAW ----------- END DEBUG -------------")
 
+        print("apply_filter...checking for duplicate file...")
         if self._is_duplicate_file(filename):
+            print("apply_filter...duplicate file found")
             # Mark as processed and return without error so next event will be picked up from queue
             logger.error("A duplicate file has already been processed. Filename: %s", filename)
             self._batch_audit_repository.update_status(
@@ -51,22 +52,28 @@ def apply_filter(self, batch_file_created_event: BatchFileCreatedEvent) -> None:
             self._batch_file_repo.move_source_file_to_archive(filename)
             return
 
+        print("apply_filter...check for event already processing for supplier and vacc type...")
         if self._batch_audit_repository.is_event_processing_or_failed_for_supplier_and_vacc_type(
             supplier,
             vaccine_type
         ):
+            print("apply_filter...event already processing for supplier and vacc type found")
             # Raise error so event is returned to queue and retried again later
             logger.info("Batch event already processing for supplier and vacc type. Filename: %s", filename)
             raise EventAlreadyProcessingForSupplierAndVaccTypeError(f"Batch event already processing for supplier: "
                                                                     f"{supplier} and vacc type: {vaccine_type}")
 
+        print("apply_filter...forwarding file for processing...")
         self._queue_client.send_message(
             QueueUrl=QUEUE_URL,
             MessageBody=json.dumps(batch_file_created_event),
             MessageGroupId=f"{supplier}_{vaccine_type}"
         )
+        print("apply_filter...updating status to processing...")
         self._batch_audit_repository.update_status(message_id, FileStatus.PROCESSING)
 
+        print("apply_filter...sending log to firehose...")
         successful_log_message = f"File forwarded for processing by ECS. Filename: {filename}"
         logger.info(successful_log_message)
         send_log_to_firehose({**batch_file_created_event, "message": successful_log_message})
+        print("apply_filter...done")

e2e_batch/test_e2e_batch.py

@@ -36,14 +36,14 @@ class TestE2EBatch(unittest.TestCase):
     def setUp(self):
         self.seed_datas = [
             TestData("V0V8L", ActionSet.CREATE),
-            TestData("8HK48", ActionSet.UPDATE),
-            TestData("8HA94", ActionSet.DELETE),
+            # TestData("8HK48", ActionSet.UPDATE),
+            # TestData("8HA94", ActionSet.DELETE),
             # TestData("Reinstate", "X26", [NEW, DELETE, UPDATE]),
             # TestData("Update no Create", "YGM41", [UPDATE], expected=BusRowResult.FATAL_ERROR,
             #          operation_outcome=OpMsgs.IMM_NOT_EXIST),
             # TestData("Delete no Create", "YGJ", [DELETE], expected=BusRowResult.FATAL_ERROR,
             #          operation_outcome=OpMsgs.IMM_NOT_EXIST),
-            TestData("YGA", ActionSet.CREATE, inject_char=True, name="Create with 1252 char"),
+            # TestData("YGA", ActionSet.CREATE, inject_char=True, name="Create with 1252 char"),
         ]
 
     def tearDown(self):

e2e_batch/utils.py

@@ -580,6 +580,7 @@ def generate_csv_files(seed_data_list: list[TestData]) -> list[TestData]:
     """Generate CSV files based on a list of TestData instances."""
     for seed_data in seed_data_list:
         file_name = (generate_csv_file(seed_data, actions=seed_data.action_sequence.actions))
+        logger.info(f"Test file: {file_name}")
         seed_data.file_name = file_name
     return seed_data_list