Update EhrExtractMapper.java

Author: chiaramapellimt

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

@@ -69,10 +69,12 @@ public String mapEhrExtractToXml(EhrExtractTemplateParameters ehrExtractTemplate
 
 
     public void validateXmlAgainstSchema(String xml) {
-        String schemaPath = RedactionsContext.REDACTION_INTERACTION_ID.equals(redactionsContext.ehrExtractInteractionId())
+        String interactionId = redactionsContext.ehrExtractInteractionId();
+        boolean isRedactionInteraction = RedactionsContext.REDACTION_INTERACTION_ID.equals(interactionId);
+
+        String schemaPath = isRedactionInteraction
                 ? RCMR_IN030000UK07_SCHEMA_PATH
                 : RCMR_IN030000UK06_SCHEMA_PATH;
-
         try {
             SchemaFactory factory = SchemaFactory.newDefaultInstance();
             Schema schema = factory.newSchema(new File(schemaPath));
@@ -82,7 +84,7 @@ public void validateXmlAgainstSchema(String xml) {
 
             LOGGER.info("XML successfully validated against schema: {}", schemaPath);
         } catch (SAXException | IOException e) {
-            LOGGER.error("XML validation failed: {}", e.getMessage(), e);
+            LOGGER.error("XML validation failed against schema {}: {}", schemaPath, e.getMessage(), e);
             throw new XmlSchemaValidationException("XML schema validation failed", e);
         }
     }