refactoring and test

Author: ORybak5

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

@@ -35,6 +35,7 @@
 
 import uk.nhs.adaptors.gp2gp.common.service.ConfidentialityService;
 import uk.nhs.adaptors.gp2gp.common.service.RandomIdGeneratorService;
+import uk.nhs.adaptors.gp2gp.ehr.exception.EhrMapperException;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.CommentType;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.IdMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.MessageContext;
@@ -168,7 +169,7 @@ private boolean hasObservationsWithoutSpecimen(List<Observation> observations) {
     /**
      * For correct display in EMIS, any observation without a specimen must be assigned a dummy specimen.
      */
-    protected List<Observation> assignDummySpecimensToObservationsWithNoSpecimen(
+    List<Observation> assignDummySpecimensToObservationsWithNoSpecimen(
         List<Observation> observations, List<Specimen> specimens) {
 
         List<Observation> filingComments = getFilingComments(observations);
@@ -178,8 +179,8 @@ protected List<Observation> assignDummySpecimensToObservationsWithNoSpecimen(
             Specimen dummySpecimen = specimens.stream()
                 .filter(specimen -> specimen.getId().contains(NOT_PRESENT_SPECIMEN_ID_PREFIX))
                 .findFirst()
-                .orElseThrow(() -> new IllegalStateException(
-                    "No dummy specimen found with prefix: " + NOT_PRESENT_SPECIMEN_ID_PREFIX));
+                .orElseThrow(() -> new EhrMapperException(
+                    "No not present specimen found with prefix: " + NOT_PRESENT_SPECIMEN_ID_PREFIX));
 
             Reference dummySpecimenReference = new Reference(dummySpecimen.getId());
 

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

@@ -32,6 +32,7 @@
 import org.mockito.quality.Strictness;
 import org.mockito.stubbing.Answer;
 
+import uk.nhs.adaptors.gp2gp.ehr.exception.EhrMapperException;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.AgentDirectory;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.CodeableConceptCdMapper;
 import uk.nhs.adaptors.gp2gp.ehr.mapper.IdMapper;
@@ -165,7 +166,7 @@ void shouldThrowIfNoDummySpecimenFound() {
 
         assertThatThrownBy(() ->
                                mapper.assignDummySpecimensToObservationsWithNoSpecimen(observations, specimens))
-            .isInstanceOf(IllegalStateException.class)
+            .isInstanceOf(EhrMapperException.class)
             .hasMessageContaining(NOT_PRESENT_SPECIMEN_ID_PREFIX);
     }