Skip to content

NIAD-3432: Skeleton processing service now removes leading _ before performing XPath query #1257

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

Merged
chiaramapellimt merged 2 commits into from
Apr 7, 2026
Merged

NIAD-3432: Skeleton processing service now removes leading _ before performing XPath query #1257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f5d9623
NIAD-3432: Skeleton processing service now removes leading _ before p…
chiaramapellimt Apr 2, 2026
56f7bb3
NIAD-3432: Skeleton processing service now removes leading _ before p…
chiaramapellimt Apr 2, 2026
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
2 changes: 1 addition & 1 deletion ...lator/src/main/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ private InboundMessage insertSkeletonIntoInboundMessagePayload(PatientAttachment
throw new IllegalArgumentException("inboundMessage does not contain a skeleton attachment reference");
}

var skeletonDocumentId = ebxmlSkeletonReference.get().getDocumentId();
var skeletonDocumentId = ebxmlSkeletonReference.get().getDocumentId().replaceFirst("^_", "");
var payloadXml = xPathService.parseDocumentFromXml(inboundMessage.getPayload());
var valueNodes = xPathService.getNodes(payloadXml, "//*/@*[.='" + skeletonDocumentId + "']/parent::*/parent::*");
var payloadNodeToReplace = valueNodes.item(0);
Expand Down
43 changes: 41 additions & 2 deletions .../src/test/java/uk/nhs/adaptors/pss/translator/service/SkeletonProcessingServiceTests.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,11 @@
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.doThrow;
import static org.mockito.Mockito.when;

import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import static org.mockito.Mockito.doThrow;
import static uk.nhs.adaptors.common.util.FileUtil.readResourceAsString;

import java.nio.charset.StandardCharsets;
Expand Down Expand Up @@ -253,6 +255,43 @@ PatientAttachmentLog createSkeletonPatientAttachmentLog() {
.build();
}

@Test
void When_SkeletonDocumentIdHasLeadingUnderscore_Expect_UnderscoreIsStrippedBeforeXPathQuery()
throws SAXException, TransformerException {

var inboundMessage = new InboundMessage();
var attachmentLog = createSkeletonPatientAttachmentLog();

inboundMessage.setPayload(readInboundMessagePayloadFromFile());
inboundMessage.setEbXML(readInboundMessageEbXmlFromFile());

var reference = new EbxmlReference(
"First instance is always a payload",
"mid:1",
"_C3866E77-41E2-4593-A133-AB622F54684F"
);
var ebXmlAttachments = List.of(reference);
var fileAsBytes = readInboundMessageSkeletonPayloadFromFile().getBytes(StandardCharsets.UTF_8);

when(attachmentHandlerService.getAttachment(any(), any())).thenReturn(fileAsBytes);
when(xmlParseUtilService.getEbxmlAttachmentsData(any())).thenReturn(ebXmlAttachments);
when(xPathService.parseDocumentFromXml(any())).thenReturn(ebXmlDocument);
when(xPathService.getNodes(any(), any())).thenReturn(nodeList);
when(nodeList.item(0)).thenReturn(node);
when(ebXmlDocument.getElementsByTagName("*")).thenReturn(nodeList);
when(xmlParseUtilService.getStringFromDocument(any())).thenReturn(inboundMessage.getPayload());
when(node.getOwnerDocument()).thenReturn(ebXmlDocument);
when(node.getParentNode()).thenReturn(node);

skeletonProcessingService.updateInboundMessageWithSkeleton(
attachmentLog, inboundMessage, CONVERSATION_ID);

var expectedDocumentId = "C3866E77-41E2-4593-A133-AB622F54684F";
var expectedXPath = "//*/@*[.='" + expectedDocumentId + "']/parent::*/parent::*";

verify(xPathService).getNodes(any(), eq(expectedXPath));
}

@SneakyThrows
private String readInboundMessagePayloadFromFile() {
return readResourceAsString("/xml/inbound_message_payload.xml").replace("{{nhsNumber}}", NHS_NUMBER);
Expand Down
Loading