updated step definition to validate ACk file names (#1252)

Author: FimranNHS

tests/e2e_automation/features/batchTests/Steps/batch_common_steps.py

@@ -110,8 +110,20 @@ def batch_file_upload_in_s3_bucket(context):
 @then("file will be moved to destination bucket and inf ack file will be created")
 def ack_file_will_be_moved_to_destination_bucket(context):
     result = wait_and_read_ack_file(context, "ack")
-    context.fileContent = result["csv"]
-    assert context.fileContent, f"File not found in destination bucket after timeout:  {context.forwarded_prefix}"
+    actual_file_name = result["csv"]["key"]
+    check.is_true(
+        actual_file_name.endswith(".csv"),
+        f"Expected ACK file extension is .csv but got {actual_file_name}",
+    )
+    check.is_true(
+        actual_file_name.startswith(context.forwarded_prefix),
+        f"Expected ACK file name to start with {context.forwarded_prefix} but got {actual_file_name}",
+    )
+    check.is_true(
+        "_InfAck_" in actual_file_name,
+        f"Expected ACK file name to contain '_InfAck_actual_file_name' but got {actual_file_name}",
+    )
+    context.fileContent = result["csv"]["content"]
 
 
 @then("inf ack file has success status for processed batch file")
@@ -124,8 +136,36 @@ def all_records_are_processed_successfully_in_the_inf_ack_file(context):
 def file_will_be_moved_to_destination_bucket(context):
     result = wait_and_read_ack_file(context, "forwardedFile")
     assert isinstance(result, dict), f"Expected both CSV and JSON ACK files but got: {type(result)}"
-    context.fileContent = result.get("csv")
-    context.fileContentJson = result.get("json")
+
+    actual_file_name = result["csv"]["key"]
+    check.is_true(
+        actual_file_name.endswith(".csv"),
+        f"Expected ACK file extension is .csv but got {actual_file_name}",
+    )
+    check.is_true(
+        actual_file_name.startswith(context.forwarded_prefix),
+        f"Expected ACK file name to start with {context.forwarded_prefix} but got {actual_file_name}",
+    )
+    check.is_true(
+        "_BusAck_" in actual_file_name,
+        f"Expected ACK file name to contain '_BusAck_actual_file_name' but got {actual_file_name}",
+    )
+    context.fileContent = result["csv"]["content"]
+    actual_file_name = result["json"]["key"]
+    check.is_true(
+        actual_file_name.endswith(".json"),
+        f"Expected ACK file extension is .json but got {actual_file_name}",
+    )
+    check.is_true(
+        actual_file_name.startswith(context.forwarded_prefix),
+        f"Expected ACK file name to start with {context.forwarded_prefix} but got {actual_file_name}",
+    )
+    check.is_true(
+        "_BusAck_" in actual_file_name,
+        f"Expected ACK file name to contain '_BusAck_actual_file_name' but got {actual_file_name}",
+    )
+    context.fileContentJson = result["json"]["content"]
+
     assert context.fileContent, (
         f"BUS Ack csv File not found in destination bucket after timeout: {context.forwarded_prefix}"
     )

tests/e2e_automation/utilities/batch_S3_buckets.py

@@ -47,7 +47,12 @@ def wait_for_file_to_move_archive(context, timeout=120, interval=5):
 
 
 def wait_and_read_ack_file(
-    context, folderName: str, timeout=120, interval=5, duplicate_bus_files=False, duplicate_inf_files=False
+    context,
+    folderName: str,
+    timeout=180,
+    interval=5,
+    duplicate_bus_files=False,
+    duplicate_inf_files=False,
 ):
     s3 = boto3.client("s3")
     destination_bucket = f"immunisation-batch-{context.S3_env}-data-destinations"
@@ -96,7 +101,8 @@ def wait_and_read_ack_file(
                         print(f"[FOUND] {ext} file located: {key}")
                         s3_obj = s3.get_object(Bucket=destination_bucket, Key=key)
                         file_data = s3_obj["Body"].read().decode("utf-8")
-                        found_files[ext] = file_data
+                        found_files[ext] = {"key": key, "content": file_data}
+
                         print(f"[SUCCESS] Loaded {ext} file ({len(file_data)} bytes)")
 
                 if expected_extensions.issubset(found_files.keys()):