AllergyMapper: Add confidentialityCode to ObservationStatement (#1098)

Incumbents don't appear to be accepting the confidentialityCode
as it is currently sent, which is only on the CompoundStatement.

Also add the confidentialityCode to the ObservationStatement too,
which causes both incumbent suppliers to accept that the Allergy
shouldn't appear on the patients online record.

Author: Adrian Clay

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

@@ -19,6 +19,9 @@
                     {{{effectiveTime}}}
                 </effectiveTime>
                 {{{availabilityTime}}}
+                {{#confidentialityCode}}
+                    {{{confidentialityCode}}}
+                {{/confidentialityCode}}
                 <pertinentInformation typeCode="PERT">
                     <sequenceNumber value="+1"/>
                     <pertinentAnnotation classCode="OBS" moodCode="EVN">

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

@@ -29,6 +29,7 @@
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
 
+import org.springframework.util.StringUtils;
 import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
 import uk.nhs.adaptors.gp2gp.common.service.FhirParseService;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
@@ -248,6 +249,9 @@ public void When_ConfidentialityServiceReturnsConfidentialityCode_Expect_Message
         final var message = allergyStructureMapper.mapAllergyIntoleranceToAllergyStructure(allergyIntolerance);
 
         assertThat(message).contains(CONFIDENTIALITY_CODE);
+        assertThat(StringUtils.countOccurrencesOf(message, CONFIDENTIALITY_CODE))
+            .withFailMessage("<confidentialityCode /> should appear within both the CompoundStatement and ObservationStatement")
+            .isEqualTo(2);
     }
 
     @Test