Tests Pass

Author: nhsdevws

azure/templates/post-deploy.yml

@@ -225,7 +225,6 @@ steps:
 
     displayName: Run full batch test suite
     workingDirectory: "$(Pipeline.Workspace)/s/$(SERVICE_NAME)/$(SERVICE_ARTIFACT_NAME)/e2e_batch"
-    condition: eq(1, 2) # Disable task but make this step visible in the pipeline
 
   - task: PublishTestResults@2
     displayName: 'Publish test results'

e2e_batch/utils.py

@@ -22,6 +22,7 @@
     FILE_NAME_VAL_ERROR,
     HEADER_RESPONSE_CODE_COLUMN,
     RAVS_URI,
+    ActionFlag,
 )
 
 
@@ -59,7 +60,7 @@ def delete_file_from_s3(bucket, key):
         if status_code != 204:
             raise Exception(f"Delete failed with status code: {status_code}")
 
-        print(f"Deleted {key} from bucket {bucket}")
+        print(f"Deleted {key}")
         return True
 
     except ClientError as e:
@@ -136,23 +137,23 @@ def check_ack_file_content(desc, content, response_code, operation_outcome, oper
 
     if operation_outcome and DUPLICATE in operation_outcome:
         # Handle DUPLICATE scenario:
-        assert len(rows) == 2, f"Expected 2 rows for DUPLICATE scenario, got {len(rows)}"
+        assert len(rows) == 2, f"{desc}. Expected 2 rows for DUPLICATE scenario, got {len(rows)}"
 
         first_row = rows[0]
-        validate_header_response_code(first_row, 0, "OK")
+        validate_header_response_code(desc, first_row, 0, "OK")
         validate_ok_response(first_row, 0, operation_requested)
 
         second_row = rows[1]
-        validate_header_response_code(second_row, 1, "Fatal Error")
-        validate_fatal_error(second_row, 1, DUPLICATE)
+        validate_header_response_code(desc, second_row, 1, "Fatal Error")
+        validate_fatal_error(desc, second_row, 1, DUPLICATE)
     else:
         # Handle normal scenarios:
         for i, row in enumerate(rows):
             if response_code and "HEADER_RESPONSE_CODE" in row:
-                assert row["HEADER_RESPONSE_CODE"].strip() == response_code, (
-                    f"Row {i} expected HEADER_RESPONSE_CODE '{response_code}', "
-                    f"but got '{row['HEADER_RESPONSE_CODE'].strip()}'"
-                )
+                row_HEADER_RESPONSE_CODE = row["HEADER_RESPONSE_CODE"].strip()
+                assert row_HEADER_RESPONSE_CODE == response_code, (
+                    f"{desc}.Row {i} expected HEADER_RESPONSE_CODE '{response_code}', "
+                    f"but got '{row_HEADER_RESPONSE_CODE}'")
             if operation_outcome and "OPERATION_OUTCOME" in row:
                 assert row["OPERATION_OUTCOME"].strip() == operation_outcome, (
                     f"Row {i} expected OPERATION_OUTCOME '{operation_outcome}', "
@@ -164,7 +165,7 @@ def check_ack_file_content(desc, content, response_code, operation_outcome, oper
                 validate_fatal_error(row, i, operation_outcome)
 
 
-def validate_header_response_code(row, index, expected_code):
+def validate_header_response_code(desc, row, index, expected_code):
     """Ensure HEADER_RESPONSE_CODE exists and matches expected response code."""
 
     if "HEADER_RESPONSE_CODE" not in row:
@@ -277,12 +278,13 @@ def fetch_pk_and_operation_from_dynamodb(identifier_pk):
             KeyConditionExpression="IdentifierPK = :identifier_pk",
             ExpressionAttributeValues={":identifier_pk": identifier_pk},
         )
-        if "Items" in response and response["Items"] and "DeletedAt" in response["Items"][0]:
-            return (response["Items"][0]["PK"], response["Items"][0]["Operation"], response["Items"][0]["DeletedAt"])
-        if "Items" in response and response["Items"]:
-            return (response["Items"][0]["PK"], response["Items"][0]["Operation"], None)
-        else:
-            return "NOT_FOUND"
+        if "Items" in response:
+            items = response["Items"]
+            if items:
+                if "DeletedAt" in items[0]:
+                    return (items[0]["PK"], items[0]["Operation"], items[0]["DeletedAt"])
+                return (items[0]["PK"], items[0]["Operation"], None)
+        return (identifier_pk, ActionFlag.NONE, None)
 
     except Exception as e:
         logger.error(f"Error fetching from DynamoDB: {e}")