PRMT-3439 - Multiple EHR requests for the same EHR from the same GP

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

@@ -19,6 +19,11 @@ public class TestConfiguration {
 
     public static final int SECONDS_IN_AN_HOUR = 3600;
 
+    public static String PDS_ADAPTOR_URL = String.format("https://pds-adaptor.%s.patient-deductions.nhs.uk/", getEnvSuffix());
+    public static String GP2GP_MESSENGER_URL = String.format("https://gp2gp-messenger.%s.patient-deductions.nhs.uk/", getEnvSuffix());
+    public static String EHR_REPO_URL = String.format("https://ehr-repo.%s.patient-deductions.nhs.uk/", getEnvSuffix());
+    public static String EHR_OUT_URL = String.format("https://ehr-out-service.%s.patient-deductions.nhs.uk/", getEnvSuffix());
+
     private final ImmutableMap<String, List<String>> suspendedNhsNumbersByEnv = ImmutableMap.of(
             "dev", TestData.dev(),
             "pre-prod", TestData.preProd(),
@@ -169,16 +174,18 @@ private String getQueueUri(String name) {
         return String.format("https://sqs.eu-west-2.amazonaws.com/%s/%s-%s", getAwsAccountNo(), getEnvironmentName(), name);
     }
 
+    // TODO: After we move packages to main,
+    //       change the reference for these url-returning methods to directly reference the constants.
     public String getPdsAdaptorUrl() {
-        return String.format("https://pds-adaptor.%s.patient-deductions.nhs.uk/", getEnvSuffix());
+        return PDS_ADAPTOR_URL;
     }
 
     public String getGp2GpMessengerUrl() {
-        return String.format("https://gp2gp-messenger.%s.patient-deductions.nhs.uk/", getEnvSuffix());
+        return GP2GP_MESSENGER_URL;
     }
 
     public String getEhrRepoUrl() {
-        return String.format("https://ehr-repo.%s.patient-deductions.nhs.uk/", getEnvSuffix());
+        return EHR_REPO_URL;
     }
 
     private String getAwsAccountNo() {
@@ -224,7 +231,7 @@ public int performanceTestTimeout() {
         return parseInt(timeout);
     }
 
-    public String getEnvironmentName() {
+    public static String getEnvironmentName() {
         return getRequiredEnvVar("NHS_ENVIRONMENT");
     }
 
@@ -240,7 +247,7 @@ private AwsConfigurationClient createAwsConfigurationClient() {
         return new RoleAssumingAwsConfigurationClient(new AssumeRoleCredentialsProviderFactory());
     }
 
-    private String getEnvSuffix() {
+    private static String getEnvSuffix() {
         return getEnvironmentName().equals("prod") ? "prod" : String.format("%s.non-prod", getEnvironmentName());
     }
 

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

@@ -0,0 +1,36 @@
+package uk.nhs.prm.deduction.e2e.models;
+
+import lombok.AllArgsConstructor;
+import uk.nhs.prm.deduction.e2e.utility.Resources;
+
+import java.util.UUID;
+
+import static uk.nhs.prm.deduction.e2e.utility.TestUtils.getUUIDAsUpperCaseString;
+
+@AllArgsConstructor
+public class ContinueRequestMessage {
+    private final UUID conversationId;
+    private final UUID messageId;
+    private final String sourceGpOds;
+    private final String destinationGpOds;
+    private final String sourceGpAsid;
+    private final String 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,38 @@
+package uk.nhs.prm.deduction.e2e.models;
+
+import lombok.AllArgsConstructor;
+import uk.nhs.prm.deduction.e2e.utility.Resources;
+
+import java.util.UUID;
+
+import static uk.nhs.prm.deduction.e2e.utility.TestUtils.getUUIDAsUpperCaseString;
+
+@AllArgsConstructor
+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 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)) {