Update end-to-end tests

Author: edhall-nhs

tests/e2e_batch/constants.py

@@ -17,6 +17,8 @@
 CONFIG_BUCKET = "imms-internal-dev-supplier-config"
 PERMISSIONS_CONFIG_FILE_KEY = "permissions_config.json"
 RAVS_URI = "https://www.ravs.england.nhs.uk/"
+TPP_V5_SUPPLIER_IDENTIFIER_SYSTEM = "https://tpp-uk.com/Id/ve/vacc"
+EMIS_V5_SUPPLIER_IDENTIFIER_SYSTEM = "https://emishealth.com/identifiers/vacc"
 batch_fifo_queue_name = f"imms-{environment}-batch-file-created-queue.fifo"
 ack_metadata_queue_name = f"imms-{environment}-ack-metadata-queue.fifo"
 audit_table_name = f"immunisation-batch-{environment}-audit-table"

tests/e2e_batch/scenarios.py

@@ -5,6 +5,7 @@
 import pandas as pd
 from clients import logger
 from errors import DynamoDBMismatchError
+from tests.e2e_batch.constants import EMIS_V5_SUPPLIER_IDENTIFIER_SYSTEM, TPP_V5_SUPPLIER_IDENTIFIER_SYSTEM
 from vax_suppliers import OdsVax, TestPair
 
 from constants import (
@@ -93,6 +94,14 @@ def check_final_success_action(self):
     def get_identifier_pk(self):
         if not self.identifier:
             raise Exception("Identifier not set. Generate the CSV file first.")
+
+        # Identifier PK will be different to Identifier in the resource due to data uplift as part of VED-893. This
+        # only affects TPP and EMIS
+        if self.ods == "YGA":
+            return f"{TPP_V5_SUPPLIER_IDENTIFIER_SYSTEM}#{self.identifier}"
+        if self.ods == "YGJ":
+            return f"{EMIS_V5_SUPPLIER_IDENTIFIER_SYSTEM}#{self.identifier}"
+
         return f"{RAVS_URI}#{self.identifier}"
 
     def check_bus_file_content(self):