Added a new test for the mapper and added extra mocking when needed for two other unit tests

Author: chiaramapellimt

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

@@ -21,6 +21,8 @@
 import uk.nhs.adaptors.gp2gp.ehr.utils.TemplateUtils;
 import uk.nhs.adaptors.gp2gp.gpc.GetGpcStructuredTaskDefinition;
 
+import uk.nhs.adaptors.gp2gp.ehr.exception.EhrValidationException;
+
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -56,6 +58,12 @@ public EhrExtractTemplateParameters mapBundleToEhrFhirExtractParams(
         mappedComponents.addAll(nonConsultationResourceMapper.mapRemainingResourcesToEhrCompositions(bundle));
         ehrExtractTemplateParameters.setComponents(mappedComponents);
 
+        if (mappedComponents.isEmpty()) {
+            final String message = "couldn't extract EHR Extract: empty structured access record.";
+            LOGGER.error(message);
+            throw new EhrValidationException(message);
+        }
+
         ehrExtractTemplateParameters.setAgentDirectory(
             agentDirectoryMapper.mapEHRFolderToAgentDirectory(bundle, getPatientNhsNumber(getGpcStructuredTaskDefinition))
         );

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

@@ -3,11 +3,13 @@
 import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
-import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.when;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.mockito.Mockito.*;
 
 import java.time.Instant;
 import java.time.temporal.ChronoUnit;
+import java.util.Arrays;
+import java.util.Collections;
 
 import org.hl7.fhir.dstu3.model.Bundle;
 import org.junit.jupiter.api.Test;
@@ -19,6 +21,7 @@
 
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
 import uk.nhs.adaptors.gp2gp.common.service.TimestampService;
+import uk.nhs.adaptors.gp2gp.ehr.exception.EhrValidationException;
 import uk.nhs.adaptors.gp2gp.gpc.GetGpcStructuredTaskDefinition;
 
 @ExtendWith(MockitoExtension.class)
@@ -50,6 +53,8 @@ class EhrExtractMapperTest {
 
     @Test
     void When_NhsOverrideNumberProvided_Expect_OverrideToBeUsed()  {
+        when(nonConsultationResourceMapper.mapRemainingResourcesToEhrCompositions(any()))
+                .thenReturn(Arrays.asList("not", "empty"));
         ReflectionTestUtils.setField(ehrExtractMapper, OVERRIDE_NHS_NUMBER, OVERRIDE_NHS_NUMBER_VALUE);
         when(agentDirectoryMapper.mapEHRFolderToAgentDirectory(any(Bundle.class), eq(OVERRIDE_NHS_NUMBER_VALUE)))
             .thenReturn(OVERRIDE_NHS_NUMBER_VALUE);
@@ -66,6 +71,8 @@ void When_NhsOverrideNumberProvided_Expect_OverrideToBeUsed()  {
 
     @Test
     void When_NhsOverrideNumberIsBlank_Expect_ActualNhsNumberIsUsed()  {
+        when(nonConsultationResourceMapper.mapRemainingResourcesToEhrCompositions(any()))
+                .thenReturn(Arrays.asList("not", "empty"));
         when(agentDirectoryMapper.mapEHRFolderToAgentDirectory(any(Bundle.class), eq(NHS_NUMBER)))
             .thenReturn(NHS_NUMBER);
         when(timestampService.now()).thenReturn(Instant.now().truncatedTo(ChronoUnit.MILLIS));
@@ -79,6 +86,27 @@ void When_NhsOverrideNumberIsBlank_Expect_ActualNhsNumberIsUsed()  {
         assertThat(parameters.getAgentDirectory()).isEqualTo(NHS_NUMBER);
     }
 
+    @Test
+    void When_BundleHasNoMappableContent_Expect_EhrValidationExceptionIsThrown() {
+        when(timestampService.now()).thenReturn(Instant.now().truncatedTo(ChronoUnit.MILLIS));
+
+        var taskDef = GetGpcStructuredTaskDefinition.builder()
+                .nhsNumber(NHS_NUMBER)
+                .build();
+        var bundle = mock(Bundle.class);
+
+        lenient().when(nonConsultationResourceMapper.mapRemainingResourcesToEhrCompositions(any(Bundle.class)))
+                .thenReturn(Collections.emptyList());
+
+        EhrValidationException thrown = assertThrows(EhrValidationException.class, () ->
+                ehrExtractMapper.mapBundleToEhrFhirExtractParams(taskDef, bundle)
+        );
+
+        assertThat(thrown.getMessage()).isEqualTo("couldn't extract EHR Extract: empty structured access record.");
+    }
+
+
+
     @Test
     void When_BuildEhrCompositionForSkeletonEhrExtract_Expect_ExpectedComponentBuilt() {
         var documentId = "documentId";