WiP

Author: nhsdevws

e2e_batch/constants.py

@@ -18,13 +18,15 @@
 PERMISSIONS_CONFIG_FILE_KEY = "permissions_config.json"
 
 
-def create_row(unique_id, dose_amount, action_flag, header):
+def create_row(unique_id, dose_amount, action_flag, header, inject_char=None):
     """Helper function to create a single row with the specified UNIQUE_ID and ACTION_FLAG."""
 
+    name = "James" if not inject_char else b'Jam\xe9s'
+
     return {
         header: "9732928395",
         "PERSON_FORENAME": "PHYLIS",
-        "PERSON_SURNAME": "James",
+        "PERSON_SURNAME": name,
         "PERSON_DOB": "20080217",
         "PERSON_GENDER_CODE": "0",
         "PERSON_POSTCODE": "WD25 0DZ",
@@ -35,7 +37,7 @@ def create_row(unique_id, dose_amount, action_flag, header):
         "UNIQUE_ID_URI": "https://www.ravs.england.nhs.uk/",
         "ACTION_FLAG": action_flag,
         "PERFORMING_PROFESSIONAL_FORENAME": "PHYLIS",
-        "PERFORMING_PROFESSIONAL_SURNAME": "James",
+        "PERFORMING_PROFESSIONAL_SURNAME": name,
         "RECORDED_DATE": datetime.now(timezone.utc).strftime("%Y%m%d"),
         "PRIMARY_SOURCE": "TRUE",
         "VACCINATION_PROCEDURE_CODE": "956951000000104",

e2e_batch/test_e2e_batch.py

@@ -7,7 +7,6 @@
     validate_row_count,
     generate_csv_files,
     TestData,
-    poll_destination,
     DestinationType,
 )
 import logging
@@ -30,10 +29,9 @@
     TestData("Update", "8HK48", [CREATE, UPDATE]),
     TestData("Delete", "8HA94", [CREATE, UPDATE, DELETE]),
     TestData("Reinstate", "X26", [CREATE, DELETE, UPDATE]),
-    # TestData("Update-Reinstate", "X8E5B", [CREATE, DELETE, UPDATE, UPDATE]),
-    # TestData("Update-No Create", "YGM41", [UPDATE], success=False),
-    # TestData("Delete-No Create", "YGJ", [DELETE], success=False),
-    # TestData("Create with extended ascii characters in name", "YGA", [CREATE], inject_char=True),
+    TestData("Update no Create", "YGM41", [UPDATE], success=False),
+    TestData("Delete no Create", "YGJ", [DELETE], success=False),
+    TestData("Create with extended ascii characters in name", "YGA", [CREATE], inject_char=True),
 ]
 
 logging.basicConfig(level="INFO")
@@ -51,10 +49,10 @@ def test_create_success(self):
 
         test_datas: list[TestData] = generate_csv_files(seed_datas)
 
-        for test in test_datas:
-
-            key = upload_file_to_s3(test.file_name, SOURCE_BUCKET, INPUT_PREFIX)
-            test.key = key
+        for test_data in test_datas:
+            logging.info(f"Upload {test_data.file_name}")
+            key = upload_file_to_s3(test_data.file_name, SOURCE_BUCKET, INPUT_PREFIX)
+            test_data.key = key
 
         # dictionary of file name to track whether inf and bus acks have been received
         start_time = time.time()
@@ -63,15 +61,7 @@ def test_create_success(self):
         while pending and (time.time() - start_time) < max_timeout:
             pending = False
             for test_data in test_datas:
-                # loop through keys in test (inf and bus)
-                for ack_key in test_data.ack_keys.keys():
-                    if not test_data.ack_keys[ack_key]:
-                        found_ack_key = poll_destination(test_data.file_name, ack_key)
-                        if found_ack_key:
-                            test_data.ack_keys[ack_key] = found_ack_key
-                            logging.info(f"Found {ack_key} ack for {test_data.file_name}: {found_ack_key}")
-                        else:
-                            pending = True
+                pending = test_data.poll_destination(pending, logging)
             if pending:
                 time.sleep(1)
 
@@ -90,4 +80,3 @@ def test_create_success(self):
             # bus_ack_content = get_file_content_from_s3(ACK_BUCKET, test_data.ack_keys[DestinationType.BUS])
 
         logging.info(f"Completed all validations. Total time taken: {time.time() - start_time:.1f} seconds")
-

e2e_batch/utils.py

@@ -59,6 +59,18 @@ def __init__(self, description, vax_ods, actions: list, header="NHS_NUMBER",
         self.key = None
         self.ack_keys = {DestinationType.INF: None, DestinationType.BUS: None}
 
+    def poll_destination(self, pending: bool, logging) -> bool:
+        # loop through keys in test (inf and bus)
+        for ack_key in self.ack_keys.keys():
+            if not self.ack_keys[ack_key]:
+                found_ack_key = poll_destination(self.file_name, ack_key)
+                if found_ack_key:
+                    self.ack_keys[ack_key] = found_ack_key
+                    logging.info(f"Found {found_ack_key}")
+                else:
+                    pending = True
+        return pending
+
 
 def generate_csv(dose_amount, action_flag, headers="NHS_NUMBER", same_id=False, version="4",
                  vax_type="RSV", ods="YGM41"):
@@ -539,10 +551,10 @@ def generate_csv_files(seed_data_list: list[TestData]) -> list[TestData]:
 
 def generate_csv_file(seed: TestData, actions: str) -> str:
 
-    unique_id = str(uuid.uuid4())
     data = []
     for action in actions:
-        data.append(create_row(unique_id, seed.dose_amount, action, seed.header))
+        unique_id = str(uuid.uuid4())
+        data.append(create_row(unique_id, seed.dose_amount, action, seed.header, seed.inject_char))
     df = pd.DataFrame(data)
     file_name = get_file_name(seed.vax, seed.ods, seed.version)
     df.to_csv(file_name, index=False, sep="|", quoting=csv.QUOTE_MINIMAL)