Started implementation of new validation feature.

Author: chiaramapellimt

service/src/main/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapper.java

@@ -22,6 +22,7 @@
 import uk.nhs.adaptors.gp2gp.gpc.GetGpcStructuredTaskDefinition;
 
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrValidationException;
+import uk.nhs.adaptors.gp2gp.transformjsontoxmltool.XmlSchemaValidator;
 
 import java.util.List;
 import java.util.Optional;
@@ -41,6 +42,7 @@ public class EhrExtractMapper {
     private final NonConsultationResourceMapper nonConsultationResourceMapper;
     private final AgentDirectoryMapper agentDirectoryMapper;
     private final MessageContext messageContext;
+    private final XmlSchemaValidator xmlSchemaValidator;
 
     @Value("${gp2gp.gpc.overrideNhsNumber}")
     private String overrideNhsNumber;
@@ -55,6 +57,18 @@ public EhrExtractTemplateParameters mapBundleToEhrFhirExtractParams(
 
         var encounters = EncounterExtractor.extractEncounterReferencesFromEncounterList(bundle);
         var mappedComponents = mapEncounterToEhrComponents(encounters);
+
+        String ehrExtractXml = mapEhrExtractToXml(ehrExtractTemplateParameters);
+
+        try {
+            xmlSchemaValidator.validateOutputToXmlSchema(bundle.getId(), ehrExtractXml);
+        } catch (RuntimeException e) {
+            final String message = "XML Schema validation failed";
+            LOGGER.error(message, e);
+            throw new RuntimeException(message, e);
+        }
+
+
         mappedComponents.addAll(nonConsultationResourceMapper.mapRemainingResourcesToEhrCompositions(bundle));
         ehrExtractTemplateParameters.setComponents(mappedComponents);
 

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapperComponentTest.java

@@ -16,6 +16,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 import org.mockito.junit.jupiter.MockitoSettings;
 import org.mockito.quality.Strictness;
+import uk.nhs.adaptors.gp2gp.common.configuration.RedactionsContext;
 import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
 import uk.nhs.adaptors.gp2gp.common.service.FhirParseService;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
@@ -26,6 +27,7 @@
 import uk.nhs.adaptors.gp2gp.ehr.mapper.parameters.EhrExtractTemplateParameters;
 import uk.nhs.adaptors.gp2gp.ehr.utils.BloodPressureValidator;
 import uk.nhs.adaptors.gp2gp.gpc.GetGpcStructuredTaskDefinition;
+import uk.nhs.adaptors.gp2gp.transformjsontoxmltool.XmlSchemaValidator;
 import uk.nhs.adaptors.gp2gp.utils.CodeableConceptMapperMockUtil;
 import uk.nhs.adaptors.gp2gp.utils.ResourceTestFileUtils;
 
@@ -36,8 +38,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.lenient;
-import static org.mockito.Mockito.when;
+import static org.mockito.Mockito.*;
 
 @ExtendWith(MockitoExtension.class)
 @MockitoSettings(strictness = Strictness.LENIENT)
@@ -109,123 +110,100 @@ class EhrExtractMapperComponentTest {
     @BeforeEach
     public void setUp() {
         getGpcStructuredTaskDefinition = GetGpcStructuredTaskDefinition.builder()
-            .nhsNumber(TEST_NHS_NUMBER)
-            .conversationId(TEST_CONVERSATION_ID)
-            .requestId(TEST_REQUEST_ID)
-            .fromOdsCode(TEST_FROM_ODS_CODE)
-            .toOdsCode(TEST_TO_ODS_CODE)
-            .build();
+                .nhsNumber(TEST_NHS_NUMBER)
+                .conversationId(TEST_CONVERSATION_ID)
+                .requestId(TEST_REQUEST_ID)
+                .fromOdsCode(TEST_FROM_ODS_CODE)
+                .toOdsCode(TEST_TO_ODS_CODE)
+                .build();
 
         when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID_1, TEST_ID_2, TEST_ID_3);
         lenient().when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString()))
-            .thenReturn(TEST_ID_3);
+                .thenReturn(TEST_ID_3);
 
         when(timestampService.now()).thenReturn(Instant.parse(TEST_DATE_TIME));
-        when(codeableConceptCdMapper.mapCodeableConceptToCd(any(CodeableConcept.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        when(codeableConceptCdMapper.mapCodeableConceptForMedication(any(CodeableConcept.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        when(codeableConceptCdMapper.mapCodeableConceptToCdForTransformedActualProblemHeader(any(CodeableConcept.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.ACTUAL_PROBLEM_CODE);
-        when(codeableConceptCdMapper.mapToNullFlavorCodeableConcept(any(CodeableConcept.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        when(codeableConceptCdMapper.mapCodeableConceptToCdForAllergy(any(CodeableConcept.class),
-            any(AllergyIntolerance.AllergyIntoleranceClinicalStatus.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        when(codeableConceptCdMapper.mapToNullFlavorCodeableConceptForAllergy(any(CodeableConcept.class),
-            any(AllergyIntolerance.AllergyIntoleranceClinicalStatus.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        when(codeableConceptCdMapper.getDisplayFromCodeableConcept(any(CodeableConcept.class)))
-            .thenCallRealMethod();
-        when(codeableConceptCdMapper.mapCodeableConceptToCdForBloodPressure(any(CodeableConcept.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        when(codeableConceptCdMapper.mapToCdForTopic(any(CodeableConcept.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        when(codeableConceptCdMapper.mapToCdForTopic(any(CodeableConcept.class), any(String.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        when(codeableConceptCdMapper.mapToCdForTopic(any(String.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        when(codeableConceptCdMapper.getCdForTopic())
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        when(codeableConceptCdMapper.mapToCdForCategory(any(String.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        when(codeableConceptCdMapper.getCdForCategory())
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-
 
         messageContext = new MessageContext(randomIdGeneratorService);
 
+        RedactionsContext redactionsContext = mock(RedactionsContext.class);  // mock if necessary
+
+        XmlSchemaValidator xmlSchemaValidator = new XmlSchemaValidator(redactionsContext);
+
         ParticipantMapper participantMapper = new ParticipantMapper();
         StructuredObservationValueMapper structuredObservationValueMapper = new StructuredObservationValueMapper();
         ObservationMapper specimenObservationMapper = new ObservationMapper(
-            messageContext, structuredObservationValueMapper, codeableConceptCdMapper,
-            participantMapper, randomIdGeneratorService, confidentialityService);
+                messageContext, structuredObservationValueMapper, codeableConceptCdMapper,
+                participantMapper, randomIdGeneratorService, confidentialityService);
         SpecimenMapper specimenMapper = new SpecimenMapper(messageContext, specimenObservationMapper,
-            randomIdGeneratorService, confidentialityService);
+                randomIdGeneratorService, confidentialityService);
         DocumentReferenceToNarrativeStatementMapper documentReferenceToNarrativeStatementMapper
-            = new DocumentReferenceToNarrativeStatementMapper(
+                = new DocumentReferenceToNarrativeStatementMapper(
                 messageContext, new SupportedContentTypes(), participantMapper, confidentialityService);
 
         EncounterComponentsMapper encounterComponentsMapper = new EncounterComponentsMapper(
-            messageContext,
-            new AllergyStructureMapper(messageContext, codeableConceptCdMapper, participantMapper, confidentialityService),
-            new BloodPressureMapper(
-                messageContext, randomIdGeneratorService, new StructuredObservationValueMapper(),
-                codeableConceptCdMapper, new ParticipantMapper(), confidentialityService),
-            new ConditionLinkSetMapper(
-                messageContext, randomIdGeneratorService, codeableConceptCdMapper, participantMapper, confidentialityService),
-            new DiaryPlanStatementMapper(messageContext, codeableConceptCdMapper, participantMapper, confidentialityService),
-            documentReferenceToNarrativeStatementMapper,
-            new ImmunizationObservationStatementMapper(
-                messageContext,
-                codeableConceptCdMapper,
-                participantMapper,
-                confidentialityService
-            ),
-            new MedicationStatementMapper(
-                messageContext,
-                codeableConceptCdMapper,
-                participantMapper,
-                randomIdGeneratorService,
-                confidentialityService
-            ),
-            new ObservationToNarrativeStatementMapper(messageContext, participantMapper, confidentialityService),
-            new ObservationStatementMapper(
                 messageContext,
-                new StructuredObservationValueMapper(),
-                new PertinentInformationObservationValueMapper(),
+                new AllergyStructureMapper(messageContext, codeableConceptCdMapper, participantMapper, confidentialityService),
+                new BloodPressureMapper(
+                        messageContext, randomIdGeneratorService, new StructuredObservationValueMapper(),
+                        codeableConceptCdMapper, new ParticipantMapper(), confidentialityService),
+                new ConditionLinkSetMapper(
+                        messageContext, randomIdGeneratorService, codeableConceptCdMapper, participantMapper, confidentialityService),
+                new DiaryPlanStatementMapper(messageContext, codeableConceptCdMapper, participantMapper, confidentialityService),
+                documentReferenceToNarrativeStatementMapper,
+                new ImmunizationObservationStatementMapper(
+                        messageContext,
+                        codeableConceptCdMapper,
+                        participantMapper,
+                        confidentialityService
+                ),
+                new MedicationStatementMapper(
+                        messageContext,
+                        codeableConceptCdMapper,
+                        participantMapper,
+                        randomIdGeneratorService,
+                        confidentialityService
+                ),
+                new ObservationToNarrativeStatementMapper(messageContext, participantMapper, confidentialityService),
+                new ObservationStatementMapper(
+                        messageContext,
+                        new StructuredObservationValueMapper(),
+                        new PertinentInformationObservationValueMapper(),
+                        codeableConceptCdMapper,
+                        participantMapper,
+                        confidentialityService
+                ),
+                new RequestStatementMapper(messageContext, codeableConceptCdMapper, participantMapper, confidentialityService),
+                new DiagnosticReportMapper(
+                        messageContext, specimenMapper, participantMapper, randomIdGeneratorService, confidentialityService
+                ),
+                new BloodPressureValidator(),
                 codeableConceptCdMapper,
-                participantMapper,
                 confidentialityService
-            ),
-            new RequestStatementMapper(messageContext, codeableConceptCdMapper, participantMapper, confidentialityService),
-            new DiagnosticReportMapper(
-                messageContext, specimenMapper, participantMapper, randomIdGeneratorService, confidentialityService
-            ),
-            new BloodPressureValidator(),
-            codeableConceptCdMapper,
-            confidentialityService
         );
 
         AgentDirectoryMapper agentDirectoryMapper = new AgentDirectoryMapper(
-            messageContext,
-            new AgentPersonMapper(messageContext)
+                messageContext,
+                new AgentPersonMapper(messageContext)
         );
 
         nonConsultationResourceMapper = new NonConsultationResourceMapper(messageContext,
-            randomIdGeneratorService,
-            encounterComponentsMapper,
-            new BloodPressureValidator()
+                randomIdGeneratorService,
+                encounterComponentsMapper,
+                new BloodPressureValidator()
         );
 
-        ehrExtractMapper = new EhrExtractMapper(randomIdGeneratorService,
-            timestampService,
-            new EncounterMapper(messageContext, encounterComponentsMapper, confidentialityService),
-            nonConsultationResourceMapper,
-            agentDirectoryMapper,
-            messageContext);
+        ehrExtractMapper = new EhrExtractMapper(
+                randomIdGeneratorService,
+                timestampService,
+                new EncounterMapper(messageContext, encounterComponentsMapper, confidentialityService),
+                nonConsultationResourceMapper,
+                agentDirectoryMapper,
+                messageContext,
+                xmlSchemaValidator
+        );
     }
 
+
     @AfterEach
     public void tearDown() {
         messageContext.resetMessageContext();

service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/EhrExtractMapperTest.java

@@ -4,8 +4,7 @@
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.junit.jupiter.api.Assertions.assertThrows;
-import static org.mockito.Mockito.when;
-import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.*;
 
 
 import java.time.Instant;
@@ -25,6 +24,7 @@
 import uk.nhs.adaptors.gp2gp.common.service.TimestampService;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrValidationException;
 import uk.nhs.adaptors.gp2gp.gpc.GetGpcStructuredTaskDefinition;
+import uk.nhs.adaptors.gp2gp.transformjsontoxmltool.XmlSchemaValidator;
 
 @ExtendWith(MockitoExtension.class)
 class EhrExtractMapperTest {
@@ -53,6 +53,9 @@ class EhrExtractMapperTest {
     @InjectMocks
     private EhrExtractMapper ehrExtractMapper;
 
+    @Mock
+    private XmlSchemaValidator xmlSchemaValidator;
+
     @Test
     void When_NhsOverrideNumberProvided_Expect_OverrideToBeUsed()  {
         when(nonConsultationResourceMapper.mapRemainingResourcesToEhrCompositions(any()))
@@ -155,4 +158,27 @@ void When_BuildEhrCompositionForSkeletonEhrExtract_Expect_ExpectedComponentBuilt
 
         assertThat(actual).isEqualTo(expected);
     }
+
+    @Test
+    void When_XmlFailsValidation_Expect_XmlSchemaValidationErrorIsThrown() {
+        when(timestampService.now()).thenReturn(Instant.now().truncatedTo(ChronoUnit.MILLIS));
+        String invalidXml = "<invalidXml />";
+        var taskDef = GetGpcStructuredTaskDefinition.builder()
+                .nhsNumber(NHS_NUMBER)
+                .build();
+        var bundle = mock(Bundle.class);
+
+
+        when(nonConsultationResourceMapper.mapRemainingResourcesToEhrCompositions(any()))
+                .thenReturn(Collections.singletonList(invalidXml));
+
+
+        RuntimeException thrown = assertThrows(RuntimeException.class, () ->
+                ehrExtractMapper.mapBundleToEhrFhirExtractParams(taskDef, bundle)
+        );
+        assertThat(thrown.getMessage()).isEqualTo("XML Schema validation failed");
+    }
+
+
+
 }

service/src/test/java/uk/nhs/adaptors/gp2gp/uat/EhrExtractUATTest.java

@@ -50,6 +50,7 @@
 import uk.nhs.adaptors.gp2gp.ehr.mapper.parameters.EhrExtractTemplateParameters;
 import uk.nhs.adaptors.gp2gp.ehr.utils.BloodPressureValidator;
 import uk.nhs.adaptors.gp2gp.gpc.GetGpcStructuredTaskDefinition;
+import uk.nhs.adaptors.gp2gp.transformjsontoxmltool.XmlSchemaValidator;
 import uk.nhs.adaptors.gp2gp.utils.ResourceTestFileUtils;
 import wiremock.org.custommonkey.xmlunit.XMLAssert;
 
@@ -139,6 +140,8 @@ public void setUp() {
             .build();
 
         final RandomIdGeneratorService randomIdGeneratorService = new RandomIdGeneratorServiceStub();
+        final XmlSchemaValidator xmlSchemaValidator = new XmlSchemaValidator(redactionsContext);
+
         when(timestampService.now()).thenReturn(Instant.parse("2020-01-01T01:01:01.01Z"));
 
         outputMessageWrapperMapper = new OutputMessageWrapperMapper(randomIdGeneratorService, timestampService, redactionsContext);
@@ -158,7 +161,7 @@ public void setUp() {
             new NonConsultationResourceMapper(messageContext, randomIdGeneratorService, encounterComponentsMapper,
                 new BloodPressureValidator());
         ehrExtractMapper = new EhrExtractMapper(randomIdGeneratorService, timestampService, encounterMapper,
-            nonConsultationResourceMapper, agentDirectoryMapper, messageContext);
+            nonConsultationResourceMapper, agentDirectoryMapper, messageContext, xmlSchemaValidator);
         lenient().when(confidentialityService.generateConfidentialityCode(any()))
             .thenReturn(Optional.empty());
     }