code and test refactoring

Author: ORybak5

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

@@ -35,7 +35,6 @@
 
 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;
@@ -169,25 +168,26 @@ private boolean hasObservationsWithoutSpecimen(List<Observation> observations) {
     /**
      * For correct display in EMIS, any observation without a specimen must be assigned a dummy specimen.
      */
-    List<Observation> assignDummySpecimensToObservationsWithNoSpecimen(
-        List<Observation> observations, List<Specimen> specimens) {
+    List<Observation> assignDummySpecimensToObservationsWithNoSpecimen(List<Observation> observations, List<Specimen> specimens) {
 
         List<Observation> filingComments = getFilingComments(observations);
         List<Observation> nonFilingObservations = new ArrayList<>(stripFilingComments(observations));
 
-        if (hasObservationsWithoutSpecimen(nonFilingObservations)) {
-            Specimen dummySpecimen = specimens.stream()
-                .filter(specimen -> specimen.getId().contains(NOT_PRESENT_SPECIMEN_ID_PREFIX))
-                .findFirst()
-                .orElseThrow(() -> new EhrMapperException(
-                    "No not present specimen found with prefix: " + NOT_PRESENT_SPECIMEN_ID_PREFIX));
+        if (!hasObservationsWithoutSpecimen(nonFilingObservations)) {
+            nonFilingObservations.addAll(filingComments);
+            return nonFilingObservations;
+        }
 
-            Reference dummySpecimenReference = new Reference(dummySpecimen.getId());
+        // The assumption was made that all test results without a specimen will have the same dummy specimen referenced
+        Specimen dummySpecimen = specimens.stream()
+            .filter(specimen -> specimen.getId().contains(NOT_PRESENT_SPECIMEN_ID_PREFIX))
+            .toList().getFirst();
 
-            nonFilingObservations.stream()
-                .filter(obs -> !obs.hasSpecimen())
-                .forEach(obs -> obs.setSpecimen(dummySpecimenReference));
-        }
+        Reference dummySpecimenReference = new Reference(dummySpecimen.getId());
+
+        nonFilingObservations.stream()
+            .filter(obs -> !obs.hasSpecimen() && !isFilingComment(obs))
+            .forEach(obs -> obs.setSpecimen(dummySpecimenReference));
 
         nonFilingObservations.addAll(filingComments);
         return nonFilingObservations;

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

@@ -1,7 +1,6 @@
 package uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport;
 
 import static org.assertj.core.api.Assertions.assertThat;
-import static org.assertj.core.api.AssertionsForClassTypes.assertThatThrownBy;
 import static org.junit.jupiter.api.Assertions.assertAll;
 import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.Mockito.when;
@@ -32,7 +31,6 @@
 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;
@@ -154,22 +152,6 @@ void shouldAssignDummySpecimenToObservationsWithoutSpecimen() {
         assertThat(result.get(1).getSpecimen().getReference()).contains("real-specimen");
     }
 
-    @Test
-    void shouldThrowIfNoDummySpecimenFound() {
-
-        Observation obsWithoutSpecimen = new Observation();
-        List<Observation> observations = List.of(obsWithoutSpecimen);
-
-        Specimen realSpecimen = new Specimen();
-        realSpecimen.setId("real-specimen");
-        List<Specimen> specimens = List.of(realSpecimen);
-
-        assertThatThrownBy(() ->
-                               mapper.assignDummySpecimensToObservationsWithNoSpecimen(observations, specimens))
-            .isInstanceOf(EhrMapperException.class)
-            .hasMessageContaining(NOT_PRESENT_SPECIMEN_ID_PREFIX);
-    }
-
     @ParameterizedTest
     @MethodSource("resourceFileParams")
     void When_MappingDiagnosticReportJson_Expect_CompoundStatementXmlOutput(String inputJson, String outputXml) {