debug

Author: nhsdevws

e2e_batch/test_e2e_batch.py

@@ -8,7 +8,7 @@
     generate_csv_files,
     TestData,
     poll_destination,
-    DestinationType
+    DestinationType,
 )
 
 from constants import (

e2e_batch/utils.py

@@ -525,6 +525,8 @@ def verify_final_ack_file(file_key):
 def get_file_name(vax_type, ods, version="4"):
     timestamp = datetime.now(timezone.utc).strftime("%Y%m%dT%H%M%S00")
     # timestamp = timestamp[:-3]
+    if is_valid_datetime(timestamp) is False:
+        print("Timestamp is not valid")
     return f"{vax_type}_Vaccinations_v{version}_{ods}_{timestamp}.csv"
 
 
@@ -546,3 +548,24 @@ def generate_csv_file(seed: TestData, actions: str) -> str:
     file_name = get_file_name(seed.vax, seed.ods, seed.version)
     df.to_csv(file_name, index=False, sep="|", quoting=csv.QUOTE_MINIMAL)
     return file_name
+
+
+def is_valid_datetime(timestamp: str) -> bool:
+    """
+    Returns a bool to indicate whether the timestamp is a valid datetime in the format 'YYYYmmddTHHMMSSzz'
+    where 'zz' is a two digit number indicating the timezone
+    """
+    # Check that datetime (excluding timezone) is a valid datetime in the expected format.
+    print(f"Validating timestamp: {timestamp}")
+    if len(timestamp) < 15:
+        print("Timestamp is too short")
+        return False
+
+    # Note that any digits after the seconds (i.e. from the 16th character onwards, usually expected to represent
+    # timezone), do not need to be validated
+    try:
+        datetime.strptime(timestamp[:15], "%Y%m%dT%H%M%S")
+    except ValueError:
+        return False
+
+    return True

filenameprocessor/src/file_validation.py

@@ -20,7 +20,9 @@ def is_valid_datetime(timestamp: str) -> bool:
     where 'zz' is a two digit number indicating the timezone
     """
     # Check that datetime (excluding timezone) is a valid datetime in the expected format.
+    print(f"Validating timestamp: {timestamp}")
     if len(timestamp) < 15:
+        print("Timestamp is too short")
         return False
 
     # Note that any digits after the seconds (i.e. from the 16th character onwards, usually expected to represent
@@ -71,6 +73,14 @@ def validate_file_key(file_key: str) -> tuple[str, str]:
     print(f"supplier: {supplier}  ")
     print(f"valid_vaccine_types: {valid_vaccine_types}  ")
 
+    print(f"vaccine_type in valid_vaccine_types: {vaccine_type in valid_vaccine_types}  ")
+    print(f"vaccination == 'VACCINATIONS': {vaccination == 'VACCINATIONS'}  ")
+    print(f"version in VALID_VERSIONS: {version in VALID_VERSIONS}  ")
+    print(f"supplier: {supplier}  ")
+    print(f"is_valid_datetime(timestamp): {is_valid_datetime(timestamp)}  ")
+    print(f"extension check: {(extension == 'CSV') or (extension == 'DAT')}  ")
+    print("SAW ----------- END DEBUG -------------")
+
     # Validate each file key element
     if not (
         vaccine_type in valid_vaccine_types