VED-763: Tidy up. Adjust error wording.

Author: mfjarvis

filenameprocessor/src/file_validation.py

@@ -58,28 +58,17 @@ def validate_file_key(file_key: str) -> tuple[str, str]:
 
     valid_vaccine_types = get_valid_vaccine_types_from_cache()
 
-    # Validate each file key element
-    # if not (
-    #     vaccine_type in valid_vaccine_types
-    #     and vaccination == "VACCINATIONS"
-    #     and version in VALID_VERSIONS
-    #     and supplier  # Note that if supplier could be identified, this also implies that ODS code is valid
-    #     and is_valid_datetime(timestamp)
-    #     and ((extension == "CSV") or (extension == "DAT"))  # The DAT extension has been added for MESH file processing
-    # ):
-    #     raise InvalidFileKeyError("Initial file validation failed: invalid file key")
-    #
     if vaccine_type not in valid_vaccine_types:
-        raise InvalidFileKeyError("Initial file validation failed: invalid vaccine type")
+        raise InvalidFileKeyError("Initial file validation failed: unsupported vaccine type")
 
     if vaccination != "VACCINATIONS":
         raise InvalidFileKeyError("Initial file validation failed: file key must contain VACCINATIONS")
 
     if version not in VALID_VERSIONS:
-        raise InvalidFileKeyError("Initial file validation failed: invalid file version")
+        raise InvalidFileKeyError("Initial file validation failed: unsupported file version")
 
     if not supplier:
-        raise InvalidFileKeyError("Initial file validation failed: invalid supplier ODS code")
+        raise InvalidFileKeyError("Initial file validation failed: unregistered supplier ODS code")
 
     if not is_valid_datetime(timestamp):
         raise InvalidFileKeyError("Initial file validation failed: invalid timestamp")

filenameprocessor/tests/test_file_key_validation.py

@@ -79,31 +79,31 @@ def test_validate_file_key(self, mock_hkeys, mock_hget):
             # File key with no '.'
             (VALID_FLU_EMIS_FILE_KEY.replace(".", ""), "Initial file validation failed: missing file extension"),
             # File key with additional '.' in vaccine type
-            (VALID_FLU_EMIS_FILE_KEY[:2] + "." + VALID_FLU_EMIS_FILE_KEY[2:],"Initial file validation failed: invalid vaccine type"),
+            (VALID_FLU_EMIS_FILE_KEY[:2] + "." + VALID_FLU_EMIS_FILE_KEY[2:],"Initial file validation failed: unsupported vaccine type"),
             # File key with additional '_' in vaccine type
-            (VALID_FLU_EMIS_FILE_KEY[:2] + "_" + VALID_FLU_EMIS_FILE_KEY[2:],"Initial file validation failed: invalid vaccine type"),
+            (VALID_FLU_EMIS_FILE_KEY[:2] + "_" + VALID_FLU_EMIS_FILE_KEY[2:],"Initial file validation failed: unsupported vaccine type"),
             # File key with missing '_'
             (VALID_FLU_EMIS_FILE_KEY.replace("_", "", 1), "Initial file validation failed: not enough parts in file key"),
             # File key with missing '_'
             (VALID_FLU_EMIS_FILE_KEY.replace("_", ""), "Initial file validation failed: not enough parts in file key"),
             # File key with missing extension
             (VALID_FLU_EMIS_FILE_KEY.replace(".csv", ""), "Initial file validation failed: missing file extension"),
             # File key with invalid vaccine type
-            (VALID_FLU_EMIS_FILE_KEY.replace("FLU", "Flue"), "Initial file validation failed: invalid vaccine type"),
+            (VALID_FLU_EMIS_FILE_KEY.replace("FLU", "Flue"), "Initial file validation failed: unsupported vaccine type"),
             # File key with missing vaccine type
-            (VALID_FLU_EMIS_FILE_KEY.replace("FLU", ""), "Initial file validation failed: invalid vaccine type"),
+            (VALID_FLU_EMIS_FILE_KEY.replace("FLU", ""), "Initial file validation failed: unsupported vaccine type"),
             # File key with invalid vaccinations element
             (VALID_FLU_EMIS_FILE_KEY.replace("Vaccinations", "Vaccination"),"Initial file validation failed: file key must contain VACCINATIONS"),
             # File key with missing vaccinations element
             (VALID_FLU_EMIS_FILE_KEY.replace("Vaccinations", ""), "Initial file validation failed: file key must contain VACCINATIONS"),
             # File key with invalid version
-            (VALID_FLU_EMIS_FILE_KEY.replace("v5", "v4"), "Initial file validation failed: invalid file version"),
+            (VALID_FLU_EMIS_FILE_KEY.replace("v5", "v4"), "Initial file validation failed: unsupported file version"),
             # File key with missing version
-            (VALID_FLU_EMIS_FILE_KEY.replace("v5", ""), "Initial file validation failed: invalid file version"),
+            (VALID_FLU_EMIS_FILE_KEY.replace("v5", ""), "Initial file validation failed: unsupported file version"),
             # File key with invalid ODS code
-            (VALID_FLU_EMIS_FILE_KEY.replace("YGM41", "YGAM"), "Initial file validation failed: invalid supplier ODS code"),
+            (VALID_FLU_EMIS_FILE_KEY.replace("YGM41", "YGAM"), "Initial file validation failed: unregistered supplier ODS code"),
             # File key with missing ODS code
-            (VALID_FLU_EMIS_FILE_KEY.replace("YGM41", ""), "Initial file validation failed: invalid supplier ODS code"),
+            (VALID_FLU_EMIS_FILE_KEY.replace("YGM41", ""), "Initial file validation failed: unregistered supplier ODS code"),
             # File key with invalid timestamp
             (VALID_FLU_EMIS_FILE_KEY.replace("20000101T00000001", "20200132T12345600"),"Initial file validation failed: invalid timestamp"),
             # File key with missing timestamp