tidy

Author: nhsdevws

ack_backend/src/ack_processor.py

@@ -13,6 +13,7 @@ def lambda_handler(event, context):
     For each record: each message in the array of messages is converted to an ack row,
     then all of the ack rows for that array of messages are uploaded to the ack file in one go.
     """
+
     if not event.get("Records"):
         raise ValueError("Error in ack_processor_lambda_handler: No records found in the event")
 
@@ -23,6 +24,7 @@ def lambda_handler(event, context):
     ack_data_rows = []
 
     for i, record in enumerate(event["Records"]):
+
         try:
             incoming_message_body = json.loads(record["body"])
         except Exception as body_json_error:

ack_backend/src/convert_message_to_ack_row.py

@@ -4,6 +4,7 @@
 from logging_decorators import convert_message_to_ack_row_logging_decorator
 from update_ack_file import create_ack_data
 
+
 def get_error_message_for_ack_file(message_diagnostics) -> Union[None, str]:
     """Determines and returns the error message to be displayed in the ack file"""
     if message_diagnostics is None:

batch_processor_filter/src/batch_processor_filter_service.py

@@ -32,8 +32,6 @@ def apply_filter(self, batch_file_created_event: BatchFileCreatedEvent) -> None:
         supplier = batch_file_created_event["supplier"]
         vaccine_type = batch_file_created_event["vaccine_type"]
 
-        logger.info("Received batch file event for filename: %s with message id: %s", filename, message_id)
-
         if self._is_duplicate_file(filename):
             # 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)
@@ -54,12 +52,12 @@ def apply_filter(self, batch_file_created_event: BatchFileCreatedEvent) -> None:
             raise EventAlreadyProcessingForSupplierAndVaccTypeError(f"Batch event already processing for supplier: "
                                                                     f"{supplier} and vacc type: {vaccine_type}")
 
-        self._batch_audit_repository.update_status(message_id, FileStatus.PROCESSING)
         self._queue_client.send_message(
             QueueUrl=QUEUE_URL,
             MessageBody=json.dumps(batch_file_created_event),
             MessageGroupId=f"{supplier}_{vaccine_type}"
         )
+        self._batch_audit_repository.update_status(message_id, FileStatus.PROCESSING)
 
         successful_log_message = f"File forwarded for processing by ECS. Filename: {filename}"
         logger.info(successful_log_message)