Merge branch 'master' into feature/VED-763-permit-site-ods-code-in-filename

Author: dlzhry2nhs

filenameprocessor/src/constants.py

@@ -30,7 +30,7 @@
 }
 
 # The size in bytes of an empty batch file containing only the headers row
-EMPTY_BATCH_FILE_SIZE_IN_BYTES = 615
+EMPTY_BATCH_FILE_SIZE_IN_BYTES = 700
 
 
 class FileStatus(StrEnum):

filenameprocessor/src/file_name_processor.py

@@ -100,7 +100,11 @@ def handle_record(record) -> dict:
         UnhandledSqsError,
         Exception,
     ) as error:
-        logger.error("Error processing file '%s': %s", file_key, str(error))
+        if isinstance(error, EmptyFileError):
+            # Avoid error log noise for accepted scenario in which supplier provides a batch file with no records
+            logger.warning("Error processing file '%s': %s", file_key, str(error))
+        else:
+            logger.error("Error processing file '%s': %s", file_key, str(error))
 
         queue_name = f"{supplier}_{vaccine_type}"
         file_status = get_file_status_for_error(error)

filenameprocessor/tests/test_lambda_handler.py

@@ -229,6 +229,11 @@ def test_lambda_handler_correctly_flags_empty_file(self):
         self.assertEqual(self.get_audit_table_items(), expected_table_items)
         self.assert_no_sqs_message()
         self.assert_ack_file_contents(file_details)
+        self.mock_logger.warning.assert_called_once_with(
+            "Error processing file '%s': %s",
+            "RSV_Vaccinations_v5_X8E5B_20000101T00000001.csv",
+            "Initial file validation failed: batch file was empty"
+        )
 
     def test_lambda_handler_non_root_file(self):
         """