PRMT-3413 E2E testing - Unexpected Interaction ID and NHS number

src/test/java/uk/nhs/prm/deduction/e2e/TestConfiguration.java

@@ -181,6 +181,10 @@ public String getEhrRepoUrl() {
         return String.format("https://ehr-repo.%s.patient-deductions.nhs.uk/", getEnvSuffix());
     }
 
+    public String getEhrOutUrl() {
+        return String.format("https://ehr-out-service.%s.patient-deductions.nhs.uk/", getEnvSuffix());
+    }
+
     private String getAwsAccountNo() {
         if (cachedAwsAccountNo == null) {
             cachedAwsAccountNo = fetchAwsAccountNo();

src/test/java/uk/nhs/prm/deduction/e2e/models/ContinueRequestMessage.java

@@ -0,0 +1,43 @@
+package uk.nhs.prm.deduction.e2e.models;
+
+import uk.nhs.prm.deduction.e2e.utility.Resources;
+
+import java.util.UUID;
+
+import static uk.nhs.prm.deduction.e2e.utility.TestUtils.getUUIDAsUpperCaseString;
+
+public class ContinueRequestMessage {
+    private UUID conversationId;
+    private UUID messageId;
+    private String sourceGpOds;
+    private String destinationGpOds;
+    private String sourceGpAsid;
+    private String destinationGpAsid;
+
+    public ContinueRequestMessage(UUID conversationId, UUID messageId, String sourceGpOds, String destinationGpOds, String sourceGpAsid, String destinationGpAsid) {
+        this.conversationId = conversationId;
+        this.messageId = messageId;
+        this.sourceGpOds = sourceGpOds;
+        this.destinationGpOds = destinationGpOds;
+        this.sourceGpAsid = sourceGpAsid;
+        this.destinationGpAsid = destinationGpAsid;
+    }
+
+    public String toJsonString() {
+        return Resources.readTestResourceFile("COPC_IN000001UK01")
+                .replaceAll("DBC31D30-F984-11ED-A4C4-956AA80C6B4E", conversationId())
+                .replaceAll("DE304CA0-F984-11ED-808B-AC162D1F16F0", messageId())
+                .replaceAll("B85002", sourceGpOds)
+                .replaceAll("200000001613", sourceGpAsid)
+                .replaceAll("M85019", destinationGpOds)
+                .replaceAll("200000000149", destinationGpAsid);
+    }
+
+    public String conversationId() {
+        return getUUIDAsUpperCaseString(conversationId);
+    }
+
+    public String messageId() {
+        return getUUIDAsUpperCaseString(messageId);
+    }
+}

src/test/java/uk/nhs/prm/deduction/e2e/models/ContinueRequestMessageBuilder.java

@@ -0,0 +1,91 @@
+package uk.nhs.prm.deduction.e2e.models;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import uk.nhs.prm.deduction.e2e.TestConfiguration;
+import uk.nhs.prm.deduction.e2e.utility.TestUtils;
+
+import java.util.UUID;
+
+public class ContinueRequestMessageBuilder {
+    private UUID conversationId;
+    private UUID messageId;
+    private String sourceGpOds;
+    private String destinationGpOds;
+    private String sourceGpAsid;
+    private String destinationGpAsid;
+
+    private static final Logger LOGGER = LogManager.getLogger(ContinueRequestMessageBuilder.class);
+
+    public ContinueRequestMessageBuilder() {
+        withRandomlyGeneratedConversationId();
+        withRandomlyGeneratedMessageId();
+        withEhrSourceGp(Gp2GpSystem.REPO_DEV);
+        withEhrDestinationGp(Gp2GpSystem.TPP_PTL_INT);
+    }
+
+    public ContinueRequestMessageBuilder withConversationId(UUID conversationId) {
+        this.conversationId = conversationId;
+        return this;
+    }
+
+    public ContinueRequestMessageBuilder withRandomlyGeneratedConversationId() {
+        this.conversationId = UUID.randomUUID();
+        LOGGER.info("generated conversation id {}", conversationId);
+        return this;
+    }
+
+    public ContinueRequestMessageBuilder withEhrSourceAsRepo(TestConfiguration config) {
+        Gp2GpSystem repoInEnv = Gp2GpSystem.repoInEnv(config);
+        this.sourceGpOds = repoInEnv.odsCode();
+        this.sourceGpAsid = repoInEnv.asidCode();
+        return this;
+    }
+
+    public ContinueRequestMessageBuilder withEhrSourceGp(Gp2GpSystem ehrSourceGp) {
+        this.sourceGpOds = ehrSourceGp.odsCode();
+        this.sourceGpAsid = ehrSourceGp.asidCode();
+        return this;
+    }
+
+    public ContinueRequestMessageBuilder withEhrDestinationGp(Gp2GpSystem ehrDestinationGp) {
+        this.destinationGpOds = ehrDestinationGp.odsCode();
+        this.destinationGpAsid = ehrDestinationGp.asidCode();
+        return this;
+    }
+
+    public ContinueRequestMessageBuilder withMessageId(UUID messageId) {
+        this.messageId = messageId;
+        return this;
+    }
+
+    public ContinueRequestMessageBuilder withRandomlyGeneratedMessageId() {
+        this.messageId = UUID.randomUUID();
+        LOGGER.info("generated message id {}", messageId);
+        return this;
+    }
+
+    public ContinueRequestMessageBuilder withSourceGpOds(String sourceGpOds) {
+        this.sourceGpOds = sourceGpOds;
+        return this;
+    }
+
+    public ContinueRequestMessageBuilder withDestinationGpOds(String destinationGpOds) {
+        this.destinationGpOds = destinationGpOds;
+        return this;
+    }
+
+    public ContinueRequestMessageBuilder withSourceGpAsid(String sourceGpAsid) {
+        this.sourceGpAsid = sourceGpAsid;
+        return this;
+    }
+
+    public ContinueRequestMessageBuilder withDestinationGpAsid(String destinationGpAsid) {
+        this.destinationGpAsid = destinationGpAsid;
+        return this;
+    }
+
+    public ContinueRequestMessage build() {
+        return new ContinueRequestMessage(conversationId, messageId, sourceGpOds, destinationGpOds, sourceGpAsid, destinationGpAsid);
+    }
+}

src/test/java/uk/nhs/prm/deduction/e2e/models/EhrRequestMessage.java

@@ -0,0 +1,46 @@
+package uk.nhs.prm.deduction.e2e.models;
+
+import uk.nhs.prm.deduction.e2e.utility.Resources;
+
+import java.util.UUID;
+
+import static uk.nhs.prm.deduction.e2e.utility.TestUtils.getUUIDAsUpperCaseString;
+
+public class EhrRequestMessage {
+    private final String nhsNumber;
+    private final String sourceGpOds;
+    private final String destinationGpOds;
+    private final String sourceGpAsid;
+    private final String destinationGpAsid;
+    private final UUID conversationId;
+    private final UUID messageId;
+
+    public EhrRequestMessage(String nhsNumber, String sourceGpOds, String destinationGpOds, String sourceGpAsid, String destinationGpAsid, UUID conversationId, UUID messageId) {
+        this.nhsNumber = nhsNumber;
+        this.sourceGpOds = sourceGpOds;
+        this.destinationGpOds = destinationGpOds;
+        this.sourceGpAsid = sourceGpAsid;
+        this.destinationGpAsid = destinationGpAsid;
+        this.conversationId = conversationId;
+        this.messageId = messageId;
+    }
+
+    public String toJsonString() {
+        return Resources.readTestResourceFile("RCMR_IN010000UK05")
+                .replaceAll("9692842304", nhsNumber)
+                .replaceAll("17a757f2-f4d2-444e-a246-9cb77bef7f22", conversationId())
+                .replaceAll("C445C720-B0EB-4E36-AF8A-48CD1CA5DE4F", messageId())
+                .replaceAll("B86041", sourceGpOds)
+                .replaceAll("200000001161", sourceGpAsid)
+                .replaceAll("A91720", destinationGpOds)
+                .replaceAll("200000000631", destinationGpAsid);
+    }
+
+    public String conversationId() {
+        return getUUIDAsUpperCaseString(conversationId);
+    }
+
+    public String messageId() {
+        return getUUIDAsUpperCaseString(messageId);
+    }
+}

src/test/java/uk/nhs/prm/deduction/e2e/models/EhrRequestMessageBuilder.java

@@ -0,0 +1,83 @@
+package uk.nhs.prm.deduction.e2e.models;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import uk.nhs.prm.deduction.e2e.TestConfiguration;
+import uk.nhs.prm.deduction.e2e.tests.Patient;
+import uk.nhs.prm.deduction.e2e.utility.TestUtils;
+
+import java.util.UUID;
+
+public class EhrRequestMessageBuilder {
+    private String nhsNumber;
+    private String sourceGpOds;
+    private String destinationGpOds;
+    private String sourceGpAsid;
+    private String destinationGpAsid;
+    private UUID conversationId;
+    private UUID messageId;
+
+    private static final Logger LOGGER = LogManager.getLogger(EhrRequestMessageBuilder.class);
+
+    public EhrRequestMessageBuilder() {
+        withRandomlyGeneratedConversationId();
+        withRandomlyGeneratedMessageId();
+        withNhsNumber("9692842304");  // nhs number in test template file
+        withEhrSourceGp(Gp2GpSystem.REPO_DEV);
+        withEhrDestinationGp(Gp2GpSystem.TPP_PTL_INT);
+    }
+
+    public EhrRequestMessageBuilder withNhsNumber(String nhsNumber) {
+        this.nhsNumber = nhsNumber;
+        return this;
+    }
+
+    public EhrRequestMessageBuilder withPatient(Patient patient) {
+        return withNhsNumber(patient.nhsNumber());
+    }
+
+    public EhrRequestMessageBuilder withEhrSourceAsRepo(TestConfiguration config) {
+        Gp2GpSystem repoInEnv = Gp2GpSystem.repoInEnv(config);
+        this.sourceGpOds = repoInEnv.odsCode();
+        this.sourceGpAsid = repoInEnv.asidCode();
+        return this;
+    }
+
+    public EhrRequestMessageBuilder withEhrSourceGp(Gp2GpSystem ehrSourceGp) {
+        this.sourceGpOds = ehrSourceGp.odsCode();
+        this.sourceGpAsid = ehrSourceGp.asidCode();
+        return this;
+    }
+
+    public EhrRequestMessageBuilder withEhrDestinationGp(Gp2GpSystem ehrDestinationGp) {
+        this.destinationGpOds = ehrDestinationGp.odsCode();
+        this.destinationGpAsid = ehrDestinationGp.asidCode();
+        return this;
+    }
+
+    public EhrRequestMessageBuilder withConversationId(UUID conversationId) {
+        this.conversationId = conversationId;
+        return this;
+    }
+
+    public EhrRequestMessageBuilder withRandomlyGeneratedConversationId() {
+        conversationId = UUID.randomUUID();
+        LOGGER.info("generated conversation id {}", conversationId);
+        return this;
+    }
+
+    public EhrRequestMessageBuilder withMessageId(UUID messageId) {
+        this.messageId = messageId;
+        return this;
+    }
+
+    public EhrRequestMessageBuilder withRandomlyGeneratedMessageId() {
+        messageId = UUID.randomUUID();
+        LOGGER.info("generated message id {}", messageId);
+        return this;
+    }
+
+    public EhrRequestMessage build() {
+        return new EhrRequestMessage(nhsNumber, sourceGpOds, destinationGpOds, sourceGpAsid, destinationGpAsid, conversationId, messageId);
+    }
+}

src/test/java/uk/nhs/prm/deduction/e2e/models/Gp2GpSystem.java

@@ -3,6 +3,7 @@
 import org.junit.jupiter.params.provider.Arguments;
 import uk.nhs.prm.deduction.e2e.TestConfiguration;
 
+import java.util.Map;
 import java.util.stream.Stream;
 
 public enum Gp2GpSystem {
@@ -13,6 +14,13 @@ public enum Gp2GpSystem {
 
     private String odsCode;
 
+    private static final Map<String, String> KNOWN_ASID_CODES = Map.of(
+            "M85019", "200000000149", // TPP_PTL_INT
+            "N82668", "200000000631", // EMIS_PTL_INT
+            "B85002", "200000001613", // REPO dev
+            "B86041", "200000001694" // REPO test
+    );
+
     Gp2GpSystem(String odsCode) {
         this.odsCode = odsCode;
     }
@@ -21,6 +29,10 @@ public String odsCode() {
         return odsCode;
     }
 
+    public String asidCode() {
+        return KNOWN_ASID_CODES.get(this.odsCode);
+    }
+
     public static Gp2GpSystem repoInEnv(TestConfiguration config) {
         var environmentName = config.getEnvironmentName();
         if ("dev".equals(environmentName)) {

src/test/java/uk/nhs/prm/deduction/e2e/queue/QueueMessageHelper.java

@@ -1,6 +1,7 @@
 package uk.nhs.prm.deduction.e2e.queue;
 
 import lombok.extern.slf4j.Slf4j;
+import org.awaitility.core.ConditionTimeoutException;
 import org.json.JSONException;
 import uk.nhs.prm.deduction.e2e.models.ResolutionMessage;
 import uk.nhs.prm.deduction.e2e.utility.QueueHelper;
@@ -52,6 +53,20 @@ public SqsMessage getMessageContaining(String substring) {
         return found;
     }
 
+    public boolean verifyNoMessageContaining(String substring) {
+        try {
+            await().atMost(60, TimeUnit.SECONDS)
+                    .with()
+                    .pollInterval(100, TimeUnit.MILLISECONDS)
+                    .until(() -> findMessageContaining(substring), notNullValue());
+            log(String.format("A message on %s match the given substring %s. Returning false", this.queueUri, substring));
+            return false;
+        } catch (ConditionTimeoutException error) {
+            log(String.format("Confirmed no message on %s match the given substring %s.", this.queueUri, substring));
+            return true;
+        }
+    }
+
     public List<SqsMessage> getAllMessageContaining(String substring) {
         log(String.format("Checking if message is present on : %s", this.queueUri));
         List<SqsMessage> allMessages = new ArrayList<>();
@@ -108,7 +123,7 @@ private List<SqsMessage> findMessagesOnQueue(int visibilityTimeout) {
     private SqsMessage findMessageContaining(String substring) {
         List<SqsMessage>  allMessages = thinlyWrappedSqsClient.readThroughMessages(this.queueUri, 180);
         for (SqsMessage message : allMessages) {
-            log(String.format("just finding message, checking conversationId: %s", this.queueUri));
+            log(String.format("Finding message with substring %s on queue: %s", substring, this.queueUri));
             if (message.contains(substring)) {
                 return message;
             }