NIAD-3157: Send over uncategorised data observation NOPAT field to incumbent (#1194)

* Send over uncategorised data observation NOPAT field to incumbent

* small test optimization

* com.arcmutate:base version upgrade

* downgrade pitest version

* changelog update

Author: ORybak5

CHANGELOG.md

@@ -7,8 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [Unreleased]
 
 ### Added
-The GP2GP Adaptor now adds the EhrComposition / confidentialityCode field when Encounter.meta.security contains NOPAT security entry
-
+* The GP2GP Adaptor now adds the EhrComposition / confidentialityCode field when Encounter.meta.security contains NOPAT security entry
+* The GP2GP Adaptor now populates the ObservationStatement / confidentialityCode field when the .meta.security field of an Uncategorised Data Observation contains NOPAT
 
 ## [2.4.0] - 2025-04-02
 

service/build.gradle

@@ -74,7 +74,7 @@ dependencies {
 	testImplementation 'io.findify:s3mock_2.13:0.2.6'
 
 	pitest 'com.arcmutate:base:1.3.2'
-	pitest 'com.arcmutate:pitest-git-plugin:2.2.1'
+	pitest 'com.arcmutate:pitest-git-plugin:2.1.0'
 }
 
 test {

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

@@ -20,6 +20,7 @@
 import com.github.mustachejava.Mustache;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrMapperException;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.parameters.ObservationStatementTemplateParameters;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.wrapper.ConditionWrapper;
@@ -47,15 +48,20 @@ public class ObservationStatementMapper {
     private final PertinentInformationObservationValueMapper pertinentInformationObservationValueMapper;
     private final CodeableConceptCdMapper codeableConceptCdMapper;
     private final ParticipantMapper participantMapper;
+    private final ConfidentialityService confidentialityService;
 
     public String mapObservationToObservationStatement(Observation observation, boolean isNested) {
+
+        var confidentialityCode = confidentialityService.generateConfidentialityCode(observation);
+
         final IdMapper idMapper = messageContext.getIdMapper();
         var observationStatementTemplateParametersBuilder = ObservationStatementTemplateParameters.builder()
             .observationStatementId(idMapper.getOrNew(ResourceType.Observation, observation.getIdElement()))
             .code(prepareCode(observation))
             .issued(StatementTimeMappingUtils.prepareAvailabilityTimeForObservation(observation))
             .isNested(isNested)
-            .effectiveTime(StatementTimeMappingUtils.prepareEffectiveTimeForObservation(observation));
+            .effectiveTime(StatementTimeMappingUtils.prepareEffectiveTimeForObservation(observation))
+            .confidentialityCode(confidentialityCode.orElse(null));
 
         if (observation.hasValue()) {
             Type value = observation.getValue();

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

@@ -11,6 +11,7 @@ public class ObservationStatementTemplateParameters {
     private String observationStatementId;
     private String comment;
     private String effectiveTime;
+    private String confidentialityCode;
     private String issued;
     private String value;
     private String referenceRange;

service/src/main/resources/templates/unstructured_observation_statement_template.mustache

@@ -6,6 +6,9 @@
         <effectiveTime>
             {{{effectiveTime}}}
         </effectiveTime>
+        {{#confidentialityCode}}
+            {{{confidentialityCode}}}
+        {{/confidentialityCode}}
         {{{issued}}}
         {{{value}}}
         {{{interpretation}}}

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

@@ -185,7 +185,8 @@ codeableConceptCdMapper, new ParticipantMapper(), confidentialityService),
                 new StructuredObservationValueMapper(),
                 new PertinentInformationObservationValueMapper(),
                 codeableConceptCdMapper,
-                participantMapper
+                participantMapper,
+                confidentialityService
             ),
             new RequestStatementMapper(messageContext, codeableConceptCdMapper, participantMapper, confidentialityService),
             new DiagnosticReportMapper(

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

@@ -183,7 +183,8 @@ public void setUp() {
             messageContext,
             structuredObservationValueMapper,
             new PertinentInformationObservationValueMapper(), codeableConceptCdMapper,
-            participantMapper
+            participantMapper,
+            confidentialityService
         );
         ImmunizationObservationStatementMapper immunizationObservationStatementMapper =
             new ImmunizationObservationStatementMapper(

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

@@ -8,6 +8,7 @@
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
+import static uk.nhs.adaptors.gp2gp.common.configuration.RedactionsContext.REDACTION_INTERACTION_ID;
 import static uk.nhs.adaptors.gp2gp.utils.IdUtil.buildReference;
 
 import java.io.IOException;
@@ -29,6 +30,8 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+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;
 import uk.nhs.adaptors.gp2gp.ehr.exception.EhrMapperException;
@@ -43,6 +46,7 @@ public class ObservationStatementMapperTest {
 
     private static final String INPUT_JSON_WITH_EFFECTIVE_DATE_TIME = TEST_FILE_DIRECTORY
         + "example-observation-resource-1.json";
+    private static final String INPUT_JSON_WITH_NOPAT = TEST_FILE_DIRECTORY + "example-observation-resource-with-nopat.json";
     private static final String INPUT_JSON_WITH_NULL_EFFECTIVE_DATE_TIME = TEST_FILE_DIRECTORY
         + "example-observation-resource-2.json";
     private static final String INPUT_JSON_WITH_EFFECTIVE_PERIOD = TEST_FILE_DIRECTORY
@@ -127,6 +131,8 @@ public class ObservationStatementMapperTest {
         + "expected-output-observation-statement-2.xml";
     private static final String OUTPUT_XML_USES_NESTED_COMPONENT = TEST_FILE_DIRECTORY
         + "expected-output-observation-statement-3.xml";
+    private static final String OUTPUT_XML_WITH_NOPAT = TEST_FILE_DIRECTORY
+        + "expected-observation-statement-with-confidentiality-code.xml";
     private static final String OUTPUT_XML_USES_EFFECTIVE_PERIOD = TEST_FILE_DIRECTORY
         + "expected-output-observation-statement-4.xml";
     private static final String OUTPUT_XML_WITH_STRING_VALUE = TEST_FILE_DIRECTORY
@@ -186,6 +192,10 @@ public class ObservationStatementMapperTest {
     private static final String OUTPUT_XML_WITH_BODY_SITE = TEST_FILE_DIRECTORY
             + "expected-output-observation-with-body-site.xml";
 
+    private static final String CONFIDENTIALITY_CODE =
+        "<confidentialityCode code=\"NOPAT\" codeSystem=\"2.16.840.1.113883.4.642.3.47\" "
+        + "displayName=\"no disclosure to patient, family or caregivers without attending provider's authorization\" />";
+
     private CharSequence expectedOutputMessage;
     private ObservationStatementMapper observationStatementMapper;
     private MessageContext messageContext;
@@ -208,14 +218,26 @@ public void setUp() {
             new StructuredObservationValueMapper(),
             new PertinentInformationObservationValueMapper(),
             codeableConceptCdMapper,
-            new ParticipantMapper());
+            new ParticipantMapper(),
+            new ConfidentialityService(new RedactionsContext(REDACTION_INTERACTION_ID)));
     }
 
     @AfterEach
     public void tearDown() {
         messageContext.resetMessageContext();
     }
 
+    @Test
+    void When_MappingParsedObservationWithNopat_Expect_ObservationStatementWithConfidentialityCode() {
+        expectedOutputMessage = ResourceTestFileUtils.getFileContent(OUTPUT_XML_WITH_NOPAT);
+        var jsonInput = ResourceTestFileUtils.getFileContent(INPUT_JSON_WITH_NOPAT);
+        Observation parsedObservation = new FhirParseService().parseResource(jsonInput, Observation.class);
+
+        String outputMessage = observationStatementMapper.mapObservationToObservationStatement(parsedObservation, true);
+
+        assertThat(outputMessage).contains(CONFIDENTIALITY_CODE);
+    }
+
     @ParameterizedTest
     @MethodSource("resourceFileParams")
     public void When_MappingObservationJson_Expect_ObservationStatementXmlOutput(String inputJson, String outputXml) throws IOException {

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

@@ -205,7 +205,8 @@ codeableConceptCdMapper, new ParticipantMapper(), confidentialityService),
                 new StructuredObservationValueMapper(),
                 new PertinentInformationObservationValueMapper(),
                 codeableConceptCdMapper,
-                participantMapper
+                participantMapper,
+                confidentialityService
             ),
             new RequestStatementMapper(messageContext, codeableConceptCdMapper, participantMapper, confidentialityService),
             new DiagnosticReportMapper(messageContext, specimenMapper, participantMapper, randomIdGeneratorService, confidentialityService),

service/src/test/resources/ehr/mapper/observation/example-observation-resource-with-nopat.json

@@ -0,0 +1,20 @@
+{
+    "resourceType": "Observation",
+    "id": "3377543D-5B1B-4C4F-BFF6-9F7BC3A1C3B8",
+    "meta": {
+        "profile": [
+            "https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-Immunization-1"
+        ],
+        "security": [{
+            "system":"http://hl7.org/fhir/v3/ActCode",
+            "code":"NOPAT",
+            "display":"no disclosure to patient, family or caregivers without attending provider's authorization"
+        }]
+    },
+    "code": {
+        "text": "test"
+    },
+    "effectiveDateTime": "2010-07-14T16:32:51.42+01:00",
+    "issued": "2010-01-13T15:29:50.3+00:00",
+    "comment": "1.This is a line of \"text\" with a line break at the end.\n2."
+}