rest of errors

Author: JamesW1-NHS

lambdas/filenameprocessor/src/constants.py

@@ -3,9 +3,9 @@
 import os
 from enum import StrEnum
 
-from common.models.errors import (
+from common.models.errors import UnhandledAuditTableError
+from models.errors import (
     InvalidFileKeyError,
-    UnhandledAuditTableError,
     UnhandledSqsError,
     VaccineTypePermissionsError,
 )

lambdas/filenameprocessor/src/file_name_processor.py

@@ -12,12 +12,7 @@
 from audit_table import upsert_audit_table
 from common.clients import STREAM_NAME, logger, s3_client
 from common.log_decorator import logging_decorator
-from common.models.errors import (
-    InvalidFileKeyError,
-    UnhandledAuditTableError,
-    UnhandledSqsError,
-    VaccineTypePermissionsError,
-)
+from common.models.errors import UnhandledAuditTableError
 from constants import (
     ERROR_TYPE_TO_STATUS_CODE_MAP,
     SOURCE_BUCKET_NAME,
@@ -26,6 +21,11 @@
 )
 from file_validation import is_file_in_directory_root, validate_file_key
 from make_and_upload_ack_file import make_and_upload_the_ack_file
+from models.errors import (
+    InvalidFileKeyError,
+    UnhandledSqsError,
+    VaccineTypePermissionsError,
+)
 from send_sqs_message import make_and_send_sqs_message
 from supplier_permissions import validate_vaccine_type_permissions
 from utils_for_filenameprocessor import get_creation_and_expiry_times, move_file

lambdas/filenameprocessor/src/file_validation.py

@@ -3,12 +3,12 @@
 from datetime import datetime
 from re import match
 
-from common.models.errors import InvalidFileKeyError
 from constants import VALID_VERSIONS
 from elasticache import (
     get_supplier_system_from_cache,
     get_valid_vaccine_types_from_cache,
 )
+from models.errors import InvalidFileKeyError
 
 
 def is_file_in_directory_root(file_key: str) -> bool:

lambdas/filenameprocessor/src/models/errors.py

@@ -0,0 +1,10 @@
+class VaccineTypePermissionsError(Exception):
+    """A custom exception for when the supplier does not have the necessary vaccine type permissions."""
+
+
+class InvalidFileKeyError(Exception):
+    """A custom exception for when the file key is invalid."""
+
+
+class UnhandledSqsError(Exception):
+    """A custom exception for when an unexpected error occurs whilst sending a message to SQS."""

lambdas/filenameprocessor/src/send_sqs_message.py

@@ -4,7 +4,7 @@
 from json import dumps as json_dumps
 
 from common.clients import logger, sqs_client
-from common.models.errors import UnhandledSqsError
+from models.errors import UnhandledSqsError
 
 
 def send_to_supplier_queue(message_body: dict, vaccine_type: str, supplier: str) -> None:

lambdas/filenameprocessor/src/supplier_permissions.py

@@ -1,8 +1,8 @@
 """Functions for fetching supplier permissions"""
 
 from common.clients import logger
-from common.models.errors import VaccineTypePermissionsError
 from elasticache import get_supplier_permissions_from_cache
+from models.errors import VaccineTypePermissionsError
 
 
 def validate_vaccine_type_permissions(vaccine_type: str, supplier: str) -> list:

lambdas/filenameprocessor/tests/test_file_key_validation.py

@@ -12,12 +12,12 @@
 
 # Ensure environment variables are mocked before importing from src files
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
-    from common.models.errors import InvalidFileKeyError
     from file_validation import (
         is_file_in_directory_root,
         is_valid_datetime,
         validate_file_key,
     )
+    from models.errors import InvalidFileKeyError
 
 VALID_FLU_EMIS_FILE_KEY = MockFileDetails.emis_flu.file_key
 VALID_RSV_RAVS_FILE_KEY = MockFileDetails.ravs_rsv_1.file_key

lambdas/filenameprocessor/tests/test_send_sqs_message.py

@@ -14,7 +14,7 @@
 # Ensure environment variables are mocked before importing from src files
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
     from common.clients import REGION_NAME
-    from common.models.errors import UnhandledSqsError
+    from models.errors import UnhandledSqsError
     from send_sqs_message import make_and_send_sqs_message, send_to_supplier_queue
 
 sqs_client = boto3_client("sqs", region_name=REGION_NAME)

lambdas/filenameprocessor/tests/test_supplier_permissions.py

@@ -7,7 +7,7 @@
 
 # Ensure environment variables are mocked before importing from src files
 with patch.dict("os.environ", MOCK_ENVIRONMENT_DICT):
-    from common.models.errors import VaccineTypePermissionsError
+    from models.errors import VaccineTypePermissionsError
     from supplier_permissions import validate_vaccine_type_permissions
 
 

lambdas/mns_subscription/src/mns_service.py

@@ -7,13 +7,15 @@
 
 from common.authentication import AppRestrictedAuth
 from common.models.errors import (
+    ResourceNotFoundError,
+    UnhandledResponseError,
+)
+from models.errors import (
     BadRequestError,
     ConflictError,
-    ResourceNotFoundError,
     ServerError,
     TokenValidationError,
     UnauthorizedError,
-    UnhandledResponseError,
 )
 
 SQS_ARN = os.getenv("SQS_ARN")