added changes

Author: ASubaran

e2e_batch/constants.py

@@ -6,3 +6,5 @@
 ACK_BUCKET = "immunisation-batch-internal-dev-data-destinations"
 FORWARDEDFILE_PREFIX = "forwardedFile/"
 ACK_PREFIX = "ack/"
+PRE_VALIDATION_ERROR = "Validation errors: doseQuantity.value must be a number"
+POST_VALIDATION_ERROR = "Validation errors: contained[?(@.resourceType=='Patient')].name[0].given is a mandatory field"

e2e_batch/test_e2e_batch.py

@@ -6,7 +6,7 @@
     wait_for_ack_file,
     check_ack_file_content,
 )
-from constants import INPUT_BUCKET, INPUT_PREFIX, ACK_BUCKET
+from constants import INPUT_BUCKET, INPUT_PREFIX, ACK_BUCKET, PRE_VALIDATION_ERROR, POST_VALIDATION_ERROR
 from clients import logger
 
 
@@ -17,7 +17,7 @@ def e2e_test_create_success():
     os.remove(input_file)
     ack_key = wait_for_ack_file(None, input_file)
     ack_content = get_file_content_from_s3(ACK_BUCKET, ack_key)
-    check_ack_file_content(ack_content, "OK")
+    check_ack_file_content(ack_content, "OK", None)
     logger.info("Test e2e_test_create_success successfully passed")
 
 
@@ -28,7 +28,7 @@ def e2e_test_update_success():
     os.remove(input_file)
     ack_key = wait_for_ack_file(None, input_file)
     ack_content = get_file_content_from_s3(ACK_BUCKET, ack_key)
-    check_ack_file_content(ack_content, "OK")
+    check_ack_file_content(ack_content, "OK", None)
     logger.info("Test e2e_test_update_success successfully passed")
 
 
@@ -39,7 +39,7 @@ def e2e_test_delete_success():
     os.remove(input_file)
     ack_key = wait_for_ack_file(None, input_file)
     ack_content = get_file_content_from_s3(ACK_BUCKET, ack_key)
-    check_ack_file_content(ack_content, "OK")
+    check_ack_file_content(ack_content, "OK", None)
     logger.info("Test e2e_test_delete_success successfully passed")
 
 
@@ -50,7 +50,11 @@ def e2e_test_pre_validation_error():
     os.remove(input_file)
     ack_key = wait_for_ack_file(None, input_file)
     ack_content = get_file_content_from_s3(ACK_BUCKET, ack_key)
-    check_ack_file_content(ack_content, "Fatal Error")
+    check_ack_file_content(
+        ack_content,
+        "Fatal Error",
+        PRE_VALIDATION_ERROR,
+    )
     logger.info("Test e2e_test_pre_validation_error successfully passed")
 
 
@@ -61,7 +65,11 @@ def e2e_test_post_validation_error():
     os.remove(input_file)
     ack_key = wait_for_ack_file(None, input_file)
     ack_content = get_file_content_from_s3(ACK_BUCKET, ack_key)
-    check_ack_file_content(ack_content, "Fatal Error")
+    check_ack_file_content(
+        ack_content,
+        "Fatal Error",
+        POST_VALIDATION_ERROR,
+    )
     logger.info("Test e2e_test_post_validation_error successfully passed")
 
 

e2e_batch/utils.py

@@ -118,7 +118,7 @@ def get_file_content_from_s3(bucket, key):
     return content
 
 
-def check_ack_file_content(content, response_code):
+def check_ack_file_content(content, response_code, operation_outcome):
     """Parse the ack CSV file and verify each row's 'HEADER_RESPONSE_CODE' column matches the response code."""
     reader = csv.DictReader(content.splitlines(), delimiter="|")
     rows = list(reader)
@@ -129,4 +129,9 @@ def check_ack_file_content(content, response_code):
             raise AssertionError(
                 f"Row {i + 1}: Expected RESPONSE '{response_code}', but found '{row['HEADER_RESPONSE_CODE']}'"
             )
+        if row["HEADER_RESPONSE_CODE"].strip() == "Fatal Error":
+            if row["OPERATION_OUTCOME"].strip() != operation_outcome:
+                raise AssertionError(
+                    f"Row {i + 1}: Expected RESPONSE '{operation_outcome}', but found '{row['OPERATION_OUTCOME']}'"
+                )
     # logger.info("All rows in the ack file have been verified successfully.")