NHSDigital
diff --git a/‎service/build.gradle‎
Lines changed: 1 addition & 0 deletions b/‎service/build.gradle‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/AgentDirectoryMapperTest.java‎
Lines changed: 60 additions & 49 deletions b/‎service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/AgentDirectoryMapperTest.java‎
Lines changed: 60 additions & 49 deletions
diff --git a/‎service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/AgentPersonMapperTest.java‎
Lines changed: 1 addition & 5 deletions b/‎service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/AgentPersonMapperTest.java‎
Lines changed: 1 addition & 5 deletions
diff --git a/‎service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/AllergyStructureMapperTest.java‎
Lines changed: 40 additions & 17 deletions b/‎service/src/test/java/uk/nhs/adaptors/gp2gp/ehr/mapper/AllergyStructureMapperTest.java‎
Lines changed: 40 additions & 17 deletions
@@ -85,6 +85,7 @@ dependencies {
 	testImplementation 'com.squareup.okhttp3:okhttp:5.3.0'
 	testImplementation 'com.squareup.okhttp3:mockwebserver3:5.3.0'
 	testImplementation 'com.adobe.testing:s3mock-testcontainers:4.7.0'
+	testImplementation 'org.mockito:mockito-inline:4.8.0'
 
     spotbugs 'com.github.spotbugs:spotbugs:4.9.8'
     spotbugs 'com.github.spotbugs:spotbugs-annotations:4.9.8'
 
@@ -3,9 +3,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.assertj.core.api.Assertions.assertThatThrownBy;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
-
 import static uk.nhs.adaptors.gp2gp.utils.IdUtil.buildReference;
 
 import org.hl7.fhir.dstu3.model.Bundle;
@@ -31,12 +29,12 @@ class AgentDirectoryMapperTest {
     private static final String AGENT_DIRECTORY_FOLDER = "/ehr/mapper/agent-directory/";
     private static final String INPUT_AGENT_DIRECTORY = AGENT_DIRECTORY_FOLDER + "input-agent-directory-bundle.json";
     private static final String INPUT_AGENT_DIRECTORY_WITHOUT_MANAGING_ORGANIZATION_REFERENCE =
-        AGENT_DIRECTORY_FOLDER + "without-patient-managing-organization-reference.json";
+            AGENT_DIRECTORY_FOLDER + "without-patient-managing-organization-reference.json";
     private static final String INPUT_AGENT_DIRECTORY_WITHOUT_MANAGING_ORGANIZATION_RESOURCE =
-        AGENT_DIRECTORY_FOLDER + "without-patient-managing-organization-resource.json";
+            AGENT_DIRECTORY_FOLDER + "without-patient-managing-organization-resource.json";
     private static final String EXPECTED_AGENT_DIRECTORY = AGENT_DIRECTORY_FOLDER + "expected-agent-directory.xml";
     private static final String EXPECTED_AGENT_DIRECTORY_AGENT_PERSON_AS_ORGANIZATION =
-        AGENT_DIRECTORY_FOLDER + "expected-with-agent-person-as-organization.xml";
+            AGENT_DIRECTORY_FOLDER + "expected-with-agent-person-as-organization.xml";
 
     @Mock
     private RandomIdGeneratorService randomIdGeneratorService;
@@ -48,99 +46,112 @@ class AgentDirectoryMapperTest {
     private MessageContext messageContext;
 
     @BeforeEach
-    public void setUp() {
-        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+    void setUp() {
         messageContext = new MessageContext(randomIdGeneratorService);
-        lenient().when(agentPersonMapper.mapAgentPerson(any(), any())).thenAnswer(answerWithObjectId());
-
         agentDirectoryMapper = new AgentDirectoryMapper(messageContext, agentPersonMapper);
         fhirParseService = new FhirParseService();
     }
 
+    @AfterEach
+    void tearDown() {
+        messageContext.resetMessageContext();
+    }
+
     private Answer<String> answerWithObjectId() {
         return invocation -> {
-            AgentDirectory.AgentKey agentKey = invocation.getArgument(0);
+            var agentKey = invocation.getArgument(0, AgentDirectory.AgentKey.class);
             return String.format("<!--Mocked agentPerson for: %s %s -->",
-                agentKey.getPractitionerReference(),
-                agentKey.getOrganizationReference());
+                    agentKey.getPractitionerReference(),
+                    agentKey.getOrganizationReference());
         };
     }
 
+    private Bundle parseBundle(String path) {
+        var jsonInput = ResourceTestFileUtils.getFileContent(path);
+        return fhirParseService.parseResource(jsonInput, Bundle.class);
+    }
+
+    private String readExpectedOutput(String path) {
+        return ResourceTestFileUtils.getFileContent(path);
+    }
+
+    private void initializeMessageContextWithAgentKeys(Bundle bundle) {
+        messageContext.initialize(bundle);
+        messageContext.getAgentDirectory().getAgentRef(
+                buildReference(ResourceType.Practitioner, "11112222"),
+                buildReference(ResourceType.Organization, "33334444")
+        );
+        messageContext.getAgentDirectory().getAgentRef(
+                buildReference(ResourceType.Practitioner, "55556666"),
+                buildReference(ResourceType.Organization, "77778888")
+        );
+    }
+
     @Test
     void When_MappingAgentDirectory_Expect_CorrectOutputFromMapper() {
-        var jsonInput = ResourceTestFileUtils.getFileContent(INPUT_AGENT_DIRECTORY);
-        Bundle bundle = fhirParseService.parseResource(jsonInput, Bundle.class);
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+        when(agentPersonMapper.mapAgentPerson(any(), any())).thenAnswer(answerWithObjectId());
+
+        var bundle = parseBundle(INPUT_AGENT_DIRECTORY);
         initializeMessageContextWithAgentKeys(bundle);
-        var expectedOutput = ResourceTestFileUtils.getFileContent(EXPECTED_AGENT_DIRECTORY);
 
+        var expectedOutput = readExpectedOutput(EXPECTED_AGENT_DIRECTORY);
         var mapperOutput = agentDirectoryMapper.mapEHRFolderToAgentDirectory(bundle, NHS_NUMBER);
 
         assertThat(mapperOutput).isEqualTo(expectedOutput);
     }
 
     @Test
     void When_MappingAgentDirectoryWithoutPatientManagingOrganizationReference_Expect_Exception() {
-        var jsonInput = ResourceTestFileUtils.getFileContent(INPUT_AGENT_DIRECTORY_WITHOUT_MANAGING_ORGANIZATION_REFERENCE);
-        Bundle bundle = fhirParseService.parseResource(jsonInput, Bundle.class);
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+
+        var bundle = parseBundle(INPUT_AGENT_DIRECTORY_WITHOUT_MANAGING_ORGANIZATION_REFERENCE);
         initializeMessageContextWithAgentKeys(bundle);
 
         assertThatThrownBy(() -> agentDirectoryMapper.mapEHRFolderToAgentDirectory(bundle, NHS_NUMBER))
-            .isExactlyInstanceOf(EhrMapperException.class)
-            .hasMessage("The ASR bundle does not contain a Patient resource with the correct identifier and managingOrganization");
+                .isInstanceOf(EhrMapperException.class)
+                .hasMessage("The ASR bundle does not contain a Patient resource with the correct identifier and managingOrganization");
     }
 
     @Test
     void When_MappingAgentDirectoryWithoutPatientManagingOrganizationResource_Expect_Exception() {
-        var jsonInput = ResourceTestFileUtils.getFileContent(INPUT_AGENT_DIRECTORY_WITHOUT_MANAGING_ORGANIZATION_RESOURCE);
-        Bundle bundle = fhirParseService.parseResource(jsonInput, Bundle.class);
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+
+        var bundle = parseBundle(INPUT_AGENT_DIRECTORY_WITHOUT_MANAGING_ORGANIZATION_RESOURCE);
         initializeMessageContextWithAgentKeys(bundle);
 
         assertThatThrownBy(() -> agentDirectoryMapper.mapEHRFolderToAgentDirectory(bundle, NHS_NUMBER))
-            .isExactlyInstanceOf(EhrMapperException.class)
-            .hasMessage("The ASR bundle does not contain a Patient resource with the correct identifier and managingOrganization");
+                .isInstanceOf(EhrMapperException.class)
+                .hasMessage("The ASR bundle does not contain a Patient resource with the correct identifier and managingOrganization");
     }
 
     @Test
     void When_MappingAgentDirectoryWithPatientManagingOrganizationInAgentKeys_Expect_AgentPersonNotDuplicated() {
-        var jsonInput = ResourceTestFileUtils.getFileContent(INPUT_AGENT_DIRECTORY);
-        Bundle bundle = fhirParseService.parseResource(jsonInput, Bundle.class);
-        initializeMessageContextWithAgentKeys(bundle);
-        messageContext.getAgentDirectory().getAgentId(buildReference(ResourceType.Organization, "5E496953-065B-41F2-9577-BE8F2FBD0757"));
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
+        when(agentPersonMapper.mapAgentPerson(any(), any())).thenAnswer(answerWithObjectId());
 
-        var expectedOutput = ResourceTestFileUtils.getFileContent(EXPECTED_AGENT_DIRECTORY);
+        var bundle = parseBundle(INPUT_AGENT_DIRECTORY);
+        initializeMessageContextWithAgentKeys(bundle);
+        messageContext.getAgentDirectory().getAgentId(
+                buildReference(ResourceType.Organization, TEST_ID)
+        );
 
+        var expectedOutput = readExpectedOutput(EXPECTED_AGENT_DIRECTORY);
         var mapperOutput = agentDirectoryMapper.mapEHRFolderToAgentDirectory(bundle, NHS_NUMBER);
 
         assertThat(mapperOutput).isEqualTo(expectedOutput);
     }
 
     @Test
     void When_MappingAgentKeysWithoutAgentKeys_Expect_CorrectOutputFromMapper() {
-        var jsonInput = ResourceTestFileUtils.getFileContent(INPUT_AGENT_DIRECTORY);
-        Bundle bundle = fhirParseService.parseResource(jsonInput, Bundle.class);
-        messageContext.initialize(bundle);
+        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
 
-        var expectedOutput = ResourceTestFileUtils.getFileContent(EXPECTED_AGENT_DIRECTORY_AGENT_PERSON_AS_ORGANIZATION);
+        var bundle = parseBundle(INPUT_AGENT_DIRECTORY);
+        messageContext.initialize(bundle);
 
+        var expectedOutput = readExpectedOutput(EXPECTED_AGENT_DIRECTORY_AGENT_PERSON_AS_ORGANIZATION);
         var mapperOutput = agentDirectoryMapper.mapEHRFolderToAgentDirectory(bundle, NHS_NUMBER);
 
         assertThat(mapperOutput).isEqualTo(expectedOutput);
     }
-
-    private void initializeMessageContextWithAgentKeys(Bundle bundle) {
-        messageContext.initialize(bundle);
-        messageContext.getAgentDirectory().getAgentRef(
-            buildReference(ResourceType.Practitioner, "11112222"),
-            buildReference(ResourceType.Organization, "33334444")
-        );
-        messageContext.getAgentDirectory().getAgentRef(
-            buildReference(ResourceType.Practitioner, "55556666"),
-            buildReference(ResourceType.Organization, "77778888")
-        );
-    }
-
-    @AfterEach
-    public void tearDown() {
-        messageContext.resetMessageContext();
-    }
 }
@@ -1,6 +1,5 @@
 package uk.nhs.adaptors.gp2gp.ehr.mapper;
 
-import static org.mockito.Mockito.when;
 import static org.assertj.core.api.Assertions.assertThat;
 import java.util.stream.Stream;
 
@@ -18,16 +17,14 @@
 import org.junit.jupiter.params.provider.MethodSource;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.mockito.junit.jupiter.MockitoSettings;
-import org.mockito.quality.Strictness;
+
 
 import uk.nhs.adaptors.gp2gp.common.service.FhirParseService;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.utils.ResourceTestFileUtils;
 import uk.nhs.adaptors.gp2gp.utils.TestArgumentsLoaderUtil;
 
 @ExtendWith(MockitoExtension.class)
-@MockitoSettings(strictness = Strictness.LENIENT)
 class AgentPersonMapperTest {
 
     private static final String TEST_ID = "6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73";
@@ -47,7 +44,6 @@ class AgentPersonMapperTest {
 
     @BeforeEach
     public void setUp() {
-        when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
         messageContext = new MessageContext(randomIdGeneratorService);
         agentPersonMapper = new AgentPersonMapper(messageContext);
         fhirParseService = new FhirParseService();
 
@@ -4,7 +4,6 @@
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
-import static org.mockito.Mockito.lenient;
 import static org.mockito.Mockito.when;
 
 import static uk.nhs.adaptors.gp2gp.utils.IdUtil.buildIdType;
@@ -43,6 +42,17 @@ public class AllergyStructureMapperTest {
     private static final String TEST_FILE_DIRECTORY = "/ehr/mapper/allergy/";
     private static final String INPUT_JSON_BUNDLE = TEST_FILE_DIRECTORY + "fhir-bundle.json";
     private static final String INPUT_JSON_WITH_OPTIONAL_TEXT_FIELDS = TEST_FILE_DIRECTORY + "input-with-optional-text-fields.json";
+    private static final String INPUT_WITH_ENV_CATEGORY = "input-with-environment-category.json";
+    private static final String EXPECTED_WITH_ENV_CATEGORY = "expected-uses-environment-category.xml";
+
+    private static final String INPUT_WITH_CONDITION_ONE_NOTE = "input-with-relation-to-condition-with-one-note.json";
+    private static final String EXPECTED_WITH_CONDITION_ONE_NOTE = "expected-uses-relation-to-condition-with-one-note.xml";
+
+    private static final String INPUT_WITH_CONDITION_TWO_NOTES = "input-with-relation-to-condition-with-two-notes.json";
+    private static final String EXPECTED_WITH_CONDITION_TWO_NOTES = "expected-uses-relation-to-condition-with-two-notes.xml";
+
+    private static final String INPUT_WITH_NO_CONDITION = "input-with-no-relation-to-condition.json";
+    private static final String EXPECTED_WITH_NO_CONDITION = "expected-uses-no-relation-to-condition.xml";
 
     private static final String COMMON_ID = "6D340A1B-BC15-4D4E-93CF-BBCB5B74DF73";
 
@@ -71,12 +81,8 @@ private static Stream<Arguments> resourceFileParams() {
             Arguments.of("input-with-onset-date-only.json", "expected-uses-onset-date.xml"),
             Arguments.of("input-with-reason-end-date-only.json", "expected-uses-end-date.xml"),
             Arguments.of("input-with-no-dates.json", "expected-uses-null-flavor-date.xml"),
-            Arguments.of("input-with-environment-category.json", "expected-uses-environment-category.xml"),
             Arguments.of("input-with-medication-category.json", "expected-uses-medication-category.xml"),
             Arguments.of("input-with-reaction.json", "expected-uses-reaction.xml"),
-            Arguments.of("input-with-relation-to-condition-with-one-note.json", "expected-uses-relation-to-condition-with-one-note.xml"),
-            Arguments.of("input-with-relation-to-condition-with-two-notes.json", "expected-uses-relation-to-condition-with-two-notes.xml"),
-            Arguments.of("input-with-no-relation-to-condition.json", "expected-uses-no-relation-to-condition.xml"),
             Arguments.of("input-with-device-recorder-and-asserter.json", "expected-uses-device-recorder-and-asserter.xml"),
             Arguments.of("input-with-related-person-asserter.json", "expected-uses-related-person-asserter.xml"),
             Arguments.of("input-with-related-person-asserter-name-text.json", "expected-uses-related-person-asserter.xml"),
@@ -94,22 +100,21 @@ private static Stream<Arguments> resourceFileParams() {
         );
     }
 
+    private static Stream<Arguments> resourceFileParamsWithEnvironmentCategoryAndConditionRelatedData() {
+        return Stream.of(
+                Arguments.of(INPUT_WITH_ENV_CATEGORY, EXPECTED_WITH_ENV_CATEGORY),
+                Arguments.of(INPUT_WITH_CONDITION_ONE_NOTE, EXPECTED_WITH_CONDITION_ONE_NOTE),
+                Arguments.of(INPUT_WITH_CONDITION_TWO_NOTES, EXPECTED_WITH_CONDITION_TWO_NOTES),
+                Arguments.of(INPUT_WITH_NO_CONDITION, EXPECTED_WITH_NO_CONDITION)
+        );
+    }
+
     @BeforeEach
     void setUp() {
         when(randomIdGeneratorService.createNewId()).thenReturn(TEST_ID);
         when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
-
-        lenient().when(codeableConceptCdMapper.mapToNullFlavorCodeableConcept(any(CodeableConcept.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        lenient().when(codeableConceptCdMapper.mapCodeableConceptToCd(any(CodeableConcept.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        lenient().when(codeableConceptCdMapper.mapCodeableConceptToCdForAllergy(any(CodeableConcept.class),
-                any(AllergyIntolerance.AllergyIntoleranceClinicalStatus.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        lenient().when(codeableConceptCdMapper.mapToNullFlavorCodeableConceptForAllergy(any(CodeableConcept.class),
-                any(AllergyIntolerance.AllergyIntoleranceClinicalStatus.class)))
-            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
-        lenient().when(confidentialityService.generateConfidentialityCode(any()))
+        when(randomIdGeneratorService.createNewOrUseExistingUUID(anyString())).thenReturn(TEST_ID);
+        when(confidentialityService.generateConfidentialityCode(any()))
             .thenReturn(Optional.empty());
 
         var bundleInput = ResourceTestFileUtils.getFileContent(INPUT_JSON_BUNDLE);
@@ -145,6 +150,24 @@ void When_MappingAllergyIntoleranceJson_Expect_AllergyStructureXmlOutput(String
         final var expectedMessage = ResourceTestFileUtils.getFileContent(TEST_FILE_DIRECTORY + outputXml);
         final var allergyIntolerance = parseAllergyIntoleranceFromJsonFile(TEST_FILE_DIRECTORY + inputJson);
 
+        when(codeableConceptCdMapper.mapToNullFlavorCodeableConceptForAllergy(any(CodeableConcept.class),
+                any(AllergyIntolerance.AllergyIntoleranceClinicalStatus.class)))
+                .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
+
+        String message = allergyStructureMapper.mapAllergyIntoleranceToAllergyStructure(allergyIntolerance);
+        assertThat(message).contains(expectedMessage);
+    }
+
+    @ParameterizedTest
+    @MethodSource("resourceFileParamsWithEnvironmentCategoryAndConditionRelatedData")
+    void When_MappingAllergyIntoleranceJson_Expect_AllergyStructureXmlOutputWithEnvironmentAndData(String inputJson, String outputXml) {
+        final var expectedMessage = ResourceTestFileUtils.getFileContent(TEST_FILE_DIRECTORY + outputXml);
+        final var allergyIntolerance = parseAllergyIntoleranceFromJsonFile(TEST_FILE_DIRECTORY + inputJson);
+
+        when(codeableConceptCdMapper.mapCodeableConceptToCdForAllergy(any(CodeableConcept.class),
+                any(AllergyIntolerance.AllergyIntoleranceClinicalStatus.class)))
+            .thenReturn(CodeableConceptMapperMockUtil.NULL_FLAVOR_CODE);
+
         String message = allergyStructureMapper.mapAllergyIntoleranceToAllergyStructure(allergyIntolerance);
         assertThat(message).contains(expectedMessage);
     }