Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

NIAD-2846: new RCMR_IN030000UK07 compatibility test #318

Merged
merged 23 commits into from
Oct 5, 2023
Merged

NIAD-2846: new RCMR_IN030000UK07 compatibility test #318

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2ff0643
adding RCMR_IN030000UK07 test
Sep 28, 2023
1f7d0cd
update to the newer RCMR_MT030101UK05 schema instead of old RCMR_MT03…
Sep 28, 2023
151503b
removing unused RCMR_MT030101UK04 schema
Sep 28, 2023
f36633e
code refactoring to remove hard-coded values
Sep 29, 2023
19bc23c
fixing cast class issue
Oct 2, 2023
5573505
adding interface to RCMRMT030101UK04Author2 class
Oct 3, 2023
a7f909a
replacing classes with interfaces
Oct 3, 2023
8d64b3f
Merge branch 'main' into NIAD-2846
Oct 3, 2023
41872ee
fixing checkstyle
Oct 3, 2023
3a076c6
fixing checkstyle issues
Oct 3, 2023
722504e
checkstyle fix
Oct 3, 2023
4a8bb01
constant checkstyle fix
Oct 3, 2023
b0d6a0a
fixing checktyle errors: whitespaces, identations
Oct 3, 2023
76465bc
checkstyle fixes
Oct 4, 2023
8effdb9
changing RCMRMT030101UK04ReferenceRange specific type an abstract one…
Oct 4, 2023
b9d30e5
timeout change to the original value of 10 sec
Oct 4, 2023
3ac899a
removing unused file
Oct 4, 2023
4678cdb
Merge branch 'NIAD-2846' of https://github.com/NHSDigital/nia-patient…
Oct 4, 2023
615196f
code refactoring
Oct 5, 2023
0f221f5
variable name change
Oct 5, 2023
a02d06f
interfaces removal
Oct 5, 2023
1f1840a
adding missing pieces for RCMR_IN030000UK07 type and removal of unnec…
Oct 5, 2023
d3e4747
Merge branch 'main' into NIAD-2846
Oct 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions ...nslator/src/integrationTest/java/uk/nhs/adaptors/pss/translator/EhrExtractHandlingIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package uk.nhs.adaptors.pss.translator;

import static org.assertj.core.api.Assertions.fail;
import static org.awaitility.Awaitility.await;
import static org.awaitility.Awaitility.waitAtMost;
import static org.springframework.boot.test.context.SpringBootTest.WebEnvironment.RANDOM_PORT;

import static uk.nhs.adaptors.common.util.FileUtil.readResourceAsString;
Expand All @@ -11,6 +11,7 @@

import java.io.PrintWriter;
import java.nio.charset.StandardCharsets;
import java.time.Duration;
import java.util.List;
import java.util.Locale;
import java.util.UUID;
Expand Down Expand Up @@ -47,6 +48,7 @@
@DirtiesContext
@AutoConfigureMockMvc
public class EhrExtractHandlingIT {

private static final boolean OVERWRITE_EXPECTED_JSON = false;
private static final int NHS_NUMBER_MIN_MAX_LENGTH = 10;
private static final String EBXML_PART_PATH = "/xml/RCMR_IN030000UK06/ebxml_part.xml";
Expand Down Expand Up @@ -96,6 +98,7 @@ public class EhrExtractHandlingIT {

private String patientNhsNumber;
private String conversationId;
static final int WAITING_TIME = 10;

@BeforeEach
public void setUp() {
Expand All @@ -107,10 +110,23 @@ public void setUp() {
@Test
public void handleEhrExtractFromQueue() throws JSONException {
// process starts with consuming a message from MHS queue
sendInboundMessageToQueue("/xml/RCMR_IN030000UK06/payload_part.xml");
sendInboundMessageToQueue("/xml/RCMR_IN030000UK06/payload_part.xml", EBXML_PART_PATH);

// wait until EHR extract is translated to bundle resource and saved to the DB
waitAtMost(Duration.ofSeconds(WAITING_TIME)).until(this::isEhrMigrationCompleted);
ole4ryb marked this conversation as resolved.
Show resolved Hide resolved

// verify generated bundle resource
verifyBundle("/json/expectedBundle.json");
}

@Test
public void handleEhrExtractWithConfidentialityCodeFromQueue() throws JSONException {
final String ebxmlPartPath = "/xml/RCMR_IN030000UK07/ebxml_part.xml";
// process starts with consuming a message from MHS queue
sendInboundMessageToQueue("/xml/RCMR_IN030000UK07/payload_part_with_confidentiality_code.xml", ebxmlPartPath);

// wait until EHR extract is translated to bundle resource and saved to the DB
await().until(this::isEhrMigrationCompleted);
waitAtMost(Duration.ofSeconds(WAITING_TIME)).until(this::isEhrMigrationCompleted);

// verify generated bundle resource
verifyBundle("/json/expectedBundle.json");
Expand All @@ -129,15 +145,15 @@ private String generateConversationId() {
return UUID.randomUUID().toString();
}

private void sendInboundMessageToQueue(String payloadPartPath) {
var inboundMessage = createInboundMessage(payloadPartPath);
private void sendInboundMessageToQueue(String payloadPartPath, String ebxmlPartPath) {
var inboundMessage = createInboundMessage(payloadPartPath, ebxmlPartPath);
mhsJmsTemplate.send(session -> session.createTextMessage(parseMessageToString(inboundMessage)));
}

private InboundMessage createInboundMessage(String payloadPartPath) {
private InboundMessage createInboundMessage(String payloadPartPath, String ebxmlPartPath) {
var inboundMessage = new InboundMessage();
var payload = readResourceAsString(payloadPartPath).replace(NHS_NUMBER_PLACEHOLDER, patientNhsNumber);
var ebXml = readResourceAsString(EBXML_PART_PATH).replace(CONVERSATION_ID_PLACEHOLDER, conversationId);
var ebXml = readResourceAsString(ebxmlPartPath).replace(CONVERSATION_ID_PLACEHOLDER, conversationId);
inboundMessage.setPayload(payload);
inboundMessage.setEbXML(ebXml);
return inboundMessage;
Expand Down Expand Up @@ -190,4 +206,4 @@ private void overwriteExpectJson(String newExpected) {
private String parseMessageToString(InboundMessage inboundMessage) {
return objectMapper.writeValueAsString(inboundMessage);
}
}
}
34 changes: 34 additions & 0 deletions gp2gp-translator/src/integrationTest/resources/xml/RCMR_IN030000UK07/ebxml_part.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<SOAP:Envelope xmlns:SOAP="http://schemas.xmlsoap.org/soap/envelope/" xmlns:eb="http://www.oasis-open.org/committees/ebxml-msg/schema/msg-header-2_0.xsd" xmlns:hl7ebxml="urn:hl7-org:transport/ebxml/DSTUv1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:xsi="http://www.w3c.org/2001/XML-Schema-Instance">
<SOAP:Header>
<eb:MessageHeader SOAP:mustUnderstand="1" eb:version="2.0">
<eb:From>
<eb:PartyId eb:type="urn:nhs:names:partyType:ocs+serviceInstance">YGM24-820388</eb:PartyId>
</eb:From>
<eb:To>
<eb:PartyId eb:type="urn:nhs:names:partyType:ocs+serviceInstance">B86041-822103</eb:PartyId>
</eb:To>
<eb:CPAId>e06af803674408a9d8e8</eb:CPAId>
<eb:ConversationId>{{conversationId}}</eb:ConversationId>
<eb:Service>urn:nhs:names:services:gp2gp</eb:Service>
<eb:Action>RCMR_IN030000UK07</eb:Action>
<eb:MessageData>
<eb:MessageId>31FA3430-6E88-11EA-9384-E83935108FD5</eb:MessageId>
<eb:Timestamp>2020-03-25T11:03:02Z</eb:Timestamp>
<eb:TimeToLive>2020-03-25T15:13:02Z</eb:TimeToLive>
</eb:MessageData>
<eb:DuplicateElimination>always</eb:DuplicateElimination>
</eb:MessageHeader>
<eb:AckRequested SOAP:mustUnderstand="1" eb:version="2.0" eb:signed="false" SOAP:actor="urn:oasis:names:tc:ebxml-msg:actor:nextMSH" />
</SOAP:Header>
<SOAP:Body>
<eb:Manifest SOAP:mustUnderstand="1" eb:version="2.0">
<eb:Reference xlink:href="cid:[email protected]/SystmOne/GP2GP1.1A">
<eb:Schema eb:location="http://www.nhsia.nhs.uk/schemas/HL7-Message.xsd" eb:version="2.0" />
<hl7ebxml:Payload style="HL7" encoding="XML" version="3.0" />
</eb:Reference>
<eb:Reference xlink:href="cid:[email protected]" eb:id="_31B75ED0-6E88-11EA-9384-E83935108FD5">
<eb:Description xml:lang="en-gb">31B75ED0-6E88-11EA-9384-E83935108FD5_patient-attachment.txt.txt</eb:Description>
</eb:Reference>
</eb:Manifest>
</SOAP:Body>
</SOAP:Envelope>
Loading