NIAD-3132 Populate the "no disclosure to patient" label for Encounter

CHANGELOG.md

@@ -5,6 +5,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 
 ## [Unreleased]
 
+## Added
+* The EncounterMapper has been enhanced to support the redaction fix. If an Encounter record includes a confidentialityCode, 
+  the meta.security field of the corresponding FHIR resource will now be [appropriately populated][nopat-docs].
+
 ## [3.0.1] - 2024-07-12
 
 ### Added

gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/AllergyIntoleranceMapper.java

@@ -10,7 +10,6 @@
 import static uk.nhs.adaptors.pss.translator.util.ParticipantReferenceUtil.fetchRecorderAndAsserter;
 import static uk.nhs.adaptors.pss.translator.util.ParticipantReferenceUtil.getParticipantReference;
 import static uk.nhs.adaptors.pss.translator.util.ResourceUtil.buildIdentifier;
-import static uk.nhs.adaptors.pss.translator.util.ResourceUtil.generateMeta;
 
 import java.util.List;
 import java.util.Objects;
@@ -39,9 +38,9 @@
 import org.springframework.stereotype.Service;
 
 import lombok.RequiredArgsConstructor;
+import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 import uk.nhs.adaptors.pss.translator.util.DegradedCodeableConcepts;
 import uk.nhs.adaptors.pss.translator.util.ResourceFilterUtil;
-import uk.nhs.adaptors.pss.translator.util.builder.MetaBuilder;
 
 @Service
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
@@ -59,6 +58,7 @@ public class AllergyIntoleranceMapper extends AbstractMapper<AllergyIntolerance>
     public static final String RECORDER = "recorder";
 
     private final CodeableConceptMapper codeableConceptMapper;
+    private final ConfidentialityService confidentialityService;
 
     @Override
     public List<AllergyIntolerance> mapResources(RCMRMT030101UKEhrExtract ehrExtract, Patient patient, List<Encounter> encounters,
@@ -90,12 +90,11 @@ private AllergyIntolerance mapAllergyIntolerance(RCMRMT030101UKEhrComposition eh
                 .getId()
                 .getRoot();
 
-        final Meta meta = new MetaBuilder()
-            .withInitialMeta(() -> generateMeta(META_PROFILE))
-            .withSecurityIfConfidentialityCodesPresent(
-                ehrComposition.getConfidentialityCode(),
-                observationStatement.getConfidentialityCode()
-            ).build();
+        final Meta meta = confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            observationStatement.getConfidentialityCode()
+        );
 
         allergyIntolerance
             .addCategory(getCategory(compoundStatement))

gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/EncounterMapper.java

@@ -1,7 +1,6 @@
 package uk.nhs.adaptors.pss.translator.mapper;
 
 import static uk.nhs.adaptors.pss.translator.util.ResourceUtil.buildIdentifier;
-import static uk.nhs.adaptors.pss.translator.util.ResourceUtil.generateMeta;
 
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -22,6 +21,7 @@
 import org.hl7.fhir.dstu3.model.ListResource;
 import org.hl7.fhir.dstu3.model.ListResource.ListEntryComponent;
 import org.hl7.fhir.dstu3.model.Location;
+import org.hl7.fhir.dstu3.model.Meta;
 import org.hl7.fhir.dstu3.model.Patient;
 import org.hl7.fhir.dstu3.model.Period;
 import org.hl7.fhir.dstu3.model.Reference;
@@ -46,9 +46,11 @@
 import org.springframework.util.CollectionUtils;
 
 import lombok.RequiredArgsConstructor;
+import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 import uk.nhs.adaptors.pss.translator.util.DateFormatUtil;
 import uk.nhs.adaptors.pss.translator.util.DegradedCodeableConcepts;
 import uk.nhs.adaptors.pss.translator.util.ResourceReferenceUtil;
+
 import static uk.nhs.adaptors.common.util.CodeableConceptUtils.createCodeableConcept;
 
 @Service
@@ -78,6 +80,7 @@ public class EncounterMapper {
     private final CodeableConceptMapper codeableConceptMapper;
     private final ConsultationListMapper consultationListMapper;
     private final ResourceReferenceUtil resourceReferenceUtil;
+    private final ConfidentialityService confidentialityService;
 
     public Map<String, List<? extends DomainResource>> mapEncounters(
             RCMRMT030101UKEhrExtract ehrExtract,
@@ -287,14 +290,20 @@ private Encounter mapToEncounter(
         var id = ehrComposition.getId().getRoot();
 
         var encounter = new Encounter();
+
+        final Meta meta = confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            ENCOUNTER_META_PROFILE,
+            ehrComposition.getConfidentialityCode()
+        );
+
         encounter
             .setParticipant(getParticipants(ehrComposition.getAuthor(), ehrComposition.getParticipant2()))
             .setStatus(EncounterStatus.FINISHED)
             .setSubject(new Reference(patient))
             .setType(getType(ehrComposition.getCode()))
             .setPeriod(getPeriod(ehrComposition))
             .addIdentifier(buildIdentifier(id, practiseCode))
-            .setMeta(generateMeta(ENCOUNTER_META_PROFILE))
+            .setMeta(meta)
             .setId(id);
 
         setEncounterLocation(encounter, ehrComposition, entryLocations);

gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/ConfidentialityService.java

@@ -0,0 +1,31 @@
+package uk.nhs.adaptors.pss.translator.service;
+
+import org.hl7.fhir.dstu3.model.Coding;
+import org.hl7.fhir.dstu3.model.Meta;
+import org.hl7.v3.CV;
+import org.springframework.stereotype.Service;
+
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.Optional;
+
+import static uk.nhs.adaptors.pss.translator.util.ResourceUtil.generateMeta;
+
+@Service
+public class ConfidentialityService {
+    private static final Coding CONFIDENTIALITY_CODING = new Coding()
+        .setSystem("http://hl7.org/fhir/v3/ActCode")
+        .setCode("NOPAT")
+        .setDisplay("no disclosure to patient, family or caregivers without attending provider's authorization");
+
+    @SafeVarargs
+    public final Meta createMetaAndAddSecurityIfConfidentialityCodesPresent(String metaProfile, Optional<CV>... cvs) {
+        return Arrays.stream(cvs).flatMap(Optional::stream).anyMatch(this::isNopat)
+            ? generateMeta(metaProfile).setSecurity(Collections.singletonList(CONFIDENTIALITY_CODING))
+            : generateMeta(metaProfile);
+    }
+
+    private boolean isNopat(CV coding) {
+        return coding.getCode().equals("NOPAT");
+    }
+}

gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/MetaFactory.java

@@ -0,0 +1,39 @@
+package uk.nhs.adaptors.pss.translator;
+
+import org.hl7.fhir.dstu3.model.Coding;
+import org.hl7.fhir.dstu3.model.Meta;
+import org.hl7.fhir.dstu3.model.UriType;
+
+import java.util.Collections;
+
+public final class MetaFactory {
+    private MetaFactory() { }
+    private static final Coding NOPAT_CODING = new Coding()
+        .setSystem("http://hl7.org/fhir/v3/ActCode")
+        .setCode("NOPAT")
+        .setDisplay("no disclosure to patient, family or caregivers without attending provider's authorization");
+
+    public static Meta getMetaFor(final MetaType metaType, final String profile) {
+        return switch (metaType) {
+            case META_WITHOUT_SECURITY -> getBaseMeta(profile);
+            case META_WITH_SECURITY -> getMetaWithSecurity(profile);
+        };
+    }
+
+    private static Meta getBaseMeta(final String profile) {
+        return new Meta().setProfile(
+            Collections.singletonList(
+                new UriType(profile)
+            )
+        );
+    }
+
+    private static Meta getMetaWithSecurity(final String profile) {
+        return getBaseMeta(profile).addSecurity(NOPAT_CODING);
+    }
+
+    public enum MetaType {
+        META_WITH_SECURITY,
+        META_WITHOUT_SECURITY
+    }
+}

gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/TestUtility.java

@@ -0,0 +1,17 @@
+package uk.nhs.adaptors.pss.translator;
+
+import org.hl7.v3.RCMRMT030101UKEhrComposition;
+import org.hl7.v3.RCMRMT030101UKEhrExtract;
+
+import java.util.function.Function;
+
+public final class TestUtility {
+    private TestUtility() { }
+
+    public static final Function<RCMRMT030101UKEhrExtract, RCMRMT030101UKEhrComposition> GET_EHR_COMPOSITION =
+        extract -> extract
+            .getComponent().get(0)
+            .getEhrFolder()
+            .getComponent().get(0)
+            .getEhrComposition();
+}