adding test coverage

Author: ORybak5

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

@@ -120,12 +120,15 @@ private String mapTopicListToComponent(ListResource topicList) {
                 + "Topic (EHR)", topicList.getId()));
         }
 
+        var confidentialityCode = confidentialityService.generateConfidentialityCode(topicList);
+
         return buildCompoundStatement(
             topicList,
             TOPIC.getCode(),
             prepareCdForTopic(topicList),
             false,
-            mapTopicListComponents(topicList)
+            mapTopicListComponents(topicList),
+            confidentialityCode
         );
     }
 
@@ -164,7 +167,8 @@ private String mapCategoryListToComponent(ListResource categoryList) {
             CATEGORY.getCode(),
             prepareCdForCategory(categoryList),
             true,
-            mapListResourceToComponents(categoryList)
+            mapListResourceToComponents(categoryList),
+            Optional.empty()
         );
     }
 
@@ -196,7 +200,8 @@ private String mapUncategorizedResources(ListResource topicList) {
             CATEGORY.getCode(),
             codeableConceptCdMapper.getCdForCategory(),
             true,
-            components
+            components,
+            Optional.empty()
         );
     }
 
@@ -409,9 +414,8 @@ private String buildCompoundStatement(
         String classCode,
         String compoundStatementCode,
         boolean nested,
-        String components) {
-
-        var confidentialityCode = confidentialityService.generateConfidentialityCode(topicList);
+        String components,
+        Optional<String> confidentialityCode) {
 
         if (StringUtils.isEmpty(components)) {
             return StringUtils.EMPTY;

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

@@ -7,6 +7,9 @@
             {{{effectiveTime}}}
         </effectiveTime>
         {{{availabilityTime}}}
+        {{#confidentialityCode}}
+            {{{confidentialityCode}}}
+        {{/confidentialityCode}}
         {{{components}}}
     </CompoundStatement>
 </component>

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

@@ -5,6 +5,7 @@
 import org.hl7.fhir.dstu3.model.CodeableConcept;
 import org.hl7.fhir.dstu3.model.Encounter;
 import org.hl7.fhir.dstu3.model.IdType;
+import org.hl7.fhir.dstu3.model.ListResource;
 import org.hl7.fhir.dstu3.model.QuestionnaireResponse;
 import org.hl7.fhir.dstu3.model.Reference;
 import org.hl7.fhir.dstu3.model.Resource;
@@ -54,6 +55,7 @@ public class EncounterComponentsMapperTest {
     private static final String TEST_DIRECTORY = "/ehr/mapper/encountercomponents/";
     private static final String INPUT_BUNDLE_WITH_ALL_MAPPERS_USED = TEST_DIRECTORY + "input-bundle-1.json";
     private static final String EXPECTED_COMPONENTS_MAPPED_WITH_ALL_MAPPERS_USED = TEST_DIRECTORY + "expected-components-1.xml";
+    private static final String EXPECTED_COMPONENTS_MAPPED_WITH_NOPAT = TEST_DIRECTORY + "expected-components-with-nopat.xml";
     private static final String INPUT_BUNDLE_WITH_EMPTY_CONSULTATION_LIST = TEST_DIRECTORY + "input-bundle-2.json";
     private static final String INPUT_BUNDLE_WITH_EMPTY_TOPIC_LIST = TEST_DIRECTORY + "input-bundle-3.json";
     private static final String INPUT_BUNDLE_WITH_EMPTY_CATEGORY_LIST = TEST_DIRECTORY + "input-bundle-4.json";
@@ -63,6 +65,7 @@ public class EncounterComponentsMapperTest {
     private static final String INPUT_BUNDLE_WITH_NON_TOPIC_CONSULTATION_LIST_ENTRY = TEST_DIRECTORY + "input-bundle-8.json";
     private static final String INPUT_BUNDLE_WITH_UNSUPPORTED_RESOURCES = TEST_DIRECTORY + "input-bundle-9-unsupported-resource.json";
     private static final String INPUT_BUNDLE_WITH_IGNORED_RESOURCE = TEST_DIRECTORY + "input-bundle-10-ignored-resource.json";
+    private static final String INPUT_BUNDLE_WITH_META_SECURITY = TEST_DIRECTORY + "input-bundle-10-with-meta.json";
     private static final String INPUT_BUNDLE_WITH_NON_CATEGORY_TOPIC_LIST_ENTRY = TEST_DIRECTORY
         + "input-bundle-11-invalid-category-list.json";
     private static final String INPUT_BUNDLE_WITH_RELATED_PROBLEM_IN_TOPIC = TEST_DIRECTORY + "input-bundle-12-related-problem.json";
@@ -270,6 +273,18 @@ public void When_MappingEncounterComponents_Expect_IgnoredResourceNotMapped() {
         assertThat(mappedXml).isEqualToIgnoringWhitespace(expectedXml);
     }
 
+    @Test
+    public void When_EncounterComponentsIncludeListWithMetaSecurity_Expect_CompoundStatementWithNOPAT() {
+        String expectedXml = ResourceTestFileUtils.getFileContent(EXPECTED_COMPONENTS_MAPPED_WITH_NOPAT);
+
+        var bundle = initializeMessageContext(INPUT_BUNDLE_WITH_META_SECURITY);
+        var encounter = extractEncounter(bundle);
+        when(confidentialityService.generateConfidentialityCode(any(ListResource.class))).thenReturn(Optional.of(CONFIDENTIALITY_CODE));
+
+        String mappedXml = encounterComponentsMapper.mapComponents(encounter);
+        assertThat(mappedXml).isEqualToIgnoringWhitespace(expectedXml);
+    }
+
     @ParameterizedTest
     @MethodSource("emptyResult")
     public void When_MappingEncounterComponents_Expect_NoResourceMapped(String inputJsonPath) {