unrefactored

Author: JamesW1-NHS

ack_backend/src/update_ack_file.py

@@ -66,25 +66,6 @@ def obtain_current_ack_content(temp_ack_file_key: str) -> StringIO:
     return accumulated_csv_content
 
 
-def handle_ingestion_complete(
-    temp_ack_file_key: str,
-    message_id: str,
-    supplier: str,
-    vaccine_type: str,
-    archive_ack_file_key: str,
-    file_key: str,
-) -> None:
-    """Handles processing where the complete file has been ingested"""
-    move_file(ACK_BUCKET_NAME, temp_ack_file_key, archive_ack_file_key)
-    move_file(SOURCE_BUCKET_NAME, f"processing/{file_key}", f"archive/{file_key}")
-    # Update the audit table and invoke the filename lambda with next file in the queue (if one exists)
-    change_audit_table_status_to_processed(file_key, message_id)
-    supplier_queue = f"{supplier}_{vaccine_type}"
-    next_queued_file_details = get_next_queued_file_details(supplier_queue)
-    if next_queued_file_details:
-        invoke_filename_lambda(next_queued_file_details["filename"], next_queued_file_details["message_id"])
-
-
 @upload_ack_file_logging_decorator
 def upload_ack_file(
     temp_ack_file_key: str,
@@ -108,14 +89,14 @@ def upload_ack_file(
     row_count_destination = get_row_count(ACK_BUCKET_NAME, temp_ack_file_key)
     # TODO: Should we check for > and if so what handling is required
     if row_count_destination == row_count_source:
-        handle_ingestion_complete(
-            temp_ack_file_key,
-            message_id,
-            supplier,
-            vaccine_type,
-            archive_ack_file_key,
-            file_key,
-        )
+        move_file(ACK_BUCKET_NAME, temp_ack_file_key, archive_ack_file_key)
+        move_file(SOURCE_BUCKET_NAME, f"processing/{file_key}", f"archive/{file_key}")
+        # Update the audit table and invoke the filename lambda with next file in the queue (if one exists)
+        change_audit_table_status_to_processed(file_key, message_id)
+        supplier_queue = f"{supplier}_{vaccine_type}"
+        next_queued_file_details = get_next_queued_file_details(supplier_queue)
+        if next_queued_file_details:
+            invoke_filename_lambda(next_queued_file_details["filename"], next_queued_file_details["message_id"])
         # Ingestion of this file is complete
         result = {
             "message_id": message_id,

ack_backend/tests/test_splunk_logging.py

@@ -325,7 +325,9 @@ def test_splunk_update_ack_file_not_logged(self):
         with (
             patch("logging_decorators.send_log_to_firehose") as mock_send_log_to_firehose,
             patch("logging_decorators.logger") as mock_logger,
-            patch("update_ack_file.handle_ingestion_complete") as mock_handle_ingestion_complete,  # noqa: E999
+            patch("update_ack_file.change_audit_table_status_to_processed") as mock_change_audit_table_status_to_processed,  # noqa: E999
+            patch("update_ack_file.get_next_queued_file_details"),  # noqa: E999
+            patch("update_ack_file.invoke_filename_lambda"),  # noqa: E999
         ):
             result = lambda_handler(generate_event(messages), context={})
 
@@ -350,7 +352,8 @@ def test_splunk_update_ack_file_not_logged(self):
                 call(last_logger_info_call_args),
             ]
         )
-        mock_handle_ingestion_complete.assert_not_called()
+        mock_change_audit_table_status_to_processed.assert_not_called()
+
 
     def test_splunk_update_ack_file_logged(self):
         """Tests that update_ack_file is logged if we have sent acks for the whole file"""
@@ -363,7 +366,9 @@ def test_splunk_update_ack_file_logged(self):
         with (
             patch("logging_decorators.send_log_to_firehose") as mock_send_log_to_firehose,
             patch("logging_decorators.logger") as mock_logger,
-            patch("update_ack_file.handle_ingestion_complete") as mock_handle_ingestion_complete,  # noqa: E999
+            patch("update_ack_file.change_audit_table_status_to_processed") as mock_change_audit_table_status_to_processed,  # noqa: E999
+            patch("update_ack_file.get_next_queued_file_details"),  # noqa: E999
+            patch("update_ack_file.invoke_filename_lambda"),  # noqa: E999
         ):
             result = lambda_handler(generate_event(messages), context={})
 
@@ -395,7 +400,7 @@ def test_splunk_update_ack_file_logged(self):
                 call(last_logger_info_call_args),
             ]
         )
-        mock_handle_ingestion_complete.assert_called()
+        mock_change_audit_table_status_to_processed.assert_called()
 
 
 if __name__ == "__main__":