VEd-745 Observability - missed a scenario (#818)

Author: dlzhry2nhs

filenameprocessor/src/constants.py

@@ -47,7 +47,6 @@ class FileNotProcessedReason(StrEnum):
     """Reasons why a file was not processed"""
     EMPTY = "Empty file"
     UNAUTHORISED = "Unauthorised"
-    INVALID_FILENAME = "Invalid filename"
 
 
 class AuditTableKeys(StrEnum):

filenameprocessor/src/file_name_processor.py

@@ -131,15 +131,12 @@ def handle_record(record) -> dict:
 
 def get_file_status_for_error(error: Exception) -> str:
     """Creates a file status based on the type of error that was thrown"""
-    if not isinstance(error, (VaccineTypePermissionsError, InvalidFileKeyError, EmptyFileError)):
-        return FileStatus.FAILED
-
     if isinstance(error, VaccineTypePermissionsError):
         return f"{FileStatus.NOT_PROCESSED} - {FileNotProcessedReason.UNAUTHORISED}"
     elif isinstance(error, EmptyFileError):
         return f"{FileStatus.NOT_PROCESSED} - {FileNotProcessedReason.EMPTY}"
 
-    return f"{FileStatus.NOT_PROCESSED} - {FileNotProcessedReason.INVALID_FILENAME}"
+    return FileStatus.FAILED
 
 
 def handle_unexpected_bucket_name(bucket_name: str, file_key: str) -> dict:

filenameprocessor/tests/test_lambda_handler.py

@@ -276,7 +276,7 @@ def test_lambda_invalid_file_key_no_other_files_in_queue(self):
                 "message_id": {"S": file_details.message_id},
                 "filename": {"S": file_details.file_key},
                 "queue_name": {"S": "unknown_unknown"},
-                "status": {"S": "Not processed - Invalid filename"},
+                "status": {"S": "Failed"},
                 "error_details": {"S": "Initial file validation failed: invalid file key"},
                 "timestamp": {"S": file_details.created_at_formatted_string},
                 "expires_at": {"N": str(file_details.expires_at)},