Skip to content

Changed timing of check from before to after message wrapping #1473

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 1 commit into from
May 11, 2026
Merged

Changed timing of check from before to after message wrapping #1473

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 7 additions & 5 deletions service/src/main/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,16 +152,18 @@ public String mapStructuredRecordToEhrExtractXml(GetGpcStructuredTaskDefinition
.mapBundleToEhrFhirExtractParams(structuredTaskDefinition, bundle);
String ehrExtractContent = ehrExtractMapper.mapEhrExtractToXml(ehrExtractTemplateParameters);

ehrExtractStatusService.saveEhrExtractMessageId(structuredTaskDefinition.getConversationId(),
ehrExtractTemplateParameters.getEhrExtractId());

String wrappedMessage = outputMessageWrapperMapper.map(structuredTaskDefinition, ehrExtractContent);

try {
ehrExtractMapper.validateXmlAgainstSchema(ehrExtractContent);
ehrExtractMapper.validateXmlAgainstSchema(wrappedMessage);
} catch (XmlSchemaValidationException e) {
LOGGER.error("EHR Extract XML validation failed: {}", e.getMessage());
}

ehrExtractStatusService.saveEhrExtractMessageId(structuredTaskDefinition.getConversationId(),
ehrExtractTemplateParameters.getEhrExtractId());

return outputMessageWrapperMapper.map(structuredTaskDefinition, ehrExtractContent);
return wrappedMessage;
}

@SneakyThrows
Expand Down
4 changes: 2 additions & 2 deletions service/src/test/java/uk/nhs/adaptors/gp2gp/gpc/StructuredRecordMappingServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,13 +299,13 @@ void When_XmlSchemaValidationFails_Expect_ErrorLoggedAndProcessingContinues() {
.thenReturn(expectedHL7);

doThrow(new XmlSchemaValidationException("Invalid XML", new RuntimeException("Invalid XML")))
.when(ehrExtractMapper).validateXmlAgainstSchema(ehrExtractContent);
.when(ehrExtractMapper).validateXmlAgainstSchema(expectedHL7);

var actualHL7 = structuredRecordMappingService.mapStructuredRecordToEhrExtractXml(structuredTaskDefinition, bundle);

verify(ehrExtractMapper).mapBundleToEhrFhirExtractParams(structuredTaskDefinition, bundle);
verify(ehrExtractMapper).mapEhrExtractToXml(ehrExtractTemplateParameters);
verify(ehrExtractMapper).validateXmlAgainstSchema(ehrExtractContent);
verify(ehrExtractMapper).validateXmlAgainstSchema(expectedHL7);
verify(outputMessageWrapperMapper).map(structuredTaskDefinition, ehrExtractContent);
verify(ehrExtractStatusService).saveEhrExtractMessageId(conversationId, ehrExtractId);

Expand Down
Loading