From 80b1f2076fe2ee9346a7f2d4ae1ddfb4451a078a Mon Sep 17 00:00:00 2001
From: hospel <12736698+ole4ryb@users.noreply.github.com>
Date: Tue, 6 Aug 2024 09:17:03 +0100
Subject: [PATCH 01/13] initial changes

---
 .../translator/mapper/ConditionMapperIT.java  |  1 -
 .../translator/mapper/ObservationMapper.java  | 58 +++++++++----
 .../mapper/ObservationMapperTest.java         | 86 +++++++++++++++++--
 3 files changed, 121 insertions(+), 24 deletions(-)

diff --git a/gp2gp-translator/src/integrationTest/java/uk/nhs/adaptors/pss/translator/mapper/ConditionMapperIT.java b/gp2gp-translator/src/integrationTest/java/uk/nhs/adaptors/pss/translator/mapper/ConditionMapperIT.java
index c37a7021f..ab195721d 100644
--- a/gp2gp-translator/src/integrationTest/java/uk/nhs/adaptors/pss/translator/mapper/ConditionMapperIT.java
+++ b/gp2gp-translator/src/integrationTest/java/uk/nhs/adaptors/pss/translator/mapper/ConditionMapperIT.java
@@ -80,7 +80,6 @@ public static Stream<Arguments> ehrExtractsWithAllergyIntoleranceActualProblemCo
             Arguments.of("linkset-problem-allergy-in-category.xml"),
             Arguments.of("linkset-problem-allergy-flat.xml"),
             Arguments.of("linkset-problem-allergy-in-topic.xml")
-
         );
     }
 
diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
index 687b5a05d..a29e01282 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
@@ -8,6 +8,7 @@
 import org.hl7.fhir.dstu3.model.CodeableConcept;
 import org.hl7.fhir.dstu3.model.DateTimeType;
 import org.hl7.fhir.dstu3.model.Encounter;
+import org.hl7.fhir.dstu3.model.Meta;
 import org.hl7.fhir.dstu3.model.Observation;
 import org.hl7.fhir.dstu3.model.Patient;
 import org.hl7.fhir.dstu3.model.Period;
@@ -24,8 +25,10 @@
 import org.hl7.v3.RCMRMT030101UKPertinentInformation02;
 import org.hl7.v3.RCMRMT030101UKRequestStatement;
 import org.hl7.v3.RCMRMT030101UKSubject;
+import org.jetbrains.annotations.NotNull;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 import uk.nhs.adaptors.pss.translator.util.DatabaseImmunizationChecker;
 import uk.nhs.adaptors.pss.translator.util.DegradedCodeableConcepts;
 
@@ -66,6 +69,7 @@ public class ObservationMapper extends AbstractMapper<Observation> {
 
     private final CodeableConceptMapper codeableConceptMapper;
     private final DatabaseImmunizationChecker immunizationChecker;
+    private final ConfidentialityService confidentialityService;
 
     public List<Observation> mapResources(RCMRMT030101UKEhrExtract ehrExtract, Patient patient, List<Encounter> encounters,
                                           String practiseCode) {
@@ -93,12 +97,35 @@ public List<Observation> mapResources(RCMRMT030101UKEhrExtract ehrExtract, Patie
     }
 
     private Observation mapObservation(RCMRMT030101UKEhrComposition ehrComposition,
-                                       RCMRMT030101UKObservationStatement observationStatement, Patient patient, List<Encounter> encounters,
+                                       RCMRMT030101UKObservationStatement observationStatement,
+                                       Patient patient,
+                                       List<Encounter> encounters,
                                        String practiseCode) {
 
         var id = observationStatement.getId().getRoot();
+        var meta = confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            observationStatement.getConfidentialityCode());
 
-        Observation observation = new Observation()
+        var observation = buildBaseObservation(ehrComposition, observationStatement, patient, practiseCode, id, meta);
+
+        addContextToObservation(observation, encounters, ehrComposition);
+        addValue(observation, getValueQuantity(observationStatement.getValue(), observationStatement.getUncertaintyCode()),
+            getValueString(observationStatement.getValue()));
+        addEffective(observation,
+            getEffective(observationStatement.getEffectiveTime(), observationStatement.getAvailabilityTime()));
+
+        return observation;
+    }
+
+    private @NotNull Observation buildBaseObservation(RCMRMT030101UKEhrComposition ehrComposition,
+                                                RCMRMT030101UKObservationStatement observationStatement,
+                                                Patient patient,
+                                                String practiseCode,
+                                                String id,
+                                                Meta meta) {
+        var observation = new Observation()
             .setStatus(FINAL)
             .addIdentifier(buildIdentifier(id, practiseCode))
             .setCode(getCode(observationStatement.getCode()))
@@ -106,25 +133,19 @@ private Observation mapObservation(RCMRMT030101UKEhrComposition ehrComposition,
             .addPerformer(getParticipantReference(observationStatement.getParticipant(), ehrComposition))
             .setInterpretation(getInterpretation(observationStatement.getInterpretationCode()))
             .setComment(getComment(
-                    observationStatement.getPertinentInformation(),
-                    observationStatement.getSubject(),
-                    observationStatement.getCode(),
-                    Optional.of(Optional.ofNullable(observationStatement.getCode())
+                observationStatement.getPertinentInformation(),
+                observationStatement.getSubject(),
+                observationStatement.getCode(),
+                Optional.of(Optional.ofNullable(observationStatement.getCode())
                             .map(CD::getQualifier)
                             .orElse(Collections.emptyList()))
             ))
             .setReferenceRange(getReferenceRange(observationStatement.getReferenceRange()))
-            .setSubject(new Reference(patient));
-        observation.setId(id);
-        observation.setMeta(generateMeta(META_PROFILE));
-
-        addContextToObservation(observation, encounters, ehrComposition);
-        addValue(observation, getValueQuantity(observationStatement.getValue(), observationStatement.getUncertaintyCode()),
-            getValueString(observationStatement.getValue()));
-        addEffective(observation,
-            getEffective(observationStatement.getEffectiveTime(), observationStatement.getAvailabilityTime()));
+            .setSubject(new Reference(patient))
+            .setMeta(meta)
+            .setId(id);
 
-        return observation;
+        return (Observation) observation;
     }
 
     private Observation mapObservationFromRequestStatement(RCMRMT030101UKEhrComposition ehrComposition,
@@ -132,6 +153,11 @@ private Observation mapObservationFromRequestStatement(RCMRMT030101UKEhrComposit
                                                            List<Encounter> encounters, String practiseCode) {
 
         var id = requestStatement.getId().get(0).getRoot();
+        var meta = confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            requestStatement.getConfidentialityCode());
+
 
         Observation observation = new Observation()
                 .setStatus(FINAL)
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
index a3389073d..a913b643c 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
@@ -1,11 +1,15 @@
 package uk.nhs.adaptors.pss.translator.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 import static org.springframework.util.ResourceUtils.getFile;
 
+import static uk.nhs.adaptors.pss.translator.MetaFactory.MetaType.META_WITH_SECURITY;
 import static uk.nhs.adaptors.pss.translator.util.XmlUnmarshallUtil.unmarshallFile;
 
 import java.math.BigDecimal;
@@ -15,14 +19,17 @@
 import org.hl7.fhir.dstu3.model.CodeableConcept;
 import org.hl7.fhir.dstu3.model.DateTimeType;
 import org.hl7.fhir.dstu3.model.Encounter;
+import org.hl7.fhir.dstu3.model.Meta;
 import org.hl7.fhir.dstu3.model.Observation;
 import org.hl7.fhir.dstu3.model.Observation.ObservationStatus;
 import org.hl7.fhir.dstu3.model.Patient;
 import org.hl7.fhir.dstu3.model.Period;
 import org.hl7.fhir.dstu3.model.Quantity;
 import org.hl7.fhir.dstu3.model.StringType;
+import org.hl7.v3.RCMRMT030101UKEhrComposition;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
 
+import org.hl7.v3.RCMRMT030101UKObservationStatement;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.mockito.InjectMocks;
@@ -30,6 +37,8 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import lombok.SneakyThrows;
+import uk.nhs.adaptors.pss.translator.MetaFactory;
+import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 import uk.nhs.adaptors.pss.translator.util.DatabaseImmunizationChecker;
 import uk.nhs.adaptors.pss.translator.util.DegradedCodeableConcepts;
 
@@ -40,7 +49,6 @@ public class ObservationMapperTest {
 
     private static final String XML_RESOURCES_BASE = "xml/Observation/";
     private static final String EXAMPLE_ID = "263B2A9F-0B1D-4697-943A-328F70E068DE";
-    private static final String META_PROFILE = "https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-Observation-1";
     private static final String PRACTISE_CODE = "TESTPRACTISECODE";
     private static final String IDENTIFIER_SYSTEM = "https://PSSAdaptor/TESTPRACTISECODE";
     private static final String INTERPRETATION_SYSTEM = "http://hl7.org/fhir/v2/0078";
@@ -67,10 +75,15 @@ public class ObservationMapperTest {
             "{Episodicity : code=255217005, displayName=First}";
     private static final String EPISODICITY_WITH_ORIGINAL_TEXT_NOTE_TEXT_WITH_ORIGINAL_TEXT =
             "{Episodicity : code=303350001, displayName=Ongoing, originalText=Review}";
+    private static final String META_PROFILE = "Observation-1";
+    private static final Meta META = MetaFactory.getMetaFor(META_WITH_SECURITY, META_PROFILE);
 
     @Mock
     private CodeableConceptMapper codeableConceptMapper;
 
+    @Mock
+    private ConfidentialityService confidentialityService;
+
     @Mock
     private DatabaseImmunizationChecker immunizationChecker;
 
@@ -83,6 +96,15 @@ public class ObservationMapperTest {
     @Test
     public void mapObservationWithValidData() {
         var ehrExtract = unmarshallEhrExtractElement("full_valid_data_observation_example.xml");
+        var ehrComposition = getEhrComposition(ehrExtract);
+        var observationStatement = getObservationStatement(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            observationStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
 
         assertFixedValues(observation);
@@ -98,7 +120,7 @@ public void mapObservationWithValidData() {
         assertThat(observation.getReferenceRange().get(0).getText()).isEqualTo("Age and sex based");
         assertQuantity(observation.getReferenceRange().get(0).getLow(), REFERENCE_RANGE_LOW_VALUE, "liter", "L");
         assertQuantity(observation.getReferenceRange().get(0).getHigh(), REFERENCE_RANGE_HIGH_VALUE, "liter", "L");
-        assertThat(observation.hasSubject()).isTrue();
+        assertTrue(observation.hasSubject());
     }
 
     /**
@@ -108,6 +130,15 @@ public void mapObservationWithValidData() {
     @Test
     public void mapObservationWithEpisodicity() {
         var ehrExtract = unmarshallEhrExtractElement("data_observation_with_episodicity.xml");
+        var ehrComposition = getEhrComposition(ehrExtract);
+        var observationStatement = getObservationStatement(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            observationStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
 
         assertFixedValues(observation);
@@ -120,6 +151,15 @@ public void mapObservationWithEpisodicity() {
     @Test
     public void mapObservationWithEpisodicityWithOriginalText() {
         var ehrExtract = unmarshallEhrExtractElement("data_observation_with_episodicity_with_original_text.xml");
+        var ehrComposition = getEhrComposition(ehrExtract);
+        var observationStatement = getObservationStatement(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            observationStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
 
         assertFixedValues(observation);
@@ -128,6 +168,15 @@ public void mapObservationWithEpisodicityWithOriginalText() {
     @Test
     public void mapObservationWithEpisodicityWithOriginalTextAndExistingComment() {
         var ehrExtract = unmarshallEhrExtractElement("data_observation_with_episodicity_with_existing_comment.xml");
+        var ehrComposition = getEhrComposition(ehrExtract);
+        var observationStatement = getObservationStatement(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            observationStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
 
         assertFixedValues(observation);
@@ -153,8 +202,17 @@ public void mappingObservationWhichIsBloodPressureExpectObservationNotMapped() {
 
     @Test
     public void mapObservationWithNoOptionalData() {
-        //when(codeableConceptMapper.mapToCodeableConcept(any())).thenReturn(CODEABLE_CONCEPT);
+
         var ehrExtract = unmarshallEhrExtractElement("no_optional_data_observation_example.xml");
+        var ehrComposition = getEhrComposition(ehrExtract);
+        var observationStatement = getObservationStatement(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            observationStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
 
         assertFixedValues(observation);
@@ -162,10 +220,10 @@ public void mapObservationWithNoOptionalData() {
         //assertThat(observation.getCode().getCodingFirstRep().getDisplay()).isEqualTo(CODING_DISPLAY_MOCK);
         assertThat(observation.getIssuedElement().asStringValue()).isEqualTo(ISSUED_EHR_COMPOSITION_EXAMPLE);
         assertThat(observation.getPerformer().get(0).getReference()).isEqualTo(PPRF_PARTICIPANT_ID);
-        assertThat(observation.getEffective()).isNull();
-        assertThat(observation.getValue()).isNull();
+        assertNull(observation.getEffective());
+        assertNull(observation.getValue());
         assertThat(observation.getInterpretation().getCoding()).isEmpty();
-        assertThat(observation.getComment()).isNull();
+        assertNull(observation.getComment());
         assertThat(observation.getReferenceRange()).isEmpty();
     }
 
@@ -200,7 +258,7 @@ public void mapObservationWithCompositionIdMatchingEncounter() {
         var ehrExtract = unmarshallEhrExtractElement("ehr_composition_id_matching_encounter_observation_example.xml");
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
 
-        assertThat(observation.hasContext()).isTrue();
+        assertTrue(observation.hasContext());
     }
 
     @Test
@@ -364,6 +422,20 @@ private void assertQuantity(Quantity quantity, BigDecimal value, String unit, St
         assertThat(quantity.getCode()).isEqualTo(code);
     }
 
+    private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract ehrExtract) {
+
+        return ehrExtract.getComponent().get(0)
+            .getEhrFolder().getComponent().get(0)
+            .getEhrComposition();
+    }
+
+    private RCMRMT030101UKObservationStatement getObservationStatement(RCMRMT030101UKEhrExtract ehrExtract) {
+        return ehrExtract.getComponent().get(0)
+            .getEhrFolder().getComponent().get(0)
+            .getEhrComposition().getComponent().get(0)
+            .getObservationStatement();
+    }
+
     @SneakyThrows
     private RCMRMT030101UKEhrExtract unmarshallEhrExtractElement(String fileName) {
         return unmarshallFile(getFile("classpath:" + XML_RESOURCES_BASE + fileName), RCMRMT030101UKEhrExtract.class);

From 1d89d54b8db70c525a60eea1ea61198dd2a62cf8 Mon Sep 17 00:00:00 2001
From: hospel <12736698+ole4ryb@users.noreply.github.com>
Date: Tue, 6 Aug 2024 16:16:13 +0100
Subject: [PATCH 02/13] adding tests

---
 .../translator/mapper/ObservationMapper.java  |  2 +-
 .../mapper/ObservationMapperTest.java         | 66 ++++++++++++++++++-
 2 files changed, 65 insertions(+), 3 deletions(-)

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
index a29e01282..7e29c4f7e 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
@@ -170,7 +170,7 @@ private Observation mapObservationFromRequestStatement(RCMRMT030101UKEhrComposit
                 .setComponent(createComponentList(requestStatement));
 
         observation.setId(id);
-        observation.setMeta(generateMeta(META_PROFILE));
+        observation.setMeta(meta);
 
         addContextToObservation(observation, encounters, ehrComposition);
         addEffective(observation,
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
index a913b643c..6768bf127 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
@@ -1,7 +1,7 @@
 package uk.nhs.adaptors.pss.translator.mapper;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 import static org.mockito.ArgumentMatchers.any;
@@ -14,9 +14,11 @@
 
 import java.math.BigDecimal;
 import java.util.List;
+import java.util.Optional;
 
 import org.apache.commons.lang3.StringUtils;
 import org.hl7.fhir.dstu3.model.CodeableConcept;
+import org.hl7.fhir.dstu3.model.Coding;
 import org.hl7.fhir.dstu3.model.DateTimeType;
 import org.hl7.fhir.dstu3.model.Encounter;
 import org.hl7.fhir.dstu3.model.Meta;
@@ -26,6 +28,8 @@
 import org.hl7.fhir.dstu3.model.Period;
 import org.hl7.fhir.dstu3.model.Quantity;
 import org.hl7.fhir.dstu3.model.StringType;
+import org.hl7.fhir.dstu3.model.UriType;
+import org.hl7.v3.CV;
 import org.hl7.v3.RCMRMT030101UKEhrComposition;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
 
@@ -38,6 +42,7 @@
 
 import lombok.SneakyThrows;
 import uk.nhs.adaptors.pss.translator.MetaFactory;
+import uk.nhs.adaptors.pss.translator.TestUtility;
 import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 import uk.nhs.adaptors.pss.translator.util.DatabaseImmunizationChecker;
 import uk.nhs.adaptors.pss.translator.util.DegradedCodeableConcepts;
@@ -77,6 +82,10 @@ public class ObservationMapperTest {
             "{Episodicity : code=303350001, displayName=Ongoing, originalText=Review}";
     private static final String META_PROFILE = "Observation-1";
     private static final Meta META = MetaFactory.getMetaFor(META_WITH_SECURITY, META_PROFILE);
+    private static final CV NOPAT_CV = TestUtility.createCv(
+        "NOPAT",
+        "http://hl7.org/fhir/v3/ActCode",
+        "no disclosure to patient, family or caregivers without attending provider's authorization");
 
     @Mock
     private CodeableConceptMapper codeableConceptMapper;
@@ -93,6 +102,45 @@ public class ObservationMapperTest {
     @InjectMocks
     private ObservationMapper observationMapper;
 
+    @Test
+    public void mapObservationMetaSecurityWithNoPatWhenConfidentialityCodeIsPresentForObservationStatementAndEhrComposition() {
+        var ehrExtract = unmarshallEhrExtractElement("full_valid_data_observation_example.xml");
+
+        var ehrComposition = getEhrComposition(ehrExtract);
+        var observationStatement = getObservationStatement(ehrExtract);
+
+        observationStatement.setConfidentialityCode(NOPAT_CV);
+        ehrComposition.setConfidentialityCode(NOPAT_CV);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            observationStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
+        var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
+
+        assertMetaSecurityIsPresent(observation.getMeta());
+    }
+
+    @Test
+    public void mapObservationMetaSecurityWithNoPatWhenConfidentialityCodeIsPresentOnlyForEhrComposition() {
+        var ehrExtract = unmarshallEhrExtractElement("full_valid_data_observation_example.xml");
+
+        var ehrComposition = getEhrComposition(ehrExtract);
+        ehrComposition.setConfidentialityCode(NOPAT_CV);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            Optional.empty()
+        )).thenReturn(META);
+
+        var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
+
+        assertMetaSecurityIsPresent(observation.getMeta());
+    }
+
     @Test
     public void mapObservationWithValidData() {
         var ehrExtract = unmarshallEhrExtractElement("full_valid_data_observation_example.xml");
@@ -217,7 +265,6 @@ public void mapObservationWithNoOptionalData() {
 
         assertFixedValues(observation);
         assertThat(observation.getId()).isEqualTo(EXAMPLE_ID);
-        //assertThat(observation.getCode().getCodingFirstRep().getDisplay()).isEqualTo(CODING_DISPLAY_MOCK);
         assertThat(observation.getIssuedElement().asStringValue()).isEqualTo(ISSUED_EHR_COMPOSITION_EXAMPLE);
         assertThat(observation.getPerformer().get(0).getReference()).isEqualTo(PPRF_PARTICIPANT_ID);
         assertNull(observation.getEffective());
@@ -422,6 +469,21 @@ private void assertQuantity(Quantity quantity, BigDecimal value, String unit, St
         assertThat(quantity.getCode()).isEqualTo(code);
     }
 
+    private void assertMetaSecurityIsPresent(final Meta meta) {
+        final List<Coding> metaSecurity = meta.getSecurity();
+        final int metaSecuritySize = metaSecurity.size();
+        final Coding metaSecurityCoding = metaSecurity.get(0);
+        final UriType metaProfile = meta.getProfile().get(0);
+
+        assertAll(
+            () -> assertThat(metaSecuritySize).isEqualTo(1),
+            () -> assertThat(metaProfile.getValue()).isEqualTo(META_PROFILE),
+            () -> assertThat(metaSecurityCoding.getCode()).isEqualTo(NOPAT_CV.getCode()),
+            () -> assertThat(metaSecurityCoding.getDisplay()).isEqualTo(NOPAT_CV.getDisplayName()),
+            () -> assertThat(metaSecurityCoding.getSystem()).isEqualTo(NOPAT_CV.getCodeSystem())
+                 );
+    }
+
     private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract ehrExtract) {
 
         return ehrExtract.getComponent().get(0)

From ea71f86332b91fd022cb3f49d07828e4a7303ec9 Mon Sep 17 00:00:00 2001
From: hospel <12736698+ole4ryb@users.noreply.github.com>
Date: Wed, 7 Aug 2024 17:02:26 +0100
Subject: [PATCH 03/13] nopat for specimen and adding tests

---
 .../translator/mapper/ObservationMapper.java  |   1 -
 .../SpecimenCompoundsMapper.java              |  63 +++++++---
 .../diagnosticreport/SpecimenMapper.java      |  45 +++++--
 .../service/BundleMapperService.java          |   7 +-
 .../mapper/ObservationMapperTest.java         |   2 +-
 .../SpecimenCompoundsMapperTest.java          | 102 +++++++++++++++-
 .../diagnosticreport/SpecimenMapperTest.java  | 111 +++++++++++++++++-
 ...en_valid_with_nopat_compound_statement.xml |  53 +++++++++
 ...cimen_valid_with_nopat_ehr_composition.xml |  53 +++++++++
 ...n_ehr_composition_with_nopat_conf_code.xml |  82 +++++++++++++
 ...rvation_statement_with_nopat_conf_code.xml |  82 +++++++++++++
 11 files changed, 567 insertions(+), 34 deletions(-)
 create mode 100644 gp2gp-translator/src/test/resources/xml/Specimen/specimen_valid_with_nopat_compound_statement.xml
 create mode 100644 gp2gp-translator/src/test/resources/xml/Specimen/specimen_valid_with_nopat_ehr_composition.xml
 create mode 100644 gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_ehr_composition_with_nopat_conf_code.xml
 create mode 100644 gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_observation_statement_with_nopat_conf_code.xml

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
index 7e29c4f7e..4b3971abd 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
@@ -53,7 +53,6 @@
 import static uk.nhs.adaptors.pss.translator.util.ObservationUtil.getValueQuantity;
 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 static uk.nhs.adaptors.pss.translator.util.ResourceUtil.addContextToObservation;
 
 @Service
diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
index c8283b14a..512799c5b 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
@@ -33,6 +33,7 @@
 
 import lombok.RequiredArgsConstructor;
 import uk.nhs.adaptors.pss.translator.mapper.diagnosticreport.SpecimenBatteryMapper.SpecimenBatteryParameters;
+import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 import uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors;
 import uk.nhs.adaptors.pss.translator.util.DateFormatUtil;
 
@@ -49,8 +50,10 @@ public class SpecimenCompoundsMapper {
     public static final String CODING_CODE = "laboratory";
     public static final String CODING_SYSTEM = "http://hl7.org/fhir/observation-category";
     public static final String CODING_DISPLAY = "Laboratory";
+    private static final String META_PROFILE = "SpecimenCompounds-1";
 
     private final SpecimenBatteryMapper batteryMapper;
+    private final ConfidentialityService confidentialityService;
 
     public List<Observation> handleSpecimenChildComponents(
         RCMRMT030101UKEhrExtract ehrExtract,
@@ -59,8 +62,8 @@ public List<Observation> handleSpecimenChildComponents(
         List<DiagnosticReport> diagnosticReports,
         Patient patient,
         List<Encounter> encounters,
-        String practiseCode
-    ) {
+        String practiseCode) {
+
         final List<Observation> batteryObservations = new ArrayList<>();
 
         for (var diagnosticReport : diagnosticReports) {
@@ -69,14 +72,17 @@ public List<Observation> handleSpecimenChildComponents(
                 continue;
             }
 
+            var currentEhrComposition = getCurrentEhrComposition(ehrExtract, diagnosticReportCompoundStatement.orElseThrow());
+
             for (var specimenCompoundStatement : getSpecimenCompoundStatements(diagnosticReportCompoundStatement.get())) {
-                handleSpecimenObservationStatement(observations, diagnosticReport, specimenCompoundStatement);
+                handleSpecimenObservationStatement(currentEhrComposition, observations, diagnosticReport, specimenCompoundStatement);
 
                 var nestedSpecimenCompoundStatements = getNestedSpecimenCompoundStatements(specimenCompoundStatement);
 
                 for (var nestedSpecimenCompoundStatement : nestedSpecimenCompoundStatements) {
                     if (CLUSTER_CLASSCODE.equals(nestedSpecimenCompoundStatement.getClassCode().get(0))) {
                         handleClusterCompoundStatement(
+                            currentEhrComposition,
                             specimenCompoundStatement,
                             nestedSpecimenCompoundStatement,
                             observations,
@@ -88,6 +94,7 @@ public List<Observation> handleSpecimenChildComponents(
 
                     if (BATTERY_CLASSCODE.equals(nestedSpecimenCompoundStatement.getClassCode().get(0))) {
                         handleBatteryCompoundStatement(
+                            currentEhrComposition,
                             specimenCompoundStatement,
                             nestedSpecimenCompoundStatement,
                             observations,
@@ -99,7 +106,7 @@ public List<Observation> handleSpecimenChildComponents(
                             .ehrExtract(ehrExtract)
                             .batteryCompoundStatement(nestedSpecimenCompoundStatement)
                             .specimenCompoundStatement(specimenCompoundStatement)
-                            .ehrComposition(getCurrentEhrComposition(ehrExtract, diagnosticReportCompoundStatement.orElseThrow()))
+                            .ehrComposition(currentEhrComposition)
                             .diagnosticReport(diagnosticReport)
                             .patient(patient)
                             .encounters(encounters)
@@ -118,8 +125,8 @@ public List<Observation> handleSpecimenChildComponents(
     }
 
     private static @NotNull List<RCMRMT030101UKCompoundStatement> getNestedSpecimenCompoundStatements(
-        RCMRMT030101UKCompoundStatement specimenCompoundStatement
-    ) {
+        RCMRMT030101UKCompoundStatement specimenCompoundStatement) {
+
         return specimenCompoundStatement.getComponent()
             .stream()
             .filter(RCMRMT030101UKComponent02::hasCompoundStatement)
@@ -129,20 +136,29 @@ public List<Observation> handleSpecimenChildComponents(
     }
 
     private void handleSpecimenObservationStatement(
+        RCMRMT030101UKEhrComposition ehrComposition,
         List<Observation> observations,
         DiagnosticReport diagnosticReport,
-        RCMRMT030101UKCompoundStatement specimenCompoundStatement
-    ) {
+        RCMRMT030101UKCompoundStatement specimenCompoundStatement) {
+
         getObservationStatementsInCompound(specimenCompoundStatement).forEach(specimenObservationStatement ->
             getObservationById(observations, specimenObservationStatement.getId().getRoot())
             .ifPresent(observation -> {
-                handleObservationStatement(specimenCompoundStatement, specimenObservationStatement, observation);
+                handleObservationStatement(ehrComposition, specimenCompoundStatement, specimenObservationStatement, observation);
                 DiagnosticReportMapper.addResultToDiagnosticReport(observation, diagnosticReport);
             }));
     }
 
-    private void handleObservationStatement(RCMRMT030101UKCompoundStatement specimenCompoundStatement,
-        RCMRMT030101UKObservationStatement observationStatement, Observation observation) {
+    private void handleObservationStatement(RCMRMT030101UKEhrComposition ehrComposition,
+                                              RCMRMT030101UKCompoundStatement specimenCompoundStatement,
+                                              RCMRMT030101UKObservationStatement observationStatement,
+                                              Observation observation) {
+
+        var meta = confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            specimenCompoundStatement.getConfidentialityCode());
+
         final Reference specimenReference = new Reference(new IdType(
             Specimen.name(),
             specimenCompoundStatement.getId().get(0).getRoot()
@@ -156,6 +172,7 @@ private void handleObservationStatement(RCMRMT030101UKCompoundStatement specimen
         }
         observation.setSpecimen(specimenReference);
         observation.addCategory(createCategory());
+        observation.setMeta(meta);
     }
 
     private void handleNarrativeStatements(RCMRMT030101UKCompoundStatement compoundStatement,
@@ -165,11 +182,17 @@ private void handleNarrativeStatements(RCMRMT030101UKCompoundStatement compoundS
 
         getNarrativeStatementsInCompound(compoundStatement).forEach(childNarrativeStatement -> {
 
+            var meta = confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+                META_PROFILE,
+                compoundStatement.getConfidentialityCode(),
+                childNarrativeStatement.getConfidentialityCode());
+
             if (childNarrativeStatement.getText().contains(USER_COMMENT_HEADER)) {
                 getObservationById(observationComments, childNarrativeStatement.getId().getRoot())
                     .ifPresent(observationComment -> {
                         observationComment.setEffective(null);
                         observationComment.setComment(extractPmipComment(observationComment.getComment()));
+                        observationComment.setMeta(meta);
                         createRelationship(observation, observationComment);
                     });
             } else if (observation != null) {
@@ -190,9 +213,11 @@ private void createRelationship(Observation observation, Observation observation
         }
     }
 
-    private void handleClusterCompoundStatement(RCMRMT030101UKCompoundStatement specimenCompoundStatement,
-        RCMRMT030101UKCompoundStatement clusterCompoundStatement,
-        List<Observation> observations, List<Observation> observationComments, DiagnosticReport diagnosticReport, boolean isNestedCluster) {
+    private void handleClusterCompoundStatement(RCMRMT030101UKEhrComposition ehrComposition,
+                                                RCMRMT030101UKCompoundStatement specimenCompoundStatement,
+                                                RCMRMT030101UKCompoundStatement clusterCompoundStatement,
+                                                List<Observation> observations, List<Observation> observationComments,
+                                                DiagnosticReport diagnosticReport, boolean isNestedCluster) {
 
         var nestedObservationStatements = clusterCompoundStatement.getComponent().stream()
             .filter(RCMRMT030101UKComponent02::hasObservationStatement)
@@ -206,14 +231,15 @@ private void handleClusterCompoundStatement(RCMRMT030101UKCompoundStatement spec
                 if (!isNestedCluster) {
                     DiagnosticReportMapper.addResultToDiagnosticReport(observation, diagnosticReport);
                 }
-                handleObservationStatement(specimenCompoundStatement, observationStatement, observation);
+                handleObservationStatement(ehrComposition, specimenCompoundStatement, observationStatement, observation);
             });
 
             handleNarrativeStatements(clusterCompoundStatement, observationComments, observationOpt.orElse(null));
         }
     }
 
-    private void handleBatteryCompoundStatement(RCMRMT030101UKCompoundStatement specimenCompoundStatement,
+    private void handleBatteryCompoundStatement(RCMRMT030101UKEhrComposition ehrComposition,
+                                                RCMRMT030101UKCompoundStatement specimenCompoundStatement,
                                                 RCMRMT030101UKCompoundStatement batteryCompoundStatement,
                                                 List<Observation> observations,
                                                 List<Observation> observationComments,
@@ -225,6 +251,7 @@ private void handleBatteryCompoundStatement(RCMRMT030101UKCompoundStatement spec
             .filter(compoundStatement -> CLUSTER_CLASSCODE.equals(compoundStatement.getClassCode().get(0)))
             .forEach(compoundStatement ->
                          handleClusterCompoundStatement(
+                             ehrComposition,
                              specimenCompoundStatement,
                              compoundStatement,
                              observations,
@@ -237,8 +264,8 @@ private void handleBatteryCompoundStatement(RCMRMT030101UKCompoundStatement spec
             .map(RCMRMT030101UKComponent02::getObservationStatement)
             .forEach(
                 observationStatement -> getObservationById(observations, observationStatement.getId().getRoot()).ifPresent(
-                    observation -> handleObservationStatement(specimenCompoundStatement, observationStatement, observation)));
-
+                    observation -> handleObservationStatement(ehrComposition, specimenCompoundStatement,
+                                                              observationStatement, observation)));
     }
 
     private Optional<RCMRMT030101UKCompoundStatement> getCompoundStatementByDRId(RCMRMT030101UKEhrExtract ehrExtract, String id) {
diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java
index 834ae0913..5f0bcfad9 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java
@@ -2,7 +2,6 @@
 
 import static uk.nhs.adaptors.pss.translator.util.CDUtil.extractSnomedCode;
 import static uk.nhs.adaptors.pss.translator.util.ResourceUtil.buildIdentifier;
-import static uk.nhs.adaptors.pss.translator.util.ResourceUtil.generateMeta;
 import static uk.nhs.adaptors.pss.translator.util.TextUtil.extractPmipComment;
 
 import java.util.List;
@@ -21,6 +20,8 @@
 import org.hl7.fhir.dstu3.model.Specimen;
 import org.hl7.fhir.dstu3.model.Specimen.SpecimenCollectionComponent;
 import org.hl7.v3.RCMRMT030101UKComponent02;
+import org.hl7.v3.RCMRMT030101UKComponent3;
+import org.hl7.v3.RCMRMT030101UKEhrComposition;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.hl7.v3.RCMRMT030101UKCompoundStatement;
 import org.hl7.v3.RCMRMT030101UKSpecimenRole;
@@ -29,6 +30,7 @@
 
 import lombok.RequiredArgsConstructor;
 import uk.nhs.adaptors.pss.translator.mapper.DateTimeMapper;
+import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 import uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors;
 
 @Service
@@ -38,6 +40,7 @@ public class SpecimenMapper {
     private static final String SPECIMEN_META_PROFILE_SUFFIX = "Specimen-1";
     private static final String REFERENCE_PREFIX = "Specimen/";
     private static final String SPECIMEN_CODE = "123038009";
+    private final ConfidentialityService confidentialityService;
 
     private final DateTimeMapper dateTimeMapper;
 
@@ -53,7 +56,10 @@ public List<Specimen> mapSpecimens(RCMRMT030101UKEhrExtract ehrExtract, List<Dia
             .map(RCMRMT030101UKComponent02::getCompoundStatement)
             .filter(Objects::nonNull)
             .distinct()
-            .map(childCompoundStatement -> createSpecimen(childCompoundStatement, patient, practiceCode))
+            .map(childCompoundStatement -> {
+                var currentEhrComposition = getEhrComposition(ehrExtract, childCompoundStatement);
+                return createSpecimen(currentEhrComposition, childCompoundStatement, patient, practiceCode);
+            })
             .toList();
     }
 
@@ -78,15 +84,24 @@ public List<Observation> removeSurplusObservationComments(RCMRMT030101UKEhrExtra
         return observationComments;
     }
 
-    private Specimen createSpecimen(RCMRMT030101UKCompoundStatement specimenCompoundStatement, Patient patient, String practiceCode) {
+    private Specimen createSpecimen(RCMRMT030101UKEhrComposition ehrComposition,
+                                    RCMRMT030101UKCompoundStatement specimenCompoundStatement,
+                                    Patient patient, String practiceCode) {
+
+        var meta = confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            SPECIMEN_META_PROFILE_SUFFIX,
+            ehrComposition.getConfidentialityCode(),
+            specimenCompoundStatement.getConfidentialityCode());
 
         Specimen specimen = new Specimen();
         final String id = specimenCompoundStatement.getId().get(0).getRoot();
-        specimen.setId(id);
-        specimen.setMeta(generateMeta(SPECIMEN_META_PROFILE_SUFFIX));
-        specimen.addIdentifier(buildIdentifier(id, practiceCode));
-        specimen.setSubject(new Reference(patient));
-        specimen.setNote(getNote(specimenCompoundStatement));
+
+        specimen.addIdentifier(buildIdentifier(id, practiceCode))
+                .setSubject(new Reference(patient))
+                .setNote(getNote(specimenCompoundStatement))
+                .setId(id)
+                .setMeta(meta);
+
         getAccessionIdentifier(specimenCompoundStatement).ifPresent(specimen::setAccessionIdentifier);
         getType(specimenCompoundStatement).ifPresent(specimen::setType);
         getCollectedDateTime(specimenCompoundStatement).ifPresent(specimen::setCollection);
@@ -182,4 +197,18 @@ private List<RCMRMT030101UKCompoundStatement> findAllSpecimenCompoundStatements(
             })
             .toList();
     }
+
+    private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract ehrExtract,
+                                                           RCMRMT030101UKCompoundStatement parentCompoundStatement) {
+
+        return ehrExtract.getComponent().get(0).getEhrFolder().getComponent()
+            .stream()
+            .filter(RCMRMT030101UKComponent3::hasEhrComposition)
+            .map(RCMRMT030101UKComponent3::getEhrComposition)
+            .filter(e -> e.getComponent()
+                        .stream()
+                        .flatMap(CompoundStatementResourceExtractors::extractAllCompoundStatements)
+                        .anyMatch(parentCompoundStatement::equals)
+                   ).findFirst().get();
+    }
 }
diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/BundleMapperService.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/BundleMapperService.java
index fefba2c8c..3662dc1c4 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/BundleMapperService.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/service/BundleMapperService.java
@@ -185,8 +185,8 @@ private void mapDiagnosticReports(Bundle bundle, RCMRMT030101UKEhrExtract ehrExt
 
     private List<Encounter> handleMappedEncounterResources(
             Map<String, List<? extends DomainResource>> mappedEncounterEhrCompositions,
-            Bundle bundle
-    ) {
+            Bundle bundle) {
+
         var encounters = (List<Encounter>) mappedEncounterEhrCompositions.get(ENCOUNTER_KEY);
         var consultations = (List<ListResource>) mappedEncounterEhrCompositions.get(CONSULTATION_KEY);
         var topics = (List<ListResource>) mappedEncounterEhrCompositions.get(TOPIC_KEY);
@@ -220,8 +220,7 @@ private List<Location> mapLocations(RCMRMT030101UKEhrFolder ehrFolder, String lo
                 .map(
                         ehrComposition -> locationMapper.mapToLocation(
                                 ehrComposition.getLocation(),
-                                losingPracticeOdsCode
-                        )
+                                losingPracticeOdsCode)
                 )
                 .collect(
                         Collectors.collectingAndThen(
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
index 6768bf127..ddaeb27c9 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
@@ -481,7 +481,7 @@ private void assertMetaSecurityIsPresent(final Meta meta) {
             () -> assertThat(metaSecurityCoding.getCode()).isEqualTo(NOPAT_CV.getCode()),
             () -> assertThat(metaSecurityCoding.getDisplay()).isEqualTo(NOPAT_CV.getDisplayName()),
             () -> assertThat(metaSecurityCoding.getSystem()).isEqualTo(NOPAT_CV.getCodeSystem())
-                 );
+        );
     }
 
     private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract ehrExtract) {
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
index b2ec73596..10eedc642 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
@@ -2,24 +2,34 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.mockito.AdditionalAnswers.answer;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 import static org.springframework.util.ResourceUtils.getFile;
+import static uk.nhs.adaptors.pss.translator.MetaFactory.MetaType.META_WITH_SECURITY;
 import static uk.nhs.adaptors.pss.translator.mapper.diagnosticreport.SpecimenBatteryMapper.SpecimenBatteryParameters;
 import static uk.nhs.adaptors.pss.translator.util.XmlUnmarshallUtil.unmarshallFile;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 
+import org.hl7.fhir.dstu3.model.Coding;
 import org.hl7.fhir.dstu3.model.DiagnosticReport;
 import org.hl7.fhir.dstu3.model.IdType;
+import org.hl7.fhir.dstu3.model.Meta;
 import org.hl7.fhir.dstu3.model.Observation;
 import org.hl7.fhir.dstu3.model.Patient;
 import org.hl7.fhir.dstu3.model.Reference;
 import org.hl7.fhir.dstu3.model.ResourceType;
+import org.hl7.fhir.dstu3.model.UriType;
+import org.hl7.v3.CV;
+import org.hl7.v3.RCMRMT030101UKCompoundStatement;
+import org.hl7.v3.RCMRMT030101UKEhrComposition;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -32,6 +42,9 @@
 
 import lombok.SneakyThrows;
 import org.mockito.stubbing.Answer1;
+import uk.nhs.adaptors.pss.translator.MetaFactory;
+import uk.nhs.adaptors.pss.translator.TestUtility;
+import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 
 @ExtendWith(MockitoExtension.class)
 @RunWith(MockitoJUnitRunner.class)
@@ -48,6 +61,12 @@ public class SpecimenCompoundsMapperTest {
     private static final String SPECIMEN_ID = "TEST_SPECIMEN_ID";
     private static final String TEST_COMMENT_LINE = "First comment Line";
     private static final String TEST_COMMENT_LINE_1 = "Test Comment";
+    private static final String META_PROFILE = "SpecimenCompounds-1";
+    private static final Meta META = MetaFactory.getMetaFor(META_WITH_SECURITY, META_PROFILE);
+    private static final CV NOPAT_CV = TestUtility.createCv(
+        "NOPAT",
+        "http://hl7.org/fhir/v3/ActCode",
+        "no disclosure to patient, family or caregivers without attending provider's authorization");
 
     private static final Patient PATIENT = (Patient) new Patient().setId("TEST_PATIENT_ID");
 
@@ -58,6 +77,9 @@ public class SpecimenCompoundsMapperTest {
     @Mock
     private SpecimenBatteryMapper specimenBatteryMapper;
 
+    @Mock
+    private ConfidentialityService confidentialityService;
+
     @InjectMocks
     private SpecimenCompoundsMapper specimenCompoundsMapper;
 
@@ -68,6 +90,54 @@ public void setup() {
         diagnosticReports = createDiagnosticReports();
     }
 
+    @Test
+    public void testHandlingNoPatCompoundStatementWithObservationStatement() {
+        final RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_observation_statement_with_nopat_conf_code.xml");
+        final var compoundStatement = getCompoundStatement(ehrExtract);
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            Optional.empty(),
+            compoundStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
+        specimenCompoundsMapper.handleSpecimenChildComponents(
+            ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE
+        );
+
+        assertParentSpecimenIsReferenced(observations.get(0));
+        assertThat(observations.get(0).getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
+        assertThat(diagnosticReports.get(0).getResult()).isNotEmpty();
+
+        final Reference result = diagnosticReports.get(0).getResult().get(0);
+
+        assertMetaSecurityIsPresent(observations.get(0).getMeta());
+        assertMetaSecurityIsPresent((Meta) result.getResource().getMeta());
+    }
+
+    @Test
+    public void testHandlingNoPatEhrCompositionWithObservationStatement() {
+        final RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_ehr_composition_with_nopat_conf_code.xml");
+        final var ehrComposition = getEhrComposition(ehrExtract);
+        final var compoundStatement = getCompoundStatement(ehrExtract);
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            compoundStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
+        specimenCompoundsMapper.handleSpecimenChildComponents(
+            ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE);
+
+        assertParentSpecimenIsReferenced(observations.get(0));
+        assertThat(observations.get(0).getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
+        assertThat(diagnosticReports.get(0).getResult()).isNotEmpty();
+
+        final Reference result = diagnosticReports.get(0).getResult().get(0);
+
+        assertMetaSecurityIsPresent(observations.get(0).getMeta());
+        assertMetaSecurityIsPresent((Meta) result.getResource().getMeta());
+    }
+
     @Test
     public void testHandlingFirstLevelObservationStatement() {
         final RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_observation_statement.xml");
@@ -80,7 +150,7 @@ public void testHandlingFirstLevelObservationStatement() {
         assertThat(diagnosticReports.get(0).getResult()).isNotEmpty();
 
         final Reference result = diagnosticReports.get(0).getResult().get(0);
-        assertThat(result.getResource()).isNotNull();
+        assertNotNull(result.getResource());
         assertThat(result.getResource().getIdElement().getValue()).isEqualTo(OBSERVATION_STATEMENT_ID);
     }
 
@@ -267,10 +337,40 @@ private String getReferenceId(Reference reference) {
             : reference.getResource().getIdElement().getValue();
     }
 
+    private void assertMetaSecurityIsPresent(final Meta meta) {
+        final List<Coding> metaSecurity = meta.getSecurity();
+        final int metaSecuritySize = metaSecurity.size();
+        final Coding metaSecurityCoding = metaSecurity.get(0);
+        final UriType metaProfile = meta.getProfile().get(0);
+
+        assertAll(
+            () -> assertThat(metaSecuritySize).isEqualTo(1),
+            () -> assertThat(metaProfile.getValue()).isEqualTo(META_PROFILE),
+            () -> assertThat(metaSecurityCoding.getCode()).isEqualTo(NOPAT_CV.getCode()),
+            () -> assertThat(metaSecurityCoding.getDisplay()).isEqualTo(NOPAT_CV.getDisplayName()),
+            () -> assertThat(metaSecurityCoding.getSystem()).isEqualTo(NOPAT_CV.getCodeSystem())
+        );
+    }
+
 
     @SneakyThrows
     private RCMRMT030101UKEhrExtract unmarshallEhrExtract(String fileName) {
         return unmarshallFile(getFile("classpath:" + XML_RESOURCES_BASE + fileName), RCMRMT030101UKEhrExtract.class);
     }
 
+    private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract ehrExtract) {
+
+        return ehrExtract.getComponent().get(0)
+            .getEhrFolder().getComponent().get(0)
+            .getEhrComposition();
+    }
+
+    private RCMRMT030101UKCompoundStatement getCompoundStatement(RCMRMT030101UKEhrExtract ehrExtract) {
+        return ehrExtract.getComponent().get(0)
+            .getEhrFolder().getComponent().get(0)
+            .getEhrComposition().getComponent().get(0)
+            .getCompoundStatement().getComponent().get(0)
+            .getCompoundStatement();
+    }
+
 }
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
index c03847752..bd16d62e8 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
@@ -1,23 +1,32 @@
 package uk.nhs.adaptors.pss.translator.mapper.diagnosticreport;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
 import static org.springframework.util.ResourceUtils.getFile;
 
+import static uk.nhs.adaptors.pss.translator.MetaFactory.MetaType.META_WITH_SECURITY;
 import static uk.nhs.adaptors.pss.translator.util.DateFormatUtil.parseToDateTimeType;
 import static uk.nhs.adaptors.pss.translator.util.XmlUnmarshallUtil.unmarshallFile;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Optional;
 import java.util.UUID;
 
+import org.hl7.fhir.dstu3.model.Coding;
 import org.hl7.fhir.dstu3.model.DateTimeType;
 import org.hl7.fhir.dstu3.model.DiagnosticReport;
+import org.hl7.fhir.dstu3.model.Meta;
 import org.hl7.fhir.dstu3.model.Observation;
 import org.hl7.fhir.dstu3.model.Patient;
 import org.hl7.fhir.dstu3.model.Reference;
 import org.hl7.fhir.dstu3.model.Specimen;
+import org.hl7.fhir.dstu3.model.UriType;
+import org.hl7.v3.CV;
+import org.hl7.v3.RCMRMT030101UKCompoundStatement;
+import org.hl7.v3.RCMRMT030101UKEhrComposition;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -26,13 +35,15 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import lombok.SneakyThrows;
+import uk.nhs.adaptors.pss.translator.MetaFactory;
+import uk.nhs.adaptors.pss.translator.TestUtility;
 import uk.nhs.adaptors.pss.translator.mapper.DateTimeMapper;
+import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 
 @ExtendWith(MockitoExtension.class)
 public class SpecimenMapperTest {
 
     private static final String XML_RESOURCES_BASE = "xml/Specimen/";
-    private static final String SPECIMEN_META_PROFILE = "https://fhir.nhs.uk/STU3/StructureDefinition/CareConnect-GPC-Specimen-1";
     private static final String SPECIMEN_PREFIX = "Specimen/";
     private static final String TEST_SPECIMEN_ID = "COMPOUND_STATEMENT_CHILD_ID_1";
     private static final String PRACTICE_CODE = "TEST_PRACTICE_CODE";
@@ -45,19 +56,80 @@ public class SpecimenMapperTest {
     private static final String DR_ID = "DIAGNOSTIC_REPORT_ID";
     private static final DiagnosticReport DIAGNOSTIC_REPORT_WITH_SPECIMEN = generateDiagnosticReportWithSpecimenReference();
     private static final DiagnosticReport DIAGNOSTIC_REPORT_WITHOUT_SPECIMEN = generateDiagnosticReportWithNoSpecimenReference();
+    private static final String SPECIMEN_META_PROFILE = "Specimen-1";
+    private static final Meta META = MetaFactory.getMetaFor(META_WITH_SECURITY, SPECIMEN_META_PROFILE);
+    private static final CV NOPAT_CV = TestUtility.createCv(
+        "NOPAT",
+        "http://hl7.org/fhir/v3/ActCode",
+        "no disclosure to patient, family or caregivers without attending provider's authorization");
 
     private static final String NARRATIVE_STATEMENT_ID = "9326C01E-488B-4EDF-B9C9-529E69EE0361";
 
     @Mock
     private DateTimeMapper dateTimeMapper;
 
+    @Mock
+    private ConfidentialityService confidentialityService;
+
     @InjectMocks
     private SpecimenMapper specimenMapper;
 
+    @Test
+    public void testHandlingSpecimenNoPatCompoundStatement() {
+        when(dateTimeMapper.mapDateTime(any())).thenCallRealMethod();
+        RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_valid_with_nopat_compound_statement.xml");
+        final var compoundStatement = getCompoundStatement(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            SPECIMEN_META_PROFILE,
+            Optional.empty(),
+            compoundStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
+        List<Specimen> specimenList = specimenMapper.mapSpecimens(
+            ehrExtract, List.of(DIAGNOSTIC_REPORT_WITH_SPECIMEN), PATIENT, PRACTICE_CODE);
+
+        assertThat(specimenList).isNotEmpty();
+
+        final Specimen specimen = specimenList.get(0);
+        checkFixedValues(specimen);
+        assertMetaSecurityIsPresent(specimen.getMeta());
+    }
+
+    @Test
+    public void testHandlingSpecimenNoPatEhrComposition() {
+        when(dateTimeMapper.mapDateTime(any())).thenCallRealMethod();
+        RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_valid_with_nopat_ehr_composition.xml");
+        final var ehrComposition = getEhrComposition(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            SPECIMEN_META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            Optional.empty()
+        )).thenReturn(META);
+
+        List<Specimen> specimenList = specimenMapper.mapSpecimens(
+            ehrExtract, List.of(DIAGNOSTIC_REPORT_WITH_SPECIMEN), PATIENT, PRACTICE_CODE);
+
+        assertThat(specimenList).isNotEmpty();
+
+        final Specimen specimen = specimenList.get(0);
+        checkFixedValues(specimen);
+        assertMetaSecurityIsPresent(specimen.getMeta());
+    }
+
     @Test
     public void testSpecimenIsMapped() {
         when(dateTimeMapper.mapDateTime(any())).thenCallRealMethod();
         RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_valid.xml");
+        final var compoundStatement = getCompoundStatement(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            SPECIMEN_META_PROFILE,
+            Optional.empty(),
+            compoundStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
         List<Specimen> specimenList = specimenMapper.mapSpecimens(
             ehrExtract, List.of(DIAGNOSTIC_REPORT_WITH_SPECIMEN), PATIENT, PRACTICE_CODE
         );
@@ -75,6 +147,14 @@ public void testSpecimenIsMapped() {
     @Test
     public void testSpecimenIsMappedWithNoOptionalFields() {
         RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_no_optional_fields.xml");
+        final var compoundStatement = getCompoundStatement(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            SPECIMEN_META_PROFILE,
+            Optional.empty(),
+            compoundStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
         List<Specimen> specimenList = specimenMapper.mapSpecimens(
             ehrExtract, List.of(DIAGNOSTIC_REPORT_WITH_SPECIMEN), PATIENT, PRACTICE_CODE
         );
@@ -162,6 +242,35 @@ private static DiagnosticReport generateDiagnosticReportWithNoSpecimenReference(
         return (DiagnosticReport) new DiagnosticReport().setId(DR_ID);
     }
 
+    private void assertMetaSecurityIsPresent(final Meta meta) {
+        final List<Coding> metaSecurity = meta.getSecurity();
+        final int metaSecuritySize = metaSecurity.size();
+        final Coding metaSecurityCoding = metaSecurity.get(0);
+        final UriType metaProfile = meta.getProfile().get(0);
+
+        assertAll(
+            () -> assertThat(metaSecuritySize).isEqualTo(1),
+            () -> assertThat(metaProfile.getValue()).isEqualTo(SPECIMEN_META_PROFILE),
+            () -> assertThat(metaSecurityCoding.getCode()).isEqualTo(NOPAT_CV.getCode()),
+            () -> assertThat(metaSecurityCoding.getDisplay()).isEqualTo(NOPAT_CV.getDisplayName()),
+            () -> assertThat(metaSecurityCoding.getSystem()).isEqualTo(NOPAT_CV.getCodeSystem()));
+    }
+
+    private RCMRMT030101UKCompoundStatement getCompoundStatement(RCMRMT030101UKEhrExtract ehrExtract) {
+        return ehrExtract.getComponent().get(0)
+            .getEhrFolder().getComponent().get(0)
+            .getEhrComposition().getComponent().get(0)
+            .getCompoundStatement().getComponent().get(0)
+            .getCompoundStatement();
+    }
+
+    private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract ehrExtract) {
+
+        return ehrExtract.getComponent().get(0)
+            .getEhrFolder().getComponent().get(0)
+            .getEhrComposition();
+    }
+
     @SneakyThrows
     private RCMRMT030101UKEhrExtract unmarshallEhrExtract(String fileName) {
         return unmarshallFile(getFile("classpath:" + XML_RESOURCES_BASE + fileName), RCMRMT030101UKEhrExtract.class);
diff --git a/gp2gp-translator/src/test/resources/xml/Specimen/specimen_valid_with_nopat_compound_statement.xml b/gp2gp-translator/src/test/resources/xml/Specimen/specimen_valid_with_nopat_compound_statement.xml
new file mode 100644
index 000000000..aac0d26f3
--- /dev/null
+++ b/gp2gp-translator/src/test/resources/xml/Specimen/specimen_valid_with_nopat_compound_statement.xml
@@ -0,0 +1,53 @@
+<EhrExtract xmlns="urn:hl7-org:v3" classCode="EXTRACT" moodCode="EVN">
+    <component typeCode="COMP">
+        <ehrFolder classCode="FOLDER" moodCode="EVN">
+            <component typeCode="COMP">
+                <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                    <id root="EHR_COMPOSITION_ID_1"/>
+                    <component typeCode="COMP">
+                        <CompoundStatement classCode="CLUSTER" moodCode="EVN">
+                            <id root="COMPOUND_STATEMENT_ID_1"/>
+                            <component typeCode="COMP" contextConductionInd="true">
+                                <CompoundStatement classCode="CLUSTER" moodCode="EVN">
+                                    <id root="COMPOUND_STATEMENT_CHILD_ID_1"/>
+                                    <code code="123038009" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                                          displayName="specimen (specimen)"/>
+                                    <statusCode code="COMPLETE"/>
+                                    <effectiveTime>
+                                        <center nullFlavor="NI"/>
+                                    </effectiveTime>
+                                    <availabilityTime value="20100225154100"/>
+                                    <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" />
+                                    <specimen typeCode="SPC">
+                                        <specimenRole classCode="SPEC">
+                                            <id root="SPECIMEN_ROLE_ID_1"/>
+                                            <id root="2.16.840.1.113883.2.1.4.5.2" extension="SPECIMEN_ROLE_ID_EXTENSION"/>
+                                            <effectiveTime>
+                                                <center value="20100223000000"/>
+                                            </effectiveTime>
+                                            <specimenSpecimenMaterial determinerCode="INSTANCE" classCode="MAT">
+                                                <desc>EINE KLEINE</desc>
+                                            </specimenSpecimenMaterial>
+                                        </specimenRole>
+                                    </specimen>
+                                    <component typeCode="COMP" contextConductionInd="true">
+                                        <NarrativeStatement classCode="OBS" moodCode="EVN">
+                                            <id root="9326C01E-488B-4EDF-B9C9-529E69EE0361"/>
+                                            <text mediaType="text/x-h7uk-pmip">CommentType:LAB SPECIMEN COMMENT(E271)
+CommentDate:20020330092100
+
+Received Date: 2002-03-30 09:21
+</text>
+                                            <statusCode code="COMPLETE"/>
+                                            <availabilityTime value="20020330000000"/>
+                                        </NarrativeStatement>
+                                    </component>
+                                </CompoundStatement>
+                            </component>
+                        </CompoundStatement>
+                    </component>
+                </ehrComposition>
+            </component>
+        </ehrFolder>
+    </component>
+</EhrExtract>
\ No newline at end of file
diff --git a/gp2gp-translator/src/test/resources/xml/Specimen/specimen_valid_with_nopat_ehr_composition.xml b/gp2gp-translator/src/test/resources/xml/Specimen/specimen_valid_with_nopat_ehr_composition.xml
new file mode 100644
index 000000000..e83a2f2f2
--- /dev/null
+++ b/gp2gp-translator/src/test/resources/xml/Specimen/specimen_valid_with_nopat_ehr_composition.xml
@@ -0,0 +1,53 @@
+<EhrExtract xmlns="urn:hl7-org:v3" classCode="EXTRACT" moodCode="EVN">
+    <component typeCode="COMP">
+        <ehrFolder classCode="FOLDER" moodCode="EVN">
+            <component typeCode="COMP">
+                <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                    <id root="EHR_COMPOSITION_ID_1"/>
+                    <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" />
+                    <component typeCode="COMP">
+                        <CompoundStatement classCode="CLUSTER" moodCode="EVN">
+                            <id root="COMPOUND_STATEMENT_ID_1"/>
+                            <component typeCode="COMP" contextConductionInd="true">
+                                <CompoundStatement classCode="CLUSTER" moodCode="EVN">
+                                    <id root="COMPOUND_STATEMENT_CHILD_ID_1"/>
+                                    <code code="123038009" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                                          displayName="specimen (specimen)"/>
+                                    <statusCode code="COMPLETE"/>
+                                    <effectiveTime>
+                                        <center nullFlavor="NI"/>
+                                    </effectiveTime>
+                                    <availabilityTime value="20100225154100"/>
+                                    <specimen typeCode="SPC">
+                                        <specimenRole classCode="SPEC">
+                                            <id root="SPECIMEN_ROLE_ID_1"/>
+                                            <id root="2.16.840.1.113883.2.1.4.5.2" extension="SPECIMEN_ROLE_ID_EXTENSION"/>
+                                            <effectiveTime>
+                                                <center value="20100223000000"/>
+                                            </effectiveTime>
+                                            <specimenSpecimenMaterial determinerCode="INSTANCE" classCode="MAT">
+                                                <desc>EINE KLEINE</desc>
+                                            </specimenSpecimenMaterial>
+                                        </specimenRole>
+                                    </specimen>
+                                    <component typeCode="COMP" contextConductionInd="true">
+                                        <NarrativeStatement classCode="OBS" moodCode="EVN">
+                                            <id root="9326C01E-488B-4EDF-B9C9-529E69EE0361"/>
+                                            <text mediaType="text/x-h7uk-pmip">CommentType:LAB SPECIMEN COMMENT(E271)
+CommentDate:20020330092100
+
+Received Date: 2002-03-30 09:21
+</text>
+                                            <statusCode code="COMPLETE"/>
+                                            <availabilityTime value="20020330000000"/>
+                                        </NarrativeStatement>
+                                    </component>
+                                </CompoundStatement>
+                            </component>
+                        </CompoundStatement>
+                    </component>
+                </ehrComposition>
+            </component>
+        </ehrFolder>
+    </component>
+</EhrExtract>
\ No newline at end of file
diff --git a/gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_ehr_composition_with_nopat_conf_code.xml b/gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_ehr_composition_with_nopat_conf_code.xml
new file mode 100644
index 000000000..49d200e40
--- /dev/null
+++ b/gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_ehr_composition_with_nopat_conf_code.xml
@@ -0,0 +1,82 @@
+<EhrExtract xmlns="urn:hl7-org:v3" classCode="EXTRACT" moodCode="EVN">
+    <component typeCode="COMP">
+        <ehrFolder classCode="FOLDER" moodCode="EVN">
+            <component typeCode="COMP">
+                <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                    <id root="CA4AD477-C33B-4FE7-8417-A242BB3D23AF"/>
+                    <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" />
+                    <author typeCode="AUT" contextControlCode="OP">
+                        <time value="20200101010101"/>
+                        <agentRef classCode="AGNT">
+                            <id root="749107A2-4975-441F-8EDF-ADFF451FD12D"/>
+                        </agentRef>
+                    </author>
+                    <Participant2 typeCode="PRF" contextControlCode="OP">
+                        <agentRef classCode="AGNT">
+                            <id root="2D70F602-6BB1-47E0-B2EC-39912A59787D"/>
+                        </agentRef>
+                    </Participant2>
+                    <component typeCode="COMP">
+                        <CompoundStatement classCode="CLUSTER" moodCode="EVN">
+                            <id root="DR_TEST_ID"/>
+                            <code code="16488004" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                                  displayName="laboratory reporting">
+                                <originalText>Filed Report</originalText>
+                            </code>
+                            <statusCode code="COMPLETE"/>
+                            <effectiveTime>
+                                <center nullFlavor="NI"/>
+                            </effectiveTime>
+                            <availabilityTime value="20100225154100"/>
+                            <Participant typeCode="AUT" contextControlCode="OP">
+                                <agentRef classCode="AGNT">
+                                    <id root="394559384658936"/>
+                                </agentRef>
+                            </Participant>
+                            <component typeCode="COMP" contextConductionInd="true">
+                                <CompoundStatement classCode="CLUSTER" moodCode="EVN">
+                                    <id root="TEST_SPECIMEN_ID_1"/>
+                                    <code code="123038009" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                                          displayName="specimen (specimen)"/>
+                                    <statusCode code="COMPLETE"/>
+                                    <effectiveTime>
+                                        <center nullFlavor="NI"/>
+                                    </effectiveTime>
+                                    <availabilityTime value="20100225154100"/>
+                                    <specimen typeCode="SPC">
+                                        <specimenRole classCode="SPEC">
+                                            <id root="37252CF4-D7F6-4CBA-89B2-63477F0C8374"/>
+                                            <id root="2.16.840.1.113883.2.1.4.5.2" extension="CH000056DN"/>
+                                            <effectiveTime>
+                                                <center value="20100223000000"/>
+                                            </effectiveTime>
+                                            <specimenSpecimenMaterial determinerCode="INSTANCE" classCode="MAT">
+                                                <desc>URINE</desc>
+                                            </specimenSpecimenMaterial>
+                                        </specimenRole>
+                                    </specimen>
+                                    <component typeCode="COMP" contextConductionInd="true">
+                                        <ObservationStatement classCode="OBS" moodCode="EVN">
+                                            <id root="OBSERVATION_STATEMENT_ID"/>
+                                            <code code="465..00" codeSystem="2.16.840.1.113883.2.1.6.2"
+                                                  displayName="Urine pregnancy Test">
+                                                <translation code="1003161000000106"
+                                                             codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                                                             displayName="Urine pregnancy test"/>
+                                            </code>
+                                            <statusCode code="COMPLETE"/>
+                                            <effectiveTime>
+                                                <center value="20100223000000"/>
+                                            </effectiveTime>
+                                            <availabilityTime value="20100225154100"/>
+                                        </ObservationStatement>
+                                    </component>
+                                </CompoundStatement>
+                            </component>
+                        </CompoundStatement>
+                    </component>
+                </ehrComposition>
+            </component>
+        </ehrFolder>
+    </component>
+</EhrExtract>
\ No newline at end of file
diff --git a/gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_observation_statement_with_nopat_conf_code.xml b/gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_observation_statement_with_nopat_conf_code.xml
new file mode 100644
index 000000000..39e81cebf
--- /dev/null
+++ b/gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_observation_statement_with_nopat_conf_code.xml
@@ -0,0 +1,82 @@
+<EhrExtract xmlns="urn:hl7-org:v3" classCode="EXTRACT" moodCode="EVN">
+    <component typeCode="COMP">
+        <ehrFolder classCode="FOLDER" moodCode="EVN">
+            <component typeCode="COMP">
+                <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                    <id root="CA4AD477-C33B-4FE7-8417-A242BB3D23AF"/>
+                    <author typeCode="AUT" contextControlCode="OP">
+                        <time value="20200101010101"/>
+                        <agentRef classCode="AGNT">
+                            <id root="749107A2-4975-441F-8EDF-ADFF451FD12D"/>
+                        </agentRef>
+                    </author>
+                    <Participant2 typeCode="PRF" contextControlCode="OP">
+                        <agentRef classCode="AGNT">
+                            <id root="2D70F602-6BB1-47E0-B2EC-39912A59787D"/>
+                        </agentRef>
+                    </Participant2>
+                    <component typeCode="COMP">
+                        <CompoundStatement classCode="CLUSTER" moodCode="EVN">
+                            <id root="DR_TEST_ID"/>
+                            <code code="16488004" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                                  displayName="laboratory reporting">
+                                <originalText>Filed Report</originalText>
+                            </code>
+                            <statusCode code="COMPLETE"/>
+                            <effectiveTime>
+                                <center nullFlavor="NI"/>
+                            </effectiveTime>
+                            <availabilityTime value="20100225154100"/>
+                            <Participant typeCode="AUT" contextControlCode="OP">
+                                <agentRef classCode="AGNT">
+                                    <id root="394559384658936"/>
+                                </agentRef>
+                            </Participant>
+                            <component typeCode="COMP" contextConductionInd="true">
+                                <CompoundStatement classCode="CLUSTER" moodCode="EVN">
+                                    <id root="TEST_SPECIMEN_ID_1"/>
+                                    <code code="123038009" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                                          displayName="specimen (specimen)"/>
+                                    <statusCode code="COMPLETE"/>
+                                    <effectiveTime>
+                                        <center nullFlavor="NI"/>
+                                    </effectiveTime>
+                                    <availabilityTime value="20100225154100"/>
+                                    <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" />
+                                    <specimen typeCode="SPC">
+                                        <specimenRole classCode="SPEC">
+                                            <id root="37252CF4-D7F6-4CBA-89B2-63477F0C8374"/>
+                                            <id root="2.16.840.1.113883.2.1.4.5.2" extension="CH000056DN"/>
+                                            <effectiveTime>
+                                                <center value="20100223000000"/>
+                                            </effectiveTime>
+                                            <specimenSpecimenMaterial determinerCode="INSTANCE" classCode="MAT">
+                                                <desc>URINE</desc>
+                                            </specimenSpecimenMaterial>
+                                        </specimenRole>
+                                    </specimen>
+                                    <component typeCode="COMP" contextConductionInd="true">
+                                        <ObservationStatement classCode="OBS" moodCode="EVN">
+                                            <id root="OBSERVATION_STATEMENT_ID"/>
+                                            <code code="465..00" codeSystem="2.16.840.1.113883.2.1.6.2"
+                                                  displayName="Urine pregnancy Test">
+                                                <translation code="1003161000000106"
+                                                             codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                                                             displayName="Urine pregnancy test"/>
+                                            </code>
+                                            <statusCode code="COMPLETE"/>
+                                            <effectiveTime>
+                                                <center value="20100223000000"/>
+                                            </effectiveTime>
+                                            <availabilityTime value="20100225154100"/>
+                                        </ObservationStatement>
+                                    </component>
+                                </CompoundStatement>
+                            </component>
+                        </CompoundStatement>
+                    </component>
+                </ehrComposition>
+            </component>
+        </ehrFolder>
+    </component>
+</EhrExtract>
\ No newline at end of file

From c50908c4978266f9b2173bcef902a16df3bc5880 Mon Sep 17 00:00:00 2001
From: hospel <12736698+ole4ryb@users.noreply.github.com>
Date: Thu, 8 Aug 2024 11:46:33 +0100
Subject: [PATCH 04/13] diagnostic report NOPAT

---
 .../DiagnosticReportMapper.java               |   9 +-
 .../SpecimenCompoundsMapper.java              |   2 +-
 .../DiagnosticReportMapperTest.java           | 132 +++++++++++++++++-
 3 files changed, 139 insertions(+), 4 deletions(-)

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java
index 272cf0fd9..5b92e2cee 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java
@@ -41,6 +41,7 @@
 import org.springframework.stereotype.Service;
 
 import uk.nhs.adaptors.pss.translator.mapper.AbstractMapper;
+import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 import uk.nhs.adaptors.pss.translator.service.IdGeneratorService;
 import uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors;
 import uk.nhs.adaptors.pss.translator.util.ResourceFilterUtil;
@@ -61,6 +62,7 @@ public class DiagnosticReportMapper extends AbstractMapper<DiagnosticReport> {
     public static final String USER_COMMENT_COMMENT_TYPE = "CommentType:USER COMMENT";
 
     private final IdGeneratorService idGeneratorService;
+    private final ConfidentialityService confidentialityService;
 
     public static void addResultToDiagnosticReport(Observation observation, DiagnosticReport diagnosticReport) {
         if (!containsReference(diagnosticReport.getResult(), observation.getId())) {
@@ -126,7 +128,12 @@ private DiagnosticReport createDiagnosticReport(RCMRMT030101UKCompoundStatement
         final DiagnosticReport diagnosticReport = new DiagnosticReport();
         final String id = compoundStatement.getId().get(0).getRoot();
 
-        diagnosticReport.setMeta(generateMeta(META_PROFILE_URL_SUFFIX));
+        var meta = confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE_URL_SUFFIX,
+            composition.getConfidentialityCode(),
+            compoundStatement.getConfidentialityCode());
+
+        diagnosticReport.setMeta(meta);
         diagnosticReport.setId(id);
         diagnosticReport.addIdentifier(buildIdentifier(id, practiceCode));
         diagnosticReport.setCode(createCode());
diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
index 512799c5b..072198090 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
@@ -50,7 +50,7 @@ public class SpecimenCompoundsMapper {
     public static final String CODING_CODE = "laboratory";
     public static final String CODING_SYSTEM = "http://hl7.org/fhir/observation-category";
     public static final String CODING_DISPLAY = "Laboratory";
-    private static final String META_PROFILE = "SpecimenCompounds-1";
+    private static final String META_PROFILE = "Observation-1";
 
     private final SpecimenBatteryMapper batteryMapper;
     private final ConfidentialityService confidentialityService;
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java
index ae691a16b..14eaa9a43 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java
@@ -5,6 +5,9 @@
 
 import java.io.IOException;
 import java.nio.file.Files;
+
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static uk.nhs.adaptors.pss.translator.MetaFactory.MetaType.META_WITH_SECURITY;
 import static uk.nhs.adaptors.pss.translator.util.DateFormatUtil.parseToInstantType;
 import static uk.nhs.adaptors.pss.translator.util.XmlUnmarshallUtil.unmarshallString;
 import java.nio.file.Paths;
@@ -12,13 +15,20 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 
+import org.hl7.fhir.dstu3.model.Coding;
 import org.hl7.fhir.dstu3.model.DateTimeType;
 import org.hl7.fhir.dstu3.model.Encounter;
 import org.hl7.fhir.dstu3.model.Identifier;
 import org.hl7.fhir.dstu3.model.InstantType;
+import org.hl7.fhir.dstu3.model.Meta;
 import org.hl7.fhir.dstu3.model.Observation;
 import org.hl7.fhir.dstu3.model.Patient;
+import org.hl7.fhir.dstu3.model.UriType;
+import org.hl7.v3.CV;
+import org.hl7.v3.RCMRMT030101UKCompoundStatement;
+import org.hl7.v3.RCMRMT030101UKEhrComposition;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -29,6 +39,9 @@
 import lombok.SneakyThrows;
 import org.springframework.core.io.ClassPathResource;
 import org.springframework.core.io.Resource;
+import uk.nhs.adaptors.pss.translator.MetaFactory;
+import uk.nhs.adaptors.pss.translator.TestUtility;
+import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
 import uk.nhs.adaptors.pss.translator.service.IdGeneratorService;
 import uk.nhs.adaptors.pss.translator.util.DateFormatUtil;
 import static org.hl7.fhir.dstu3.model.Observation.ObservationStatus.UNKNOWN;
@@ -49,6 +62,11 @@ public class DiagnosticReportMapperTest {
     private static final Patient PATIENT = (Patient) new Patient().setId("PATIENT_TEST_ID");
     private static final String CONCLUSION_FIELD_TEXT = "TEXT_OF_DIRECT_COMPOUND_STATEMENT_CHILD_NARRATIVE_STATEMENT_1\n"
         + "TEXT_OF_DIRECT_COMPOUND_STATEMENT_CHILD_NARRATIVE_STATEMENT_2";
+    private static final Meta META = MetaFactory.getMetaFor(META_WITH_SECURITY, DIAGNOSTIC_REPORT_META_SUFFIX);
+    private static final CV NOPAT_CV = TestUtility.createCv(
+        "NOPAT",
+        "http://hl7.org/fhir/v3/ActCode",
+        "no disclosure to patient, family or caregivers without attending provider's authorization");
 
     private static final String NARRATIVE_STATEMENT_COMMENT_BLOCK = """
         CommentType:LABORATORY RESULT COMMENT(E141)
@@ -78,12 +96,85 @@ public class DiagnosticReportMapperTest {
                 </EhrExtract>
                 """;
 
+    private static final String EHR_EXTRACT_TEMPLATE_WITH_EHR_COMPOSITION = """
+                <EhrExtract xmlns="urn:hl7-org:v3" classCode="EXTRACT" moodCode="EVN">
+                    <component typeCode="COMP">
+                        <ehrFolder classCode="FOLDER" moodCode="EVN">
+                            <component typeCode="COMP">
+                                <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                                    <id root="EHR_COMPOSITION_ID_1" />
+                                    <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" />
+                                    <component typeCode="COMP">
+                                        {DiagnosticReportCompoundStatement}
+                                    </component>
+                                </ehrComposition>
+                            </component>
+                        </ehrFolder>
+                    </component>
+                </EhrExtract>
+                """;
+
     @Mock
     private IdGeneratorService idGeneratorService;
 
+    @Mock
+    private ConfidentialityService confidentialityService;
+
     @InjectMocks
     private DiagnosticReportMapper diagnosticReportMapper;
 
+    @Test
+    public void When_DiagnosticReportWithNoPatIsMapped_Expect_DiagnosticReportWithNoPatMeta() {
+        var inputXml = buildEhrExtractStringFromDiagnosticReportXml(
+            """
+            <CompoundStatement classCode="CLUSTER" moodCode="EVN">
+                <id root="DIAGNOSTIC_REPORT_ID"/>
+                <code code="16488004" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" />
+                <availabilityTime value="20100225154100"/>
+                <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" />
+            </CompoundStatement>
+            """);
+
+        var ehrExtract = unmarshallEhrExtractFromXmlString(inputXml);
+        final var compoundStatement = getCompoundStatement(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            DIAGNOSTIC_REPORT_META_SUFFIX,
+            Optional.empty(),
+            compoundStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
+        var diagnosticReports = diagnosticReportMapper.mapResources(ehrExtract, PATIENT, List.of(), PRACTICE_CODE);
+        var diagnosticReport = diagnosticReports.get(0);
+
+        assertMetaSecurityIsPresent(diagnosticReport.getMeta());
+    }
+
+    @Test
+    public void When_DiagnosticReportWithNoPatEhrCompositionIsMapped_Expect_DiagnosticReportWithNoPatMeta() {
+        var inputXml = buildEhrExtractStringWithNoPatEhrCompositionFromDiagnosticReportXml(
+            """
+            <CompoundStatement classCode="CLUSTER" moodCode="EVN">
+                <id root="DIAGNOSTIC_REPORT_ID"/>
+                <code code="16488004" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" />
+                <availabilityTime value="20100225154100"/>                
+            </CompoundStatement>
+            """);
+
+        var ehrExtract = unmarshallEhrExtractFromXmlString(inputXml);
+        final var ehrComposition = getEhrComposition(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            DIAGNOSTIC_REPORT_META_SUFFIX,
+            ehrComposition.getConfidentialityCode(),
+            Optional.empty()
+        )).thenReturn(META);
+
+        var diagnosticReports = diagnosticReportMapper.mapResources(ehrExtract, PATIENT, List.of(), PRACTICE_CODE);
+        var diagnosticReport = diagnosticReports.get(0);
+
+        assertMetaSecurityIsPresent(diagnosticReport.getMeta());
+    }
 
     @Test
     public void When_DiagnosticReportWithNoReferenceIsMapped_Expect_DiagnosticReportIsCorrectlyMapped() {
@@ -97,6 +188,13 @@ public void When_DiagnosticReportWithNoReferenceIsMapped_Expect_DiagnosticReport
                 """);
 
         var ehrExtract = unmarshallEhrExtractFromXmlString(inputXml);
+        final var compoundStatement = getCompoundStatement(ehrExtract);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            DIAGNOSTIC_REPORT_META_SUFFIX,
+            Optional.empty(),
+            compoundStatement.getConfidentialityCode()
+        )).thenReturn(META);
 
         var diagnosticReports = diagnosticReportMapper.mapResources(ehrExtract, PATIENT, List.of(), PRACTICE_CODE);
         var diagnosticReport = diagnosticReports.get(0);
@@ -114,8 +212,7 @@ public void When_DiagnosticReportWithNoReferenceIsMapped_Expect_DiagnosticReport
                         .isEqualTo(PATIENT.getId()),
                 () -> assertThat(diagnosticReport.getIssuedElement().getValueAsString())
                         .isEqualTo(ISSUED_ELEMENT.getValueAsString()),
-                () -> assertThat(diagnosticReport.hasContext())
-                        .isFalse(),
+                () -> assertFalse(diagnosticReport.hasContext()),
                 () -> assertThat(diagnosticReport.getSpecimen())
                         .isEmpty(),
                 () -> assertThat(diagnosticReport.getResult())
@@ -561,15 +658,42 @@ private Observation createBatteryLevelFilingComment() {
                         .setId("C515E722-2473-11EE-808B-AC162D1F16F0");
     }
 
+    private RCMRMT030101UKCompoundStatement getCompoundStatement(RCMRMT030101UKEhrExtract ehrExtract) {
+        return ehrExtract.getComponent().get(0)
+            .getEhrFolder().getComponent().get(0)
+            .getEhrComposition().getComponent().get(0)
+            .getCompoundStatement();
+    }
+
     private List<Encounter> createEncounterList() {
         return List.of((Encounter) new Encounter().setId(ENCOUNTER_ID));
     }
 
+    private void assertMetaSecurityIsPresent(final Meta meta) {
+        final List<Coding> metaSecurity = meta.getSecurity();
+        final int metaSecuritySize = metaSecurity.size();
+        final Coding metaSecurityCoding = metaSecurity.get(0);
+        final UriType metaProfile = meta.getProfile().get(0);
+
+        assertAll(
+            () -> assertThat(metaSecuritySize).isEqualTo(1),
+            () -> assertThat(metaProfile.getValue()).isEqualTo(DIAGNOSTIC_REPORT_META_SUFFIX),
+            () -> assertThat(metaSecurityCoding.getCode()).isEqualTo(NOPAT_CV.getCode()),
+            () -> assertThat(metaSecurityCoding.getDisplay()).isEqualTo(NOPAT_CV.getDisplayName()),
+            () -> assertThat(metaSecurityCoding.getSystem()).isEqualTo(NOPAT_CV.getCodeSystem()));
+    }
+
     @SneakyThrows
     private RCMRMT030101UKEhrExtract unmarshallEhrExtractFromXmlString(String xmlString) {
         return unmarshallString(xmlString, RCMRMT030101UKEhrExtract.class);
     }
 
+    private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract ehrExtract) {
+        return ehrExtract.getComponent().get(0)
+            .getEhrFolder().getComponent().get(0)
+            .getEhrComposition();
+    }
+
     private static String readFileAsString(String path) throws IOException {
         Resource resource = new ClassPathResource(path);
         return Files.readString(Paths.get(resource.getURI()));
@@ -578,4 +702,8 @@ private static String readFileAsString(String path) throws IOException {
     private static String buildEhrExtractStringFromDiagnosticReportXml(String diagnosticReportXml) {
         return EHR_EXTRACT_TEMPLATE.replace("{DiagnosticReportCompoundStatement}", diagnosticReportXml);
     }
+
+    private static String buildEhrExtractStringWithNoPatEhrCompositionFromDiagnosticReportXml(String diagnosticReportXml) {
+        return EHR_EXTRACT_TEMPLATE_WITH_EHR_COMPOSITION.replace("{DiagnosticReportCompoundStatement}", diagnosticReportXml);
+    }
 }

From e53ada5a2e236b1a5e436426012f7ab2cd5c0574 Mon Sep 17 00:00:00 2001
From: hospel <12736698+ole4ryb@users.noreply.github.com>
Date: Thu, 8 Aug 2024 15:08:33 +0100
Subject: [PATCH 05/13] adding more tests

---
 .../translator/mapper/ObservationMapper.java  |  12 +-
 .../DiagnosticReportMapper.java               |   1 -
 .../mapper/ObservationMapperTest.java         |  68 +++++++-
 .../DiagnosticReportMapperTest.java           |  30 ++--
 .../SpecimenCompoundsMapperTest.java          |   2 +-
 ...at_compound_statement_with_observation.xml | 148 ++++++++++++++++++
 6 files changed, 238 insertions(+), 23 deletions(-)
 create mode 100644 gp2gp-translator/src/test/resources/xml/Observation/nopat_compound_statement_with_observation.xml

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
index 4b3971abd..9d62ec883 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
@@ -19,6 +19,7 @@
 import org.hl7.v3.CR;
 import org.hl7.v3.CV;
 import org.hl7.v3.RCMRMT030101UKAnnotation;
+import org.hl7.v3.RCMRMT030101UKCompoundStatement;
 import org.hl7.v3.RCMRMT030101UKEhrComposition;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
 import org.hl7.v3.RCMRMT030101UKObservationStatement;
@@ -44,6 +45,7 @@
 
 import static org.hl7.fhir.dstu3.model.Observation.ObservationStatus.FINAL;
 
+import static uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors.extractAllCompoundStatements;
 import static uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors.extractAllObservationStatementsWithoutAllergiesAndBloodPressures;
 import static uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors.extractAllRequestStatements;
 import static uk.nhs.adaptors.pss.translator.util.ObservationUtil.getEffective;
@@ -101,11 +103,19 @@ private Observation mapObservation(RCMRMT030101UKEhrComposition ehrComposition,
                                        List<Encounter> encounters,
                                        String practiseCode) {
 
+        var compoundStatement = ehrComposition
+            .getComponent()
+            .stream()
+            .flatMap(component4 -> extractAllCompoundStatements(component4))
+            .filter(Objects::nonNull)
+            .findFirst().orElseGet(RCMRMT030101UKCompoundStatement::new);
+
         var id = observationStatement.getId().getRoot();
         var meta = confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
             META_PROFILE,
             ehrComposition.getConfidentialityCode(),
-            observationStatement.getConfidentialityCode());
+            observationStatement.getConfidentialityCode(),
+            compoundStatement.getConfidentialityCode());
 
         var observation = buildBaseObservation(ehrComposition, observationStatement, patient, practiseCode, id, meta);
 
diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java
index 5b92e2cee..728ad1624 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java
@@ -6,7 +6,6 @@
 import static uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors.extractAllCompoundStatements;
 import static uk.nhs.adaptors.pss.translator.util.DateFormatUtil.parseToInstantType;
 import static uk.nhs.adaptors.pss.translator.util.ResourceUtil.buildIdentifier;
-import static uk.nhs.adaptors.pss.translator.util.ResourceUtil.generateMeta;
 import static uk.nhs.adaptors.pss.translator.util.TextUtil.extractPmipComment;
 
 import java.util.ArrayList;
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
index ddaeb27c9..8cf6c9402 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
@@ -10,6 +10,7 @@
 import static org.springframework.util.ResourceUtils.getFile;
 
 import static uk.nhs.adaptors.pss.translator.MetaFactory.MetaType.META_WITH_SECURITY;
+import static uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors.extractAllCompoundStatements;
 import static uk.nhs.adaptors.pss.translator.util.XmlUnmarshallUtil.unmarshallFile;
 
 import java.math.BigDecimal;
@@ -30,6 +31,7 @@
 import org.hl7.fhir.dstu3.model.StringType;
 import org.hl7.fhir.dstu3.model.UriType;
 import org.hl7.v3.CV;
+import org.hl7.v3.RCMRMT030101UKComponent02;
 import org.hl7.v3.RCMRMT030101UKEhrComposition;
 import org.hl7.v3.RCMRMT030101UKEhrExtract;
 
@@ -102,6 +104,42 @@ public class ObservationMapperTest {
     @InjectMocks
     private ObservationMapper observationMapper;
 
+    @Test
+    public void mapTwoObservationsWrappedInCompoundStatementMetaSecurityWithNoPapExpectObservationsWithNoPat() {
+        var ehrExtract = unmarshallEhrExtractElement("nopat_compound_statement_with_observation.xml");
+
+        var ehrComposition = getEhrComposition(ehrExtract);
+        var observationStatements = getObservationStatementIncludedIntoCompoundStatement(ehrExtract);
+        var compoundStatement = ehrComposition
+            .getComponent()
+            .stream()
+            .flatMap(component4 -> extractAllCompoundStatements(component4))
+            .findFirst().get();
+
+        observationStatements.get(0).setConfidentialityCode(NOPAT_CV);
+        ehrComposition.setConfidentialityCode(NOPAT_CV);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            observationStatements.get(0).getConfidentialityCode(),
+            compoundStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
+        when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+            META_PROFILE,
+            ehrComposition.getConfidentialityCode(),
+            observationStatements.get(1).getConfidentialityCode(),
+            compoundStatement.getConfidentialityCode()
+        )).thenReturn(META);
+
+        var observations = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE);
+
+        assertThat(observations).hasSize(2);
+        assertMetaSecurityIsPresent(observations.get(0).getMeta());
+        assertMetaSecurityIsPresent(observations.get(1).getMeta());
+    }
+
     @Test
     public void mapObservationMetaSecurityWithNoPatWhenConfidentialityCodeIsPresentForObservationStatementAndEhrComposition() {
         var ehrExtract = unmarshallEhrExtractElement("full_valid_data_observation_example.xml");
@@ -115,7 +153,8 @@ public void mapObservationMetaSecurityWithNoPatWhenConfidentialityCodeIsPresentF
         when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
             META_PROFILE,
             ehrComposition.getConfidentialityCode(),
-            observationStatement.getConfidentialityCode()
+            observationStatement.getConfidentialityCode(),
+            Optional.empty()
         )).thenReturn(META);
 
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
@@ -133,6 +172,7 @@ public void mapObservationMetaSecurityWithNoPatWhenConfidentialityCodeIsPresentO
         when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
             META_PROFILE,
             ehrComposition.getConfidentialityCode(),
+            Optional.empty(),
             Optional.empty()
         )).thenReturn(META);
 
@@ -150,7 +190,8 @@ public void mapObservationWithValidData() {
         when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
             META_PROFILE,
             ehrComposition.getConfidentialityCode(),
-            observationStatement.getConfidentialityCode()
+            observationStatement.getConfidentialityCode(),
+            Optional.empty()
         )).thenReturn(META);
 
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
@@ -184,7 +225,8 @@ public void mapObservationWithEpisodicity() {
         when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
             META_PROFILE,
             ehrComposition.getConfidentialityCode(),
-            observationStatement.getConfidentialityCode()
+            observationStatement.getConfidentialityCode(),
+            Optional.empty()
         )).thenReturn(META);
 
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
@@ -205,7 +247,8 @@ public void mapObservationWithEpisodicityWithOriginalText() {
         when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
             META_PROFILE,
             ehrComposition.getConfidentialityCode(),
-            observationStatement.getConfidentialityCode()
+            observationStatement.getConfidentialityCode(),
+            Optional.empty()
         )).thenReturn(META);
 
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
@@ -222,7 +265,8 @@ public void mapObservationWithEpisodicityWithOriginalTextAndExistingComment() {
         when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
             META_PROFILE,
             ehrComposition.getConfidentialityCode(),
-            observationStatement.getConfidentialityCode()
+            observationStatement.getConfidentialityCode(),
+            Optional.empty()
         )).thenReturn(META);
 
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
@@ -258,7 +302,8 @@ public void mapObservationWithNoOptionalData() {
         when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
             META_PROFILE,
             ehrComposition.getConfidentialityCode(),
-            observationStatement.getConfidentialityCode()
+            observationStatement.getConfidentialityCode(),
+            Optional.empty()
         )).thenReturn(META);
 
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
@@ -498,6 +543,17 @@ private RCMRMT030101UKObservationStatement getObservationStatement(RCMRMT030101U
             .getObservationStatement();
     }
 
+    private List<RCMRMT030101UKObservationStatement> getObservationStatementIncludedIntoCompoundStatement(
+        RCMRMT030101UKEhrExtract ehrExtract) {
+
+        return ehrExtract.getComponent().get(0)
+            .getEhrFolder().getComponent().get(0)
+            .getEhrComposition().getComponent().get(0).getCompoundStatement().getComponent().stream()
+            .filter(RCMRMT030101UKComponent02::hasObservationStatement)
+            .map(RCMRMT030101UKComponent02::getObservationStatement)
+            .toList();
+    }
+
     @SneakyThrows
     private RCMRMT030101UKEhrExtract unmarshallEhrExtractElement(String fileName) {
         return unmarshallFile(getFile("classpath:" + XML_RESOURCES_BASE + fileName), RCMRMT030101UKEhrExtract.class);
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java
index 14eaa9a43..dfbae6f21 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java
@@ -97,22 +97,23 @@ public class DiagnosticReportMapperTest {
                 """;
 
     private static final String EHR_EXTRACT_TEMPLATE_WITH_EHR_COMPOSITION = """
-                <EhrExtract xmlns="urn:hl7-org:v3" classCode="EXTRACT" moodCode="EVN">
+        <EhrExtract xmlns="urn:hl7-org:v3" classCode="EXTRACT" moodCode="EVN">
+            <component typeCode="COMP">
+                <ehrFolder classCode="FOLDER" moodCode="EVN">
                     <component typeCode="COMP">
-                        <ehrFolder classCode="FOLDER" moodCode="EVN">
+                        <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                            <id root="EHR_COMPOSITION_ID_1" />
+                            <confidentialityCode code="NOPAT" codeSystem="2.16.840.1.113883.4.642.3.47" displayName="no disclosure \n
+                            to patient, family or caregivers without attending provider's authorization" />
                             <component typeCode="COMP">
-                                <ehrComposition classCode="COMPOSITION" moodCode="EVN">
-                                    <id root="EHR_COMPOSITION_ID_1" />
-                                    <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" />
-                                    <component typeCode="COMP">
-                                        {DiagnosticReportCompoundStatement}
-                                    </component>
-                                </ehrComposition>
+                                {DiagnosticReportCompoundStatement}
                             </component>
-                        </ehrFolder>
+                        </ehrComposition>
                     </component>
-                </EhrExtract>
-                """;
+                </ehrFolder>
+            </component>
+        </EhrExtract>
+        """;
 
     @Mock
     private IdGeneratorService idGeneratorService;
@@ -131,7 +132,8 @@ public void When_DiagnosticReportWithNoPatIsMapped_Expect_DiagnosticReportWithNo
                 <id root="DIAGNOSTIC_REPORT_ID"/>
                 <code code="16488004" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" />
                 <availabilityTime value="20100225154100"/>
-                <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" />
+                <confidentialityCode code="NOPAT" codeSystem="2.16.840.1.113883.4.642.3.47" displayName="no disclosure to patient, \n
+                family or caregivers without attending provider's authorization" />
             </CompoundStatement>
             """);
 
@@ -157,7 +159,7 @@ public void When_DiagnosticReportWithNoPatEhrCompositionIsMapped_Expect_Diagnost
             <CompoundStatement classCode="CLUSTER" moodCode="EVN">
                 <id root="DIAGNOSTIC_REPORT_ID"/>
                 <code code="16488004" codeSystem="2.16.840.1.113883.2.1.3.2.4.15" />
-                <availabilityTime value="20100225154100"/>                
+                <availabilityTime value="20100225154100"/>
             </CompoundStatement>
             """);
 
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
index 10eedc642..7c8b17f69 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
@@ -61,7 +61,7 @@ public class SpecimenCompoundsMapperTest {
     private static final String SPECIMEN_ID = "TEST_SPECIMEN_ID";
     private static final String TEST_COMMENT_LINE = "First comment Line";
     private static final String TEST_COMMENT_LINE_1 = "Test Comment";
-    private static final String META_PROFILE = "SpecimenCompounds-1";
+    private static final String META_PROFILE = "Observation-1";
     private static final Meta META = MetaFactory.getMetaFor(META_WITH_SECURITY, META_PROFILE);
     private static final CV NOPAT_CV = TestUtility.createCv(
         "NOPAT",
diff --git a/gp2gp-translator/src/test/resources/xml/Observation/nopat_compound_statement_with_observation.xml b/gp2gp-translator/src/test/resources/xml/Observation/nopat_compound_statement_with_observation.xml
new file mode 100644
index 000000000..5190047d0
--- /dev/null
+++ b/gp2gp-translator/src/test/resources/xml/Observation/nopat_compound_statement_with_observation.xml
@@ -0,0 +1,148 @@
+<EhrExtract xmlns="urn:hl7-org:v3" classCode="EXTRACT" moodCode="EVN">
+    <id root="4971E7E0-693C-11EE-9D98-00155D78C707"/>
+    <statusCode code="COMPLETE"/>
+    <availabilityTime value="20231012211654"/>
+    <recordTarget typeCode="RCT">
+        <patient classCode="PAT">
+            <id root="2.16.840.1.113883.2.1.4.1" extension="9726911192"/>
+        </patient>
+    </recordTarget>
+    <author typeCode="AUT">
+        <time value="20231012211654"/>
+        <AgentOrgSDS classCode="AGNT">
+            <agentOrganizationSDS classCode="ORG" determinerCode="INSTANCE">
+                <id root="1.2.826.0.1285.0.1.10" extension="P84009"/>
+            </agentOrganizationSDS>
+        </AgentOrgSDS>
+    </author>
+    <destination typeCode="DST">
+        <AgentOrgSDS classCode="AGNT">
+            <agentOrganizationSDS classCode="ORG" determinerCode="INSTANCE">
+                <id root="1.2.826.0.1285.0.1.10" extension="B84012"/>
+            </agentOrganizationSDS>
+        </AgentOrgSDS>
+    </destination>
+    <component typeCode="COMP">
+        <ehrFolder classCode="FOLDER" moodCode="EVN">
+            <id root="4976CA5F-693C-11EE-9D98-00155D78C707"/>
+            <statusCode code="COMPLETE"/>
+            <effectiveTime>
+                <low value="20000101000000"/>
+                <high value="20231010135228"/>
+            </effectiveTime>
+            <availabilityTime value="20231012211654"/>
+            <author typeCode="AUT">
+                <time value="20231012211654"/>
+                <AgentOrgSDS classCode="AGNT">
+                    <agentOrganizationSDS classCode="ORG" determinerCode="INSTANCE">
+                        <id root="1.2.826.0.1285.0.1.10" extension="P84009"/>
+                    </agentOrganizationSDS>
+                </AgentOrgSDS>
+            </author>
+            <component typeCode="COMP">
+                <ehrComposition classCode="COMPOSITION" moodCode="EVN">
+                    <id root="4971E7E9-693C-11EE-9D98-00155D78C707"/>
+                    <code code="25671000000102" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                          displayName="Surgery Consultation Note"/>
+                    <statusCode code="COMPLETE"/>
+                    <effectiveTime>
+                        <center value="20101216000000"/>
+                    </effectiveTime>
+                    <availabilityTime value="20101216000000"/>
+                    <author typeCode="AUT" contextControlCode="OP">
+                        <time value="20220713152232"/>
+                        <agentRef classCode="AGNT">
+                            <id root="4971E7E5-693C-11EE-9D98-00155D78C707"/>
+                        </agentRef>
+                    </author>
+                    <location typeCode="LOC">
+                        <locatedEntity classCode="LOCE">
+                            <locatedPlace classCode="PLC" determinerCode="INSTANCE">
+                                <name>Testvale Surgery, GP2GPTEST</name>
+                            </locatedPlace>
+                        </locatedEntity>
+                    </location>
+                    <Participant2 typeCode="PRF" contextControlCode="OP">
+                        <agentRef classCode="AGNT">
+                            <id root="4971E7E8-693C-11EE-9D98-00155D78C707"/>
+                        </agentRef>
+                    </Participant2>
+                    <component typeCode="COMP" contextConductionInd="true">
+                      <CompoundStatement classCode="CLUSTER" moodCode="EVN">
+                        <id root="17BF2EA6-AD91-4E9C-9AD8-0421880D7B25" />
+                        <code nullFlavor="UNK">
+                          <originalText>FTX4</originalText>
+                        </code>
+                        <statusCode code="COMPLETE" />
+                        <effectiveTime>
+                          <center nullFlavor="NI" />
+                        </effectiveTime>
+                        <availabilityTime value="20100120162700" />
+                        <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" />
+                        <component typeCode="COMP">
+                            <ObservationStatement classCode="OBS" moodCode="EVN">
+                                <id root="4976CA1E-693C-11EE-9D98-00155D78C707"/>
+                                <code code="2469." codeSystem="2.16.840.1.113883.2.1.3.2.4.14"
+                                      displayName="O/E - Systolic BP reading">
+                                    <originalText>O/E - Systolic BP reading</originalText>
+                                    <translation code="72313002" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                                                 displayName="Systolic arterial pressure"/>
+                                    <translation code="2469.00" codeSystem="2.16.840.1.113883.2.1.6.2"
+                                                 displayName="O/E - Systolic BP reading"/>
+                                </code>
+                                <statusCode code="COMPLETE"/>
+                                <effectiveTime>
+                                    <center nullFlavor="NI"/>
+                                </effectiveTime>
+                                <availabilityTime value="20101216000000"/>
+                                <pertinentInformation typeCode="PERT">
+                                    <sequenceNumber value="+1"/>
+                                    <pertinentAnnotation classCode="OBS" moodCode="EVN">
+                                        <text>Value: 120.0 mm[Hg]</text>
+                                    </pertinentAnnotation>
+                                </pertinentInformation>
+                            </ObservationStatement>
+                        </component>
+                        <component typeCode="COMP">
+                            <ObservationStatement classCode="OBS" moodCode="EVN">
+                                <id root="4976CA1F-693C-11EE-9D98-00155D78C707"/>
+                                <code code="246A." codeSystem="2.16.840.1.113883.2.1.3.2.4.14"
+                                      displayName="O/E - Diastolic BP reading">
+                                    <originalText>O/E - Diastolic BP reading</originalText>
+                                    <translation code="1091811000000102" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                                                 displayName="Diastolic arterial pressure"/>
+                                    <translation code="246A.00" codeSystem="2.16.840.1.113883.2.1.6.2"
+                                                 displayName="O/E - Diastolic BP reading"/>
+                                </code>
+                                <statusCode code="COMPLETE"/>
+                                <effectiveTime>
+                                    <center nullFlavor="NI"/>
+                                </effectiveTime>
+                                <availabilityTime value="20101216000000"/>
+                                <pertinentInformation typeCode="PERT">
+                                    <sequenceNumber value="+1"/>
+                                    <pertinentAnnotation classCode="OBS" moodCode="EVN">
+                                        <text>O/E - Diastolic BP reading L&#10;Value: 90.0 mm[Hg]</text>
+                                    </pertinentAnnotation>
+                                </pertinentInformation>
+                            </ObservationStatement>
+                        </component>
+                      </CompoundStatement>
+                    </component>
+                </ehrComposition>
+            </component>
+        </ehrFolder>
+    </component>
+    <inFulfillmentOf typeCode="FLFS">
+        <priorEhrRequest classCode="EXTRACT" moodCode="RQO">
+            <id root="E1B78523-7E3D-4F08-8CEB-6589B83BBFF8"/>
+        </priorEhrRequest>
+    </inFulfillmentOf>
+    <limitation typeCode="LIMIT" inversionInd="true">
+        <limitingEhrExtractSpecification classCode="OBS" moodCode="DEF">
+            <id root="4976CA60-693C-11EE-9D98-00155D78C707"/>
+            <code code="37241000000102" codeSystem="2.16.840.1.113883.2.1.3.2.4.15"
+                  displayName="Entire record available to originator (administrative concept)"/>
+        </limitingEhrExtractSpecification>
+    </limitation>
+</EhrExtract>
\ No newline at end of file

From 7f40ca4b79568be1a2d64f168364f67768d4c502 Mon Sep 17 00:00:00 2001
From: Ole <12736698+ole4ryb@users.noreply.github.com>
Date: Mon, 12 Aug 2024 10:30:31 +0100
Subject: [PATCH 06/13] Update
 gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java

Co-authored-by: martin-nhs <127403254+martin-nhs@users.noreply.github.com>
---
 .../translator/mapper/diagnosticreport/SpecimenMapperTest.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
index bd16d62e8..4ad106ff9 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
@@ -253,7 +253,8 @@ private void assertMetaSecurityIsPresent(final Meta meta) {
             () -> assertThat(metaProfile.getValue()).isEqualTo(SPECIMEN_META_PROFILE),
             () -> assertThat(metaSecurityCoding.getCode()).isEqualTo(NOPAT_CV.getCode()),
             () -> assertThat(metaSecurityCoding.getDisplay()).isEqualTo(NOPAT_CV.getDisplayName()),
-            () -> assertThat(metaSecurityCoding.getSystem()).isEqualTo(NOPAT_CV.getCodeSystem()));
+            () -> assertThat(metaSecurityCoding.getSystem()).isEqualTo(NOPAT_CV.getCodeSystem())
+        );
     }
 
     private RCMRMT030101UKCompoundStatement getCompoundStatement(RCMRMT030101UKEhrExtract ehrExtract) {

From f28444e705c07403c9d749d8abfa66d793454a8e Mon Sep 17 00:00:00 2001
From: hospel <12736698+ole4ryb@users.noreply.github.com>
Date: Mon, 12 Aug 2024 11:56:41 +0100
Subject: [PATCH 07/13] adding test for nopat narrative statement

---
 .../SpecimenCompoundsMapper.java              |   3 +-
 .../SpecimenCompoundsMapperTest.java          | 115 ++++++++++--------
 .../diagnosticreport/SpecimenMapperTest.java  |  40 +++---
 .../specimen_user_narrative_statement.xml     |   2 +
 4 files changed, 87 insertions(+), 73 deletions(-)

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
index 072198090..c34e65d30 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
@@ -197,6 +197,7 @@ private void handleNarrativeStatements(RCMRMT030101UKCompoundStatement compoundS
                     });
             } else if (observation != null) {
                 observation.setComment(addLine(observation.getComment(), extractPmipComment(childNarrativeStatement.getText())));
+                observation.setMeta(meta);
 
                 getObservationById(observationComments, childNarrativeStatement.getId().getRoot())
                     .ifPresent(surplusObservationComments::add);
@@ -319,7 +320,7 @@ private List<RCMRMT030101UKObservationStatement> getObservationStatementsInCompo
             .toList();
     }
 
-    private List<RCMRMT030101UKNarrativeStatement> getNarrativeStatementsInCompound(
+    protected List<RCMRMT030101UKNarrativeStatement> getNarrativeStatementsInCompound(
         RCMRMT030101UKCompoundStatement compoundStatement) {
 
         return compoundStatement.getComponent()
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
index 7c8b17f69..8731ef7b9 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
@@ -104,13 +104,13 @@ public void testHandlingNoPatCompoundStatementWithObservationStatement() {
             ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE
         );
 
-        assertParentSpecimenIsReferenced(observations.get(0));
-        assertThat(observations.get(0).getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
-        assertThat(diagnosticReports.get(0).getResult()).isNotEmpty();
+        assertParentSpecimenIsReferenced(observations.getFirst());
+        assertThat(observations.getFirst().getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
+        assertThat(diagnosticReports.getFirst().getResult()).isNotEmpty();
 
-        final Reference result = diagnosticReports.get(0).getResult().get(0);
+        final Reference result = diagnosticReports.getFirst().getResult().getFirst();
 
-        assertMetaSecurityIsPresent(observations.get(0).getMeta());
+        assertMetaSecurityIsPresent(observations.getFirst().getMeta());
         assertMetaSecurityIsPresent((Meta) result.getResource().getMeta());
     }
 
@@ -128,13 +128,13 @@ public void testHandlingNoPatEhrCompositionWithObservationStatement() {
         specimenCompoundsMapper.handleSpecimenChildComponents(
             ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE);
 
-        assertParentSpecimenIsReferenced(observations.get(0));
-        assertThat(observations.get(0).getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
-        assertThat(diagnosticReports.get(0).getResult()).isNotEmpty();
+        assertParentSpecimenIsReferenced(observations.getFirst());
+        assertThat(observations.getFirst().getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
+        assertThat(diagnosticReports.getFirst().getResult()).isNotEmpty();
 
-        final Reference result = diagnosticReports.get(0).getResult().get(0);
+        final Reference result = diagnosticReports.getFirst().getResult().getFirst();
 
-        assertMetaSecurityIsPresent(observations.get(0).getMeta());
+        assertMetaSecurityIsPresent(observations.getFirst().getMeta());
         assertMetaSecurityIsPresent((Meta) result.getResource().getMeta());
     }
 
@@ -145,11 +145,11 @@ public void testHandlingFirstLevelObservationStatement() {
             ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE
         );
 
-        assertParentSpecimenIsReferenced(observations.get(0));
-        assertThat(observations.get(0).getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
-        assertThat(diagnosticReports.get(0).getResult()).isNotEmpty();
+        assertParentSpecimenIsReferenced(observations.getFirst());
+        assertThat(observations.getFirst().getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
+        assertThat(diagnosticReports.getFirst().getResult()).isNotEmpty();
 
-        final Reference result = diagnosticReports.get(0).getResult().get(0);
+        final Reference result = diagnosticReports.getFirst().getResult().getFirst();
         assertNotNull(result.getResource());
         assertThat(result.getResource().getIdElement().getValue()).isEqualTo(OBSERVATION_STATEMENT_ID);
     }
@@ -161,9 +161,9 @@ public void testHandlingSpecimenChildClusterCompoundStatement() {
             ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE
         );
 
-        final Observation observation = observations.get(0);
+        final Observation observation = observations.getFirst();
 
-        final Observation observationComment = observationComments.get(0);
+        final Observation observationComment = observationComments.getFirst();
 
         assertParentSpecimenIsReferenced(observation);
         assertThat(observation.getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
@@ -172,10 +172,10 @@ public void testHandlingSpecimenChildClusterCompoundStatement() {
         assertThat(observationComments).hasSize(2);
         assertThat(observationComment.getComment()).isEqualTo(TEST_COMMENT_LINE_1);
         assertThat(observationComment.getRelated()).isNotEmpty();
-        assertThat(observationComment.getRelated().get(0).getTarget().getResource()).isNotNull();
-        assertThat(observationComment.getRelated().get(0).getTarget().getResource().getIdElement().getValue())
+        assertThat(observationComment.getRelated().getFirst().getTarget().getResource()).isNotNull();
+        assertThat(observationComment.getRelated().getFirst().getTarget().getResource().getIdElement().getValue())
                 .isEqualTo(observation.getId());
-        assertThat(diagnosticReports.get(0).getResult().size()).isOne();
+        assertThat(diagnosticReports.getFirst().getResult().size()).isOne();
     }
 
     @Test
@@ -185,61 +185,72 @@ public void testHandlingSpecimenChildBatteryCompoundStatement() {
             ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE
         );
 
-        assertParentSpecimenIsReferenced(observations.get(0));
-        assertThat(observations.get(0).getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
+        assertParentSpecimenIsReferenced(observations.getFirst());
+        assertThat(observations.getFirst().getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
         assertParentSpecimenIsReferenced(observations.get(1));
-        assertThat(observations.get(0).getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
+        assertThat(observations.getFirst().getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
         assertThat(observationComments).hasSize(2);
-        assertThat(observationComments.get(0).getComment()).isEqualTo(TEST_COMMENT_LINE_1);
+        assertThat(observationComments.getFirst().getComment()).isEqualTo(TEST_COMMENT_LINE_1);
 
-        assertThat(diagnosticReports.get(0).getResult()).isEmpty();
+        assertThat(diagnosticReports.getFirst().getResult()).isEmpty();
         verify(specimenBatteryMapper, times(1)).mapBatteryObservation(any());
     }
 
     @Test
-    public void testHandlingUserNarrativeStatement() {
+    public void testHandlingUserNarrativeStatementWithNoPat() {
         final RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_user_narrative_statement.xml");
+        final var compoundStatement = getCompoundStatement(ehrExtract);
+        var compoundStatementWithNarrativeStatement = compoundStatement.getComponent().getFirst().getCompoundStatement();
+
+        specimenCompoundsMapper.getNarrativeStatementsInCompound(compoundStatementWithNarrativeStatement).forEach(narrativeStatement ->
+              when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+                  META_PROFILE,
+                  Optional.empty(),
+                  Optional.empty()
+              )).thenReturn(null)
+        );
+
+        specimenCompoundsMapper.getNarrativeStatementsInCompound(compoundStatementWithNarrativeStatement).forEach(narrativeStatement ->
+                when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
+                    META_PROFILE,
+                    compoundStatement.getConfidentialityCode(),
+                    narrativeStatement.getConfidentialityCode()
+                )).thenReturn(META)
+        );
+
         specimenCompoundsMapper.handleSpecimenChildComponents(
             ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE
         );
 
-        assertParentSpecimenIsReferenced(observations.get(0));
-        assertThat(observations.get(0).getIssuedElement().asStringValue()).isEqualTo("2022-03-14T18:24:45.000+00:00");
-        assertThat(observationComments).hasSize(2);
-        assertThat(observationComments.get(0).getRelated()).isNotEmpty();
-        assertThat(observationComments.get(0).getRelated()).isNotEmpty();
-        assertThat(observationComments.get(0).getRelated().get(0).getTarget().getResource()).isNotNull();
-        assertThat(observationComments.get(0).getRelated().get(0).getTarget().getResource().getIdElement().getValue())
-                .isEqualTo(observations.get(0).getId());
-        assertThat(observations.get(0).getComment()).isEqualTo(TEST_COMMENT_LINE);
+        assertMetaSecurityIsPresent(observationComments.getFirst().getMeta());
     }
 
     @Test
-    public void testHandlingNonUserNarrativeStatement() {
+    void testHandlingNonUserNarrativeStatement() {
         final RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_non_user_narrative_statement.xml");
         specimenCompoundsMapper.handleSpecimenChildComponents(
             ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE
         );
 
-        assertParentSpecimenIsReferenced(observations.get(0));
-        assertThat(observations.get(0).getIssuedElement().asStringValue()).isEqualTo("2022-03-14T18:24:45.000+00:00");
+        assertParentSpecimenIsReferenced(observations.getFirst());
+        assertThat(observations.getFirst().getIssuedElement().asStringValue()).isEqualTo("2022-03-14T18:24:45.000+00:00");
         assertThat(observationComments.size()).isOne();
-        assertThat(observations.get(0).getComment()).isEqualTo(TEST_COMMENT_LINE + "\n" + TEST_COMMENT_LINE_1);
+        assertThat(observations.getFirst().getComment()).isEqualTo(TEST_COMMENT_LINE + "\n" + TEST_COMMENT_LINE_1);
     }
 
-    @Test public void testHandlingObservationStatementWithUnkAvailabilityTime() {
+    @Test void testHandlingObservationStatementWithUnkAvailabilityTime() {
         final RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_cluster_compound_statement_availability_time_unk.xml");
 
         specimenCompoundsMapper.handleSpecimenChildComponents(
             ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE
         );
 
-        final Observation observation = observations.get(0);
+        final Observation observation = observations.getFirst();
 
         assertThat(observation.getIssuedElement().asStringValue()).isNull();
     }
 
-    @Test public void testOrderingIsPreservedForDiagnosticReportResults() {
+    @Test void testOrderingIsPreservedForDiagnosticReportResults() {
         final RCMRMT030101UKEhrExtract ehrExtract =
             unmarshallEhrExtract("specimen_with_three_test_group_headers.xml");
 
@@ -255,7 +266,7 @@ public void testHandlingNonUserNarrativeStatement() {
         doAnswer(
             answer(
                 (Answer1<Observation, SpecimenBatteryParameters>) batteryParameters -> {
-                    var id = batteryParameters.getBatteryCompoundStatement().getId().get(0).getRoot();
+                    var id = batteryParameters.getBatteryCompoundStatement().getId().getFirst().getRoot();
                     var observation = new Observation();
                     observation.setId(id);
 
@@ -275,10 +286,10 @@ public void testHandlingNonUserNarrativeStatement() {
             TEST_PRACTISE_CODE
         );
 
-        var diagnosticReport = diagnosticReports.get(0);
+        var diagnosticReport = diagnosticReports.getFirst();
 
         assertAll(
-            () -> assertThat(getReferenceId(diagnosticReport.getResult().get(0)))
+            () -> assertThat(getReferenceId(diagnosticReport.getResult().getFirst()))
                 .isEqualTo("Observation/TEST-GROUP-HEADER-1"),
             () -> assertThat(getReferenceId(diagnosticReport.getResult().get(1)))
                 .isEqualTo("OBSERVATION-STATEMENT-ID-2"),
@@ -340,8 +351,8 @@ private String getReferenceId(Reference reference) {
     private void assertMetaSecurityIsPresent(final Meta meta) {
         final List<Coding> metaSecurity = meta.getSecurity();
         final int metaSecuritySize = metaSecurity.size();
-        final Coding metaSecurityCoding = metaSecurity.get(0);
-        final UriType metaProfile = meta.getProfile().get(0);
+        final Coding metaSecurityCoding = metaSecurity.getFirst();
+        final UriType metaProfile = meta.getProfile().getFirst();
 
         assertAll(
             () -> assertThat(metaSecuritySize).isEqualTo(1),
@@ -360,16 +371,16 @@ private RCMRMT030101UKEhrExtract unmarshallEhrExtract(String fileName) {
 
     private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract ehrExtract) {
 
-        return ehrExtract.getComponent().get(0)
-            .getEhrFolder().getComponent().get(0)
+        return ehrExtract.getComponent().getFirst()
+            .getEhrFolder().getComponent().getFirst()
             .getEhrComposition();
     }
 
     private RCMRMT030101UKCompoundStatement getCompoundStatement(RCMRMT030101UKEhrExtract ehrExtract) {
-        return ehrExtract.getComponent().get(0)
-            .getEhrFolder().getComponent().get(0)
-            .getEhrComposition().getComponent().get(0)
-            .getCompoundStatement().getComponent().get(0)
+        return ehrExtract.getComponent().getFirst()
+            .getEhrFolder().getComponent().getFirst()
+            .getEhrComposition().getComponent().getFirst()
+            .getCompoundStatement().getComponent().getFirst()
             .getCompoundStatement();
     }
 
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
index bd16d62e8..5acb0ad86 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
@@ -91,7 +91,7 @@ public void testHandlingSpecimenNoPatCompoundStatement() {
 
         assertThat(specimenList).isNotEmpty();
 
-        final Specimen specimen = specimenList.get(0);
+        final Specimen specimen = specimenList.getFirst();
         checkFixedValues(specimen);
         assertMetaSecurityIsPresent(specimen.getMeta());
     }
@@ -113,13 +113,13 @@ public void testHandlingSpecimenNoPatEhrComposition() {
 
         assertThat(specimenList).isNotEmpty();
 
-        final Specimen specimen = specimenList.get(0);
+        final Specimen specimen = specimenList.getFirst();
         checkFixedValues(specimen);
         assertMetaSecurityIsPresent(specimen.getMeta());
     }
 
     @Test
-    public void testSpecimenIsMapped() {
+    void testSpecimenIsMapped() {
         when(dateTimeMapper.mapDateTime(any())).thenCallRealMethod();
         RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_valid.xml");
         final var compoundStatement = getCompoundStatement(ehrExtract);
@@ -136,16 +136,16 @@ public void testSpecimenIsMapped() {
 
         assertThat(specimenList).isNotEmpty();
 
-        final Specimen specimen = specimenList.get(0);
+        final Specimen specimen = specimenList.getFirst();
         checkFixedValues(specimen);
-        assertThat(specimen.getNote().get(0).getText()).isEqualTo(NOTE_TEXT);
+        assertThat(specimen.getNote().getFirst().getText()).isEqualTo(NOTE_TEXT);
         assertThat(specimen.getAccessionIdentifier().getValue()).isEqualTo(ACCESSION_IDENTIFIER_VALUE);
         assertThat(specimen.getType().getText()).isEqualTo(SPECIMEN_TYPE_TEXT);
         assertThat(specimen.getCollection().getCollected().toString()).isEqualTo(SPECIMEN_COLLECTED_DATETIME.toString());
     }
 
     @Test
-    public void testSpecimenIsMappedWithNoOptionalFields() {
+    void testSpecimenIsMappedWithNoOptionalFields() {
         RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_no_optional_fields.xml");
         final var compoundStatement = getCompoundStatement(ehrExtract);
 
@@ -159,23 +159,23 @@ public void testSpecimenIsMappedWithNoOptionalFields() {
             ehrExtract, List.of(DIAGNOSTIC_REPORT_WITH_SPECIMEN), PATIENT, PRACTICE_CODE
         );
 
-        Specimen specimen = specimenList.get(0);
+        Specimen specimen = specimenList.getFirst();
         assertThat(specimen.getCollection().getCollected()).isNull();
         assertThat(specimen.hasAccessionIdentifier()).isFalse();
         assertThat(specimen.getType().getText()).isNullOrEmpty();
         checkFixedValues(specimen);
     }
 
-    private void checkFixedValues(Specimen specimen) {
+    void checkFixedValues(Specimen specimen) {
         assertThat(specimen.getId()).isEqualTo(TEST_SPECIMEN_ID);
-        assertThat(specimen.getMeta().getProfile().get(0).getValue()).isEqualTo(SPECIMEN_META_PROFILE);
+        assertThat(specimen.getMeta().getProfile().getFirst().getValue()).isEqualTo(SPECIMEN_META_PROFILE);
         assertThat(specimen.getIdentifierFirstRep().getSystem()).isEqualTo(IDENTIFIER_SYSTEM);
         assertThat(specimen.getIdentifierFirstRep().getValue()).isEqualTo(TEST_SPECIMEN_ID);
         assertThat(specimen.getSubject().getResource().getIdElement().getValue()).isEqualTo(PATIENT.getId());
     }
 
     @Test
-    public void testInvalidSpecimenIsNotMapped() {
+    void testInvalidSpecimenIsNotMapped() {
         RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_invalid.xml");
         List<Specimen> specimenList = specimenMapper.mapSpecimens(
             ehrExtract, List.of(DIAGNOSTIC_REPORT_WITHOUT_SPECIMEN), PATIENT, PRACTICE_CODE
@@ -185,7 +185,7 @@ public void testInvalidSpecimenIsNotMapped() {
     }
 
     @Test
-    public void When_RemoveSurplusObservationComments_With_ChildNarrativeStatements_Expect_CommentsRemoved() {
+    void When_RemoveSurplusObservationComments_With_ChildNarrativeStatements_Expect_CommentsRemoved() {
         RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_valid.xml");
 
         var outputList = specimenMapper
@@ -201,7 +201,7 @@ public void When_RemoveSurplusObservationComments_With_ChildNarrativeStatements_
     }
 
     @Test
-    public void When_RemoveSurplusObservationComments_Without_NoChildNarrativeStatements_Expect_CommentsUnchanged() {
+    void When_RemoveSurplusObservationComments_Without_NoChildNarrativeStatements_Expect_CommentsUnchanged() {
         RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_valid_without_comment.xml");
 
         var observationComments = getObservationComments();
@@ -245,8 +245,8 @@ private static DiagnosticReport generateDiagnosticReportWithNoSpecimenReference(
     private void assertMetaSecurityIsPresent(final Meta meta) {
         final List<Coding> metaSecurity = meta.getSecurity();
         final int metaSecuritySize = metaSecurity.size();
-        final Coding metaSecurityCoding = metaSecurity.get(0);
-        final UriType metaProfile = meta.getProfile().get(0);
+        final Coding metaSecurityCoding = metaSecurity.getFirst();
+        final UriType metaProfile = meta.getProfile().getFirst();
 
         assertAll(
             () -> assertThat(metaSecuritySize).isEqualTo(1),
@@ -257,17 +257,17 @@ private void assertMetaSecurityIsPresent(final Meta meta) {
     }
 
     private RCMRMT030101UKCompoundStatement getCompoundStatement(RCMRMT030101UKEhrExtract ehrExtract) {
-        return ehrExtract.getComponent().get(0)
-            .getEhrFolder().getComponent().get(0)
-            .getEhrComposition().getComponent().get(0)
-            .getCompoundStatement().getComponent().get(0)
+        return ehrExtract.getComponent().getFirst()
+            .getEhrFolder().getComponent().getFirst()
+            .getEhrComposition().getComponent().getFirst()
+            .getCompoundStatement().getComponent().getFirst()
             .getCompoundStatement();
     }
 
     private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract ehrExtract) {
 
-        return ehrExtract.getComponent().get(0)
-            .getEhrFolder().getComponent().get(0)
+        return ehrExtract.getComponent().getFirst()
+            .getEhrFolder().getComponent().getFirst()
             .getEhrComposition();
     }
 
diff --git a/gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_user_narrative_statement.xml b/gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_user_narrative_statement.xml
index 8a3d9f847..6dbb34cb0 100644
--- a/gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_user_narrative_statement.xml
+++ b/gp2gp-translator/src/test/resources/xml/SpecimenComponents/specimen_user_narrative_statement.xml
@@ -94,6 +94,8 @@ Test Comment
 </text>
                                                     <statusCode code="COMPLETE"/>
                                                     <availabilityTime value="20220314182445"/>
+                                                    <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" />
                                                 </NarrativeStatement>
                                             </component>
                                         </CompoundStatement>

From 8eb6d112fe2b1e2e37135827c32b71e7d7e3c71e Mon Sep 17 00:00:00 2001
From: hospel <12736698+ole4ryb@users.noreply.github.com>
Date: Mon, 12 Aug 2024 14:22:50 +0100
Subject: [PATCH 08/13] code cleanup

---
 .../SpecimenCompoundsMapper.java              |  14 +-
 .../diagnosticreport/SpecimenMapper.java      |  16 +-
 .../mapper/ObservationMapperTest.java         |  12 +-
 .../DiagnosticReportMapperTest.java           | 137 +++++++-----------
 .../SpecimenCompoundsMapperTest.java          |   7 -
 .../diagnosticreport/SpecimenMapperTest.java  |  12 +-
 6 files changed, 82 insertions(+), 116 deletions(-)

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
index c34e65d30..fe19a3f4a 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapper.java
@@ -72,17 +72,17 @@ public List<Observation> handleSpecimenChildComponents(
                 continue;
             }
 
-            var currentEhrComposition = getCurrentEhrComposition(ehrExtract, diagnosticReportCompoundStatement.orElseThrow());
+            var ehrComposition = getCurrentEhrComposition(ehrExtract, diagnosticReportCompoundStatement.orElseThrow());
 
             for (var specimenCompoundStatement : getSpecimenCompoundStatements(diagnosticReportCompoundStatement.get())) {
-                handleSpecimenObservationStatement(currentEhrComposition, observations, diagnosticReport, specimenCompoundStatement);
+                handleSpecimenObservationStatement(ehrComposition, observations, diagnosticReport, specimenCompoundStatement);
 
                 var nestedSpecimenCompoundStatements = getNestedSpecimenCompoundStatements(specimenCompoundStatement);
 
                 for (var nestedSpecimenCompoundStatement : nestedSpecimenCompoundStatements) {
-                    if (CLUSTER_CLASSCODE.equals(nestedSpecimenCompoundStatement.getClassCode().get(0))) {
+                    if (CLUSTER_CLASSCODE.equals(nestedSpecimenCompoundStatement.getClassCode().getFirst())) {
                         handleClusterCompoundStatement(
-                            currentEhrComposition,
+                            ehrComposition,
                             specimenCompoundStatement,
                             nestedSpecimenCompoundStatement,
                             observations,
@@ -92,9 +92,9 @@ public List<Observation> handleSpecimenChildComponents(
                         );
                     }
 
-                    if (BATTERY_CLASSCODE.equals(nestedSpecimenCompoundStatement.getClassCode().get(0))) {
+                    if (BATTERY_CLASSCODE.equals(nestedSpecimenCompoundStatement.getClassCode().getFirst())) {
                         handleBatteryCompoundStatement(
-                            currentEhrComposition,
+                            ehrComposition,
                             specimenCompoundStatement,
                             nestedSpecimenCompoundStatement,
                             observations,
@@ -106,7 +106,7 @@ public List<Observation> handleSpecimenChildComponents(
                             .ehrExtract(ehrExtract)
                             .batteryCompoundStatement(nestedSpecimenCompoundStatement)
                             .specimenCompoundStatement(specimenCompoundStatement)
-                            .ehrComposition(currentEhrComposition)
+                            .ehrComposition(ehrComposition)
                             .diagnosticReport(diagnosticReport)
                             .patient(patient)
                             .encounters(encounters)
diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java
index 5f0bcfad9..8f1f6b42c 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java
@@ -57,8 +57,8 @@ public List<Specimen> mapSpecimens(RCMRMT030101UKEhrExtract ehrExtract, List<Dia
             .filter(Objects::nonNull)
             .distinct()
             .map(childCompoundStatement -> {
-                var currentEhrComposition = getEhrComposition(ehrExtract, childCompoundStatement);
-                return createSpecimen(currentEhrComposition, childCompoundStatement, patient, practiceCode);
+                var ehrComposition = getEhrComposition(ehrExtract, childCompoundStatement);
+                return createSpecimen(ehrComposition, childCompoundStatement, patient, practiceCode);
             })
             .toList();
     }
@@ -94,7 +94,7 @@ private Specimen createSpecimen(RCMRMT030101UKEhrComposition ehrComposition,
             specimenCompoundStatement.getConfidentialityCode());
 
         Specimen specimen = new Specimen();
-        final String id = specimenCompoundStatement.getId().get(0).getRoot();
+        final String id = specimenCompoundStatement.getId().getFirst().getRoot();
 
         specimen.addIdentifier(buildIdentifier(id, practiceCode))
                 .setSubject(new Reference(patient))
@@ -162,14 +162,14 @@ private Optional<Identifier> getAccessionIdentifier(RCMRMT030101UKCompoundStatem
     private Optional<RCMRMT030101UKSpecimenRole> getSpecimenRole(RCMRMT030101UKCompoundStatement specimenCompoundStatement) {
 
         return !specimenCompoundStatement.getSpecimen().isEmpty()
-            ? Optional.ofNullable(specimenCompoundStatement.getSpecimen().get(0).getSpecimenRole())
+            ? Optional.ofNullable(specimenCompoundStatement.getSpecimen().getFirst().getSpecimenRole())
             : Optional.empty();
     }
 
     private Optional<RCMRMT030101UKCompoundStatement> getParentCompoundStatementByChildId(
         RCMRMT030101UKEhrExtract ehrExtract, String id) {
 
-        return ehrExtract.getComponent().get(0).getEhrFolder().getComponent().stream()
+        return ehrExtract.getComponent().getFirst().getEhrFolder().getComponent().stream()
             .flatMap(component3 -> component3.getEhrComposition().getComponent().stream())
             .flatMap(CompoundStatementResourceExtractors::extractAllCompoundStatements)
             .filter(Objects::nonNull)
@@ -177,13 +177,13 @@ private Optional<RCMRMT030101UKCompoundStatement> getParentCompoundStatementByCh
                 .stream()
                 .map(RCMRMT030101UKComponent02::getCompoundStatement)
                 .filter(Objects::nonNull)
-                .anyMatch(e -> id.equals(e.getId().get(0).getRoot()))
+                .anyMatch(e -> id.equals(e.getId().getFirst().getRoot()))
             ).findFirst();
     }
 
     private List<RCMRMT030101UKCompoundStatement> findAllSpecimenCompoundStatements(RCMRMT030101UKEhrExtract ehrExtract) {
 
-        var topLevelComponents = ehrExtract.getComponent().get(0).getEhrFolder().getComponent().stream()
+        var topLevelComponents = ehrExtract.getComponent().getFirst().getEhrFolder().getComponent().stream()
             .flatMap(component3 -> component3.getEhrComposition().getComponent().stream())
             .toList();
 
@@ -201,7 +201,7 @@ private List<RCMRMT030101UKCompoundStatement> findAllSpecimenCompoundStatements(
     private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract ehrExtract,
                                                            RCMRMT030101UKCompoundStatement parentCompoundStatement) {
 
-        return ehrExtract.getComponent().get(0).getEhrFolder().getComponent()
+        return ehrExtract.getComponent().getFirst().getEhrFolder().getComponent()
             .stream()
             .filter(RCMRMT030101UKComponent3::hasEhrComposition)
             .map(RCMRMT030101UKComponent3::getEhrComposition)
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
index 8cf6c9402..107a2018a 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapperTest.java
@@ -116,7 +116,7 @@ public void mapTwoObservationsWrappedInCompoundStatementMetaSecurityWithNoPapExp
             .flatMap(component4 -> extractAllCompoundStatements(component4))
             .findFirst().get();
 
-        observationStatements.get(0).setConfidentialityCode(NOPAT_CV);
+        observationStatements.getFirst().setConfidentialityCode(NOPAT_CV);
         ehrComposition.setConfidentialityCode(NOPAT_CV);
 
         when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
@@ -145,10 +145,10 @@ public void mapObservationMetaSecurityWithNoPatWhenConfidentialityCodeIsPresentF
         var ehrExtract = unmarshallEhrExtractElement("full_valid_data_observation_example.xml");
 
         var ehrComposition = getEhrComposition(ehrExtract);
-        var observationStatement = getObservationStatement(ehrExtract);
+        ehrComposition.setConfidentialityCode(NOPAT_CV);
 
+        var observationStatement = getObservationStatement(ehrExtract);
         observationStatement.setConfidentialityCode(NOPAT_CV);
-        ehrComposition.setConfidentialityCode(NOPAT_CV);
 
         when(confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
             META_PROFILE,
@@ -157,7 +157,7 @@ public void mapObservationMetaSecurityWithNoPatWhenConfidentialityCodeIsPresentF
             Optional.empty()
         )).thenReturn(META);
 
-        var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
+        var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).getFirst();
 
         assertMetaSecurityIsPresent(observation.getMeta());
     }
@@ -359,7 +359,7 @@ public void mapObservationWithEffectiveDateTime() {
             "effective_date_time_type_using_effective_time_center.xml");
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
 
-        assertThat(observation.getEffective() instanceof DateTimeType);
+        assertTrue(observation.getEffective() instanceof DateTimeType);
         assertThat(observation.getEffectiveDateTimeType().getValueAsString()).isEqualTo("2010-05-21");
     }
 
@@ -369,7 +369,7 @@ public void mapObservationWithEffectivePeriod() {
             "effective_period_start_end_using_effective_time_observation_example.xml");
         var observation = observationMapper.mapResources(ehrExtract, patient, ENCOUNTER_LIST, PRACTISE_CODE).get(0);
 
-        assertThat(observation.getEffective() instanceof Period);
+        assertTrue(observation.getEffective() instanceof Period);
         assertThat(observation.getEffectivePeriod().getStartElement().getValueAsString()).isEqualTo("2010-05-21");
         assertThat(observation.getEffectivePeriod().getEndElement().getValueAsString()).isEqualTo("2010-05-22");
     }
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java
index dfbae6f21..28bbff4ab 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapperTest.java
@@ -7,6 +7,9 @@
 import java.nio.file.Files;
 
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 import static uk.nhs.adaptors.pss.translator.MetaFactory.MetaType.META_WITH_SECURITY;
 import static uk.nhs.adaptors.pss.translator.util.DateFormatUtil.parseToInstantType;
 import static uk.nhs.adaptors.pss.translator.util.XmlUnmarshallUtil.unmarshallString;
@@ -147,7 +150,7 @@ public void When_DiagnosticReportWithNoPatIsMapped_Expect_DiagnosticReportWithNo
         )).thenReturn(META);
 
         var diagnosticReports = diagnosticReportMapper.mapResources(ehrExtract, PATIENT, List.of(), PRACTICE_CODE);
-        var diagnosticReport = diagnosticReports.get(0);
+        var diagnosticReport = diagnosticReports.getFirst();
 
         assertMetaSecurityIsPresent(diagnosticReport.getMeta());
     }
@@ -173,7 +176,7 @@ public void When_DiagnosticReportWithNoPatEhrCompositionIsMapped_Expect_Diagnost
         )).thenReturn(META);
 
         var diagnosticReports = diagnosticReportMapper.mapResources(ehrExtract, PATIENT, List.of(), PRACTICE_CODE);
-        var diagnosticReport = diagnosticReports.get(0);
+        var diagnosticReport = diagnosticReports.getFirst();
 
         assertMetaSecurityIsPresent(diagnosticReport.getMeta());
     }
@@ -199,26 +202,18 @@ public void When_DiagnosticReportWithNoReferenceIsMapped_Expect_DiagnosticReport
         )).thenReturn(META);
 
         var diagnosticReports = diagnosticReportMapper.mapResources(ehrExtract, PATIENT, List.of(), PRACTICE_CODE);
-        var diagnosticReport = diagnosticReports.get(0);
+        var diagnosticReport = diagnosticReports.getFirst();
 
         assertAll(
-                () -> assertThat(diagnosticReport.getId())
-                        .isEqualTo(DIAGNOSTIC_REPORT_ID),
-                () -> assertThat(diagnosticReport.getMeta().getProfile().get(0).getValue())
-                        .contains(DIAGNOSTIC_REPORT_META_SUFFIX),
-                () -> assertThat(diagnosticReport.getIdentifierFirstRep().getSystem())
-                        .contains(PRACTICE_CODE),
-                () -> assertThat(diagnosticReport.getIdentifierFirstRep().getValue())
-                        .isEqualTo(DIAGNOSTIC_REPORT_ID),
-                () -> assertThat(diagnosticReport.getSubject().getResource().getIdElement().getValue())
-                        .isEqualTo(PATIENT.getId()),
-                () -> assertThat(diagnosticReport.getIssuedElement().getValueAsString())
-                        .isEqualTo(ISSUED_ELEMENT.getValueAsString()),
-                () -> assertFalse(diagnosticReport.hasContext()),
-                () -> assertThat(diagnosticReport.getSpecimen())
-                        .isEmpty(),
-                () -> assertThat(diagnosticReport.getResult())
-                        .isEmpty()
+            () -> assertThat(diagnosticReport.getId()).isEqualTo(DIAGNOSTIC_REPORT_ID),
+            () -> assertThat(diagnosticReport.getMeta().getProfile().getFirst().getValue()).contains(DIAGNOSTIC_REPORT_META_SUFFIX),
+            () -> assertThat(diagnosticReport.getIdentifierFirstRep().getSystem()).contains(PRACTICE_CODE),
+            () -> assertThat(diagnosticReport.getIdentifierFirstRep().getValue()).isEqualTo(DIAGNOSTIC_REPORT_ID),
+            () -> assertThat(diagnosticReport.getSubject().getResource().getIdElement().getValue()).isEqualTo(PATIENT.getId()),
+            () -> assertThat(diagnosticReport.getIssuedElement().getValueAsString()).isEqualTo(ISSUED_ELEMENT.getValueAsString()),
+            () -> assertFalse(diagnosticReport.hasContext()),
+            () -> assertThat(diagnosticReport.getSpecimen()).isEmpty(),
+            () -> assertThat(diagnosticReport.getResult()).isEmpty()
         );
     }
 
@@ -236,13 +231,11 @@ public void When_DiagnosticReportContainsIdExtensionWithPMIPOid_Expect_MappedExt
         var ehrExtract = unmarshallEhrExtractFromXmlString(inputXml);
 
         var diagnosticReports = diagnosticReportMapper.mapResources(ehrExtract, PATIENT, List.of(), PRACTICE_CODE);
-        var actualPMIPExtension = diagnosticReports.get(0).getIdentifier().get(1);
+        var actualPMIPExtension = diagnosticReports.getFirst().getIdentifier().get(1);
 
         assertAll(
-                () -> assertThat(actualPMIPExtension.getSystem())
-                        .isEqualTo("urn:oid:2.16.840.1.113883.2.1.4.5.5"),
-                () -> assertThat(actualPMIPExtension.getValue())
-                        .isEqualTo("TEST_PMIP_EXTENSION_VALUE")
+            () -> assertThat(actualPMIPExtension.getSystem()).isEqualTo("urn:oid:2.16.840.1.113883.2.1.4.5.5"),
+            () -> assertThat(actualPMIPExtension.getValue()).isEqualTo("TEST_PMIP_EXTENSION_VALUE")
         );
     }
 
@@ -265,13 +258,11 @@ public void When_DiagnosticReportWithSpecimenIsMapped_Expect_DiagnosticReportCon
         var ehrExtract = unmarshallEhrExtractFromXmlString(inputXml);
 
         var diagnosticReports = diagnosticReportMapper.mapResources(ehrExtract, PATIENT, List.of(), PRACTICE_CODE);
-        var diagnosticReport = diagnosticReports.get(0);
+        var diagnosticReport = diagnosticReports.getFirst();
 
         assertAll(
-                () -> assertThat(diagnosticReport.getSpecimen())
-                        .isNotEmpty(),
-                () -> assertThat(diagnosticReport.getSpecimenFirstRep().getReference())
-                        .contains(COMPOUND_STATEMENT_CHILD_ID)
+            () -> assertThat(diagnosticReport.getSpecimen()).isNotEmpty(),
+            () -> assertThat(diagnosticReport.getSpecimenFirstRep().getReference()).contains(COMPOUND_STATEMENT_CHILD_ID)
         );
     }
 
@@ -303,13 +294,11 @@ public void When_DiagnosticReportContainsUnknownCommentType_Expect_ResultReferen
         var ehrExtract = unmarshallEhrExtractFromXmlString(inputXml);
 
         var diagnosticReports = diagnosticReportMapper.mapResources(ehrExtract, PATIENT, List.of(), PRACTICE_CODE);
-        var diagnosticReport = diagnosticReports.get(0);
+        var diagnosticReport = diagnosticReports.getFirst();
 
         assertAll(
-                () -> assertThat(diagnosticReport.getResult())
-                        .hasSize(1),
-                () -> assertThat(diagnosticReport.getResultFirstRep().getReference())
-                        .contains(NARRATIVE_STATEMENT_ID_2)
+            () -> assertThat(diagnosticReport.getResult()).hasSize(1),
+            () -> assertThat(diagnosticReport.getResultFirstRep().getReference()).contains(NARRATIVE_STATEMENT_ID_2)
         );
     }
 
@@ -341,13 +330,11 @@ public void When_DiagnosticReportContainsUserCommentType_Expect_ResultReferenceI
         var ehrExtract = unmarshallEhrExtractFromXmlString(inputXml);
 
         var diagnosticReports = diagnosticReportMapper.mapResources(ehrExtract, PATIENT, List.of(), PRACTICE_CODE);
-        var diagnosticReport = diagnosticReports.get(0);
+        var diagnosticReport = diagnosticReports.getFirst();
 
         assertAll(
-                () -> assertThat(diagnosticReport.getResult())
-                        .hasSize(1),
-                () -> assertThat(diagnosticReport.getResultFirstRep().getReference())
-                        .contains(NARRATIVE_STATEMENT_ID_2)
+            () -> assertThat(diagnosticReport.getResult()).hasSize(1),
+            () -> assertThat(diagnosticReport.getResultFirstRep().getReference()).contains(NARRATIVE_STATEMENT_ID_2)
         );
     }
 
@@ -387,12 +374,9 @@ public void When_DiagnosticReportContainsChildObservationComment_Expect_Observat
         diagnosticReportMapper.handleChildObservationComments(ehrExtract, observationComments);
 
         assertAll(
-                () -> assertThat(observationComments)
-                        .hasSize(1),
-                () -> assertThat(observationComments.get(0).hasEffective())
-                        .isFalse(),
-                () -> assertThat(observationComments.get(0).getComment())
-                        .isEqualTo(NARRATIVE_STATEMENT_2_TEXT)
+            () -> assertThat(observationComments).hasSize(1),
+            () -> assertFalse(observationComments.getFirst().hasEffective()),
+            () -> assertThat(observationComments.getFirst().getComment()).isEqualTo(NARRATIVE_STATEMENT_2_TEXT)
         );
     }
 
@@ -409,7 +393,7 @@ public void When_DiagnosticReportWithSomeNarativeStatements_Expect_DiagnosticRep
             PATIENT,
             createEncounterList(),
             PRACTICE_CODE);
-        var diagnosticReport = diagnosticReports.get(0);
+        var diagnosticReport = diagnosticReports.getFirst();
 
         assertThat(diagnosticReport.getResult()).map(r -> r.getReference())
                 .isEqualTo(List.of("Observation/3E1A4EA2-661B-4467-8843-6A6B21DEF14F",
@@ -440,15 +424,12 @@ public void When_MappingDiagnosticReport_Expect_DiagnosticReportContainsContextR
                 PATIENT,
                 createEncounterList(),
                 PRACTICE_CODE);
-        var diagnosticReport = diagnosticReports.get(0);
+        var diagnosticReport = diagnosticReports.getFirst();
 
         assertAll(
-                () -> assertThat(diagnosticReport.hasContext())
-                        .isTrue(),
-                () -> assertThat(diagnosticReport.getContext().getResource())
-                        .isNotNull(),
-                () -> assertThat(diagnosticReport.getContext().getResource().getIdElement().getValue())
-                        .isEqualTo(ENCOUNTER_ID)
+            () -> assertTrue(diagnosticReport.hasContext()),
+            () -> assertNotNull(diagnosticReport.getContext().getResource()),
+            () -> assertThat(diagnosticReport.getContext().getResource().getIdElement().getValue()).isEqualTo(ENCOUNTER_ID)
         );
     }
 
@@ -495,13 +476,11 @@ public void When_DiagnosticReportIsMapped_Expect_LaboratoryResultCommentsAreMapp
                 PATIENT,
                 createEncounterList(),
                 PRACTICE_CODE);
-        var diagnosticReport = diagnosticReports.get(0);
+        var diagnosticReport = diagnosticReports.getFirst();
 
         assertAll(
-                () -> assertThat(diagnosticReport.hasConclusion())
-                        .isTrue(),
-                () -> assertThat(diagnosticReport.getConclusion())
-                        .isEqualTo(CONCLUSION_FIELD_TEXT)
+            () -> assertTrue(diagnosticReport.hasConclusion()),
+            () -> assertThat(diagnosticReport.getConclusion()).isEqualTo(CONCLUSION_FIELD_TEXT)
         );
     }
 
@@ -559,13 +538,11 @@ public void When_MappingWithUserCommentInBattery_Expect_DiagnosticReportToRefere
                 PRACTICE_CODE,
                 new ArrayList<>(Collections.singleton(batteryLevelFilingComment)));
 
-        final var diagnosticReport = diagnosticReports.get(0);
+        final var diagnosticReport = diagnosticReports.getFirst();
 
         assertAll(
-                () -> assertThat(diagnosticReport.getResult())
-                        .hasSize(1),
-                () -> assertThat(diagnosticReport.getResult().get(0).getReference())
-                        .isEqualTo(expectedReference)
+            () -> assertThat(diagnosticReport.getResult()).hasSize(1),
+            () -> assertThat(diagnosticReport.getResult().getFirst().getReference()).isEqualTo(expectedReference)
         );
     }
 
@@ -623,16 +600,14 @@ public void When_MappingWithUserCommentInBattery_Expect_NewFilingCommentObservat
                 observationComments);
 
         assertAll(
-                () -> assertThat(observationComments)
-                        .hasSize(2),
-                () -> assertThat(observationComments.get(1).getId())
-                        .isEqualTo(NEW_OBSERVATION_ID),
-                () -> assertThat(observationComments.get(1).getIdentifierFirstRep().getValue())
-                        .isEqualTo(NEW_OBSERVATION_ID),
-                () -> assertThat(observationComments.get(1).getEffectiveDateTimeType().getValueAsString())
-                        .isEqualTo("2024-01-01"),
-                () -> assertThat(observationComments.get(1).getComment()).isNull(),
-                () -> assertThat(observationComments.get(1).getStatus()).isEqualTo(UNKNOWN)
+            () -> assertThat(observationComments).hasSize(2),
+            () -> assertThat(observationComments.get(1).getId()).isEqualTo(NEW_OBSERVATION_ID),
+            () -> assertThat(observationComments.get(1).getIdentifierFirstRep().getValue())
+                .isEqualTo(NEW_OBSERVATION_ID),
+            () -> assertThat(observationComments.get(1).getEffectiveDateTimeType().getValueAsString())
+                .isEqualTo("2024-01-01"),
+            () -> assertNull(observationComments.get(1).getComment()),
+            () -> assertThat(observationComments.get(1).getStatus()).isEqualTo(UNKNOWN)
         );
     }
 
@@ -661,9 +636,9 @@ private Observation createBatteryLevelFilingComment() {
     }
 
     private RCMRMT030101UKCompoundStatement getCompoundStatement(RCMRMT030101UKEhrExtract ehrExtract) {
-        return ehrExtract.getComponent().get(0)
-            .getEhrFolder().getComponent().get(0)
-            .getEhrComposition().getComponent().get(0)
+        return ehrExtract.getComponent().getFirst()
+            .getEhrFolder().getComponent().getFirst()
+            .getEhrComposition().getComponent().getFirst()
             .getCompoundStatement();
     }
 
@@ -674,8 +649,8 @@ private List<Encounter> createEncounterList() {
     private void assertMetaSecurityIsPresent(final Meta meta) {
         final List<Coding> metaSecurity = meta.getSecurity();
         final int metaSecuritySize = metaSecurity.size();
-        final Coding metaSecurityCoding = metaSecurity.get(0);
-        final UriType metaProfile = meta.getProfile().get(0);
+        final Coding metaSecurityCoding = metaSecurity.getFirst();
+        final UriType metaProfile = meta.getProfile().getFirst();
 
         assertAll(
             () -> assertThat(metaSecuritySize).isEqualTo(1),
@@ -691,8 +666,8 @@ private RCMRMT030101UKEhrExtract unmarshallEhrExtractFromXmlString(String xmlStr
     }
 
     private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract ehrExtract) {
-        return ehrExtract.getComponent().get(0)
-            .getEhrFolder().getComponent().get(0)
+        return ehrExtract.getComponent().getFirst()
+            .getEhrFolder().getComponent().getFirst()
             .getEhrComposition();
     }
 
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
index 8731ef7b9..044d73716 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenCompoundsMapperTest.java
@@ -104,10 +104,6 @@ public void testHandlingNoPatCompoundStatementWithObservationStatement() {
             ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE
         );
 
-        assertParentSpecimenIsReferenced(observations.getFirst());
-        assertThat(observations.getFirst().getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
-        assertThat(diagnosticReports.getFirst().getResult()).isNotEmpty();
-
         final Reference result = diagnosticReports.getFirst().getResult().getFirst();
 
         assertMetaSecurityIsPresent(observations.getFirst().getMeta());
@@ -128,9 +124,6 @@ public void testHandlingNoPatEhrCompositionWithObservationStatement() {
         specimenCompoundsMapper.handleSpecimenChildComponents(
             ehrExtract, observations, observationComments, diagnosticReports, PATIENT, List.of(), TEST_PRACTISE_CODE);
 
-        assertParentSpecimenIsReferenced(observations.getFirst());
-        assertThat(observations.getFirst().getIssuedElement().asStringValue()).isEqualTo("2010-02-25T15:41:00.000+00:00");
-        assertThat(diagnosticReports.getFirst().getResult()).isNotEmpty();
 
         final Reference result = diagnosticReports.getFirst().getResult().getFirst();
 
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
index d61d433ee..e263679f3 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
@@ -57,7 +57,7 @@ public class SpecimenMapperTest {
     private static final DiagnosticReport DIAGNOSTIC_REPORT_WITH_SPECIMEN = generateDiagnosticReportWithSpecimenReference();
     private static final DiagnosticReport DIAGNOSTIC_REPORT_WITHOUT_SPECIMEN = generateDiagnosticReportWithNoSpecimenReference();
     private static final String SPECIMEN_META_PROFILE = "Specimen-1";
-    private static final Meta META = MetaFactory.getMetaFor(META_WITH_SECURITY, SPECIMEN_META_PROFILE);
+    private static final Meta META_WITH_SECURITY_ADDED = MetaFactory.getMetaFor(META_WITH_SECURITY, SPECIMEN_META_PROFILE);
     private static final CV NOPAT_CV = TestUtility.createCv(
         "NOPAT",
         "http://hl7.org/fhir/v3/ActCode",
@@ -84,7 +84,7 @@ public void testHandlingSpecimenNoPatCompoundStatement() {
             SPECIMEN_META_PROFILE,
             Optional.empty(),
             compoundStatement.getConfidentialityCode()
-        )).thenReturn(META);
+        )).thenReturn(META_WITH_SECURITY_ADDED);
 
         List<Specimen> specimenList = specimenMapper.mapSpecimens(
             ehrExtract, List.of(DIAGNOSTIC_REPORT_WITH_SPECIMEN), PATIENT, PRACTICE_CODE);
@@ -106,15 +106,13 @@ public void testHandlingSpecimenNoPatEhrComposition() {
             SPECIMEN_META_PROFILE,
             ehrComposition.getConfidentialityCode(),
             Optional.empty()
-        )).thenReturn(META);
+        )).thenReturn(META_WITH_SECURITY_ADDED);
 
         List<Specimen> specimenList = specimenMapper.mapSpecimens(
             ehrExtract, List.of(DIAGNOSTIC_REPORT_WITH_SPECIMEN), PATIENT, PRACTICE_CODE);
 
         assertThat(specimenList).isNotEmpty();
-
         final Specimen specimen = specimenList.getFirst();
-        checkFixedValues(specimen);
         assertMetaSecurityIsPresent(specimen.getMeta());
     }
 
@@ -128,7 +126,7 @@ void testSpecimenIsMapped() {
             SPECIMEN_META_PROFILE,
             Optional.empty(),
             compoundStatement.getConfidentialityCode()
-        )).thenReturn(META);
+        )).thenReturn(META_WITH_SECURITY_ADDED);
 
         List<Specimen> specimenList = specimenMapper.mapSpecimens(
             ehrExtract, List.of(DIAGNOSTIC_REPORT_WITH_SPECIMEN), PATIENT, PRACTICE_CODE
@@ -153,7 +151,7 @@ void testSpecimenIsMappedWithNoOptionalFields() {
             SPECIMEN_META_PROFILE,
             Optional.empty(),
             compoundStatement.getConfidentialityCode()
-        )).thenReturn(META);
+        )).thenReturn(META_WITH_SECURITY_ADDED);
 
         List<Specimen> specimenList = specimenMapper.mapSpecimens(
             ehrExtract, List.of(DIAGNOSTIC_REPORT_WITH_SPECIMEN), PATIENT, PRACTICE_CODE

From e92d21f0740d6f544c9df3b4bb2e0feab7f3943b Mon Sep 17 00:00:00 2001
From: hospel <12736698+ole4ryb@users.noreply.github.com>
Date: Mon, 12 Aug 2024 14:37:07 +0100
Subject: [PATCH 09/13] changelog update

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d91be773..2db5949a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,6 +20,8 @@ corresponding FHIR resource will now be [appropriately populated][nopat-docs].
     corresponding FHIR resource will now be [appropriately populated][nopat-docs].
 * If a `bloodPressure` record includes a `confidentialityCode`, the `meta.security` field of the
     corresponding FHIR resource will now be [appropriately populated][nopat-docs].
+* If a `Observation`,  `Specimen`, `DiagnosticReport` record includes a `confidentialityCode`, the `meta.security` field of the
+  corresponding FHIR resource will now be [appropriately populated][nopat-docs].
 
 ### Fixed
 * Resolved issue where the SNOMED import script would reject a password containing a '%' character.

From 6d629c9e25fde72b811e4b955f41d60c867020a0 Mon Sep 17 00:00:00 2001
From: Ole <12736698+ole4ryb@users.noreply.github.com>
Date: Mon, 12 Aug 2024 14:43:15 +0100
Subject: [PATCH 10/13] Update CHANGELOG.md

Co-authored-by: martin-nhs <127403254+martin-nhs@users.noreply.github.com>
---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2db5949a3..978889b07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -20,7 +20,7 @@ corresponding FHIR resource will now be [appropriately populated][nopat-docs].
     corresponding FHIR resource will now be [appropriately populated][nopat-docs].
 * If a `bloodPressure` record includes a `confidentialityCode`, the `meta.security` field of the
     corresponding FHIR resource will now be [appropriately populated][nopat-docs].
-* If a `Observation`,  `Specimen`, `DiagnosticReport` record includes a `confidentialityCode`, the `meta.security` field of the
+* If a `Observation`, `Specimen`, `DiagnosticReport` record includes a `confidentialityCode`, the `meta.security` field of the
   corresponding FHIR resource will now be [appropriately populated][nopat-docs].
 
 ### Fixed

From fd5fee2df7b23e3a3f2b1cfb2b3a30f643bdd920 Mon Sep 17 00:00:00 2001
From: hospel <12736698+ole4ryb@users.noreply.github.com>
Date: Mon, 12 Aug 2024 15:04:16 +0100
Subject: [PATCH 11/13] optimization using method reference

---
 .../adaptors/pss/translator/mapper/ObservationMapper.java    | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
index 9d62ec883..3681e3e3c 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
@@ -30,6 +30,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import uk.nhs.adaptors.pss.translator.service.ConfidentialityService;
+import uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors;
 import uk.nhs.adaptors.pss.translator.util.DatabaseImmunizationChecker;
 import uk.nhs.adaptors.pss.translator.util.DegradedCodeableConcepts;
 
@@ -44,8 +45,6 @@
 import java.util.stream.Stream;
 
 import static org.hl7.fhir.dstu3.model.Observation.ObservationStatus.FINAL;
-
-import static uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors.extractAllCompoundStatements;
 import static uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors.extractAllObservationStatementsWithoutAllergiesAndBloodPressures;
 import static uk.nhs.adaptors.pss.translator.util.CompoundStatementResourceExtractors.extractAllRequestStatements;
 import static uk.nhs.adaptors.pss.translator.util.ObservationUtil.getEffective;
@@ -106,7 +105,7 @@ private Observation mapObservation(RCMRMT030101UKEhrComposition ehrComposition,
         var compoundStatement = ehrComposition
             .getComponent()
             .stream()
-            .flatMap(component4 -> extractAllCompoundStatements(component4))
+            .flatMap(CompoundStatementResourceExtractors::extractAllCompoundStatements)
             .filter(Objects::nonNull)
             .findFirst().orElseGet(RCMRMT030101UKCompoundStatement::new);
 

From 0674d8116c7842dd7ea8526271c54d169a051f9c Mon Sep 17 00:00:00 2001
From: hospel <12736698+ole4ryb@users.noreply.github.com>
Date: Mon, 12 Aug 2024 16:34:40 +0100
Subject: [PATCH 12/13] pr review fixes

---
 .../diagnosticreport/DiagnosticReportMapper.java       |  4 ++--
 .../mapper/diagnosticreport/SpecimenMapper.java        | 10 +++++-----
 .../mapper/diagnosticreport/SpecimenMapperTest.java    |  4 +---
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java
index 728ad1624..e24b7fbe0 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/DiagnosticReportMapper.java
@@ -51,7 +51,7 @@
 @RequiredArgsConstructor(onConstructor = @__(@Autowired))
 public class DiagnosticReportMapper extends AbstractMapper<DiagnosticReport> {
     private static final String PMIP_EXTENSION_IDENTIFIER_ROOT = "2.16.840.1.113883.2.1.4.5.5";
-    private static final String META_PROFILE_URL_SUFFIX = "DiagnosticReport-1";
+    private static final String META_PROFILE = "DiagnosticReport-1";
     public static final String CODING_CODE = "721981007";
     public static final String CODING_SYSTEM = "http://snomed.info/sct";
     public static final String CODING_DISPLAY = "Diagnostic studies report";
@@ -128,7 +128,7 @@ private DiagnosticReport createDiagnosticReport(RCMRMT030101UKCompoundStatement
         final String id = compoundStatement.getId().get(0).getRoot();
 
         var meta = confidentialityService.createMetaAndAddSecurityIfConfidentialityCodesPresent(
-            META_PROFILE_URL_SUFFIX,
+            META_PROFILE,
             composition.getConfidentialityCode(),
             compoundStatement.getConfidentialityCode());
 
diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java
index 8f1f6b42c..5c27dbab7 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapper.java
@@ -205,10 +205,10 @@ private RCMRMT030101UKEhrComposition getEhrComposition(RCMRMT030101UKEhrExtract
             .stream()
             .filter(RCMRMT030101UKComponent3::hasEhrComposition)
             .map(RCMRMT030101UKComponent3::getEhrComposition)
-            .filter(e -> e.getComponent()
-                        .stream()
-                        .flatMap(CompoundStatementResourceExtractors::extractAllCompoundStatements)
-                        .anyMatch(parentCompoundStatement::equals)
-                   ).findFirst().get();
+            .filter(ehrComposition -> ehrComposition.getComponent()
+                                                    .stream()
+                                                    .flatMap(CompoundStatementResourceExtractors::extractAllCompoundStatements)
+                                                    .anyMatch(parentCompoundStatement::equals))
+            .findFirst().get();
     }
 }
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
index e263679f3..c8e3d480d 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
@@ -75,7 +75,7 @@ public class SpecimenMapperTest {
     private SpecimenMapper specimenMapper;
 
     @Test
-    public void testHandlingSpecimenNoPatCompoundStatement() {
+    public void testThatSpecimenIsPopulatedWithMetaSecurityWhenNoPatCompoundStatement() {
         when(dateTimeMapper.mapDateTime(any())).thenCallRealMethod();
         RCMRMT030101UKEhrExtract ehrExtract = unmarshallEhrExtract("specimen_valid_with_nopat_compound_statement.xml");
         final var compoundStatement = getCompoundStatement(ehrExtract);
@@ -90,9 +90,7 @@ public void testHandlingSpecimenNoPatCompoundStatement() {
             ehrExtract, List.of(DIAGNOSTIC_REPORT_WITH_SPECIMEN), PATIENT, PRACTICE_CODE);
 
         assertThat(specimenList).isNotEmpty();
-
         final Specimen specimen = specimenList.getFirst();
-        checkFixedValues(specimen);
         assertMetaSecurityIsPresent(specimen.getMeta());
     }
 

From ca9e9ff1d908658135c9796054ada2bc167f81dd Mon Sep 17 00:00:00 2001
From: hospel <12736698+ole4ryb@users.noreply.github.com>
Date: Tue, 13 Aug 2024 10:31:24 +0100
Subject: [PATCH 13/13] code refactoring

---
 .../pss/translator/mapper/ObservationMapper.java       | 10 +++++++---
 .../mapper/diagnosticreport/SpecimenMapperTest.java    |  8 +-------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
index 3681e3e3c..b0d73dce8 100644
--- a/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
+++ b/gp2gp-translator/src/main/java/uk/nhs/adaptors/pss/translator/mapper/ObservationMapper.java
@@ -144,9 +144,7 @@ private Observation mapObservation(RCMRMT030101UKEhrComposition ehrComposition,
                 observationStatement.getPertinentInformation(),
                 observationStatement.getSubject(),
                 observationStatement.getCode(),
-                Optional.of(Optional.ofNullable(observationStatement.getCode())
-                            .map(CD::getQualifier)
-                            .orElse(Collections.emptyList()))
+                Optional.of(getQualifiers(observationStatement))
             ))
             .setReferenceRange(getReferenceRange(observationStatement.getReferenceRange()))
             .setSubject(new Reference(patient))
@@ -156,6 +154,12 @@ private Observation mapObservation(RCMRMT030101UKEhrComposition ehrComposition,
         return (Observation) observation;
     }
 
+    private static @NotNull List<CR> getQualifiers(RCMRMT030101UKObservationStatement observationStatement) {
+        return Optional.ofNullable(observationStatement.getCode())
+            .map(CD::getQualifier)
+            .orElse(Collections.emptyList());
+    }
+
     private Observation mapObservationFromRequestStatement(RCMRMT030101UKEhrComposition ehrComposition,
                                                            RCMRMT030101UKRequestStatement requestStatement, Patient patient,
                                                            List<Encounter> encounters, String practiseCode) {
diff --git a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
index c8e3d480d..b723e264c 100644
--- a/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
+++ b/gp2gp-translator/src/test/java/uk/nhs/adaptors/pss/translator/mapper/diagnosticreport/SpecimenMapperTest.java
@@ -23,7 +23,6 @@
 import org.hl7.fhir.dstu3.model.Patient;
 import org.hl7.fhir.dstu3.model.Reference;
 import org.hl7.fhir.dstu3.model.Specimen;
-import org.hl7.fhir.dstu3.model.UriType;
 import org.hl7.v3.CV;
 import org.hl7.v3.RCMRMT030101UKCompoundStatement;
 import org.hl7.v3.RCMRMT030101UKEhrComposition;
@@ -241,15 +240,10 @@ private static DiagnosticReport generateDiagnosticReportWithNoSpecimenReference(
     private void assertMetaSecurityIsPresent(final Meta meta) {
         final List<Coding> metaSecurity = meta.getSecurity();
         final int metaSecuritySize = metaSecurity.size();
-        final Coding metaSecurityCoding = metaSecurity.getFirst();
-        final UriType metaProfile = meta.getProfile().getFirst();
 
         assertAll(
             () -> assertThat(metaSecuritySize).isEqualTo(1),
-            () -> assertThat(metaProfile.getValue()).isEqualTo(SPECIMEN_META_PROFILE),
-            () -> assertThat(metaSecurityCoding.getCode()).isEqualTo(NOPAT_CV.getCode()),
-            () -> assertThat(metaSecurityCoding.getDisplay()).isEqualTo(NOPAT_CV.getDisplayName()),
-            () -> assertThat(metaSecurityCoding.getSystem()).isEqualTo(NOPAT_CV.getCodeSystem())
+            () -> assertThat(meta).usingRecursiveComparison().isEqualTo(META_WITH_SECURITY_ADDED)
         );
     }