Reverted some unnecessary changes

Author: Alex-Nita

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

@@ -9,6 +9,7 @@
 import static uk.nhs.adaptors.gp2gp.ehr.mapper.diagnosticreport.ObservationMapper.NARRATIVE_STATEMENT_TEMPLATE;
 
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 import java.util.stream.Collectors;
@@ -74,13 +75,13 @@ public class DiagnosticReportMapper {
     private final ConfidentialityService confidentialityService;
 
     public String mapDiagnosticReportToCompoundStatement(DiagnosticReport diagnosticReport) {
-        List<Observation> initialObservations = fetchObservations(diagnosticReport);
-        List<Specimen> specimens = fetchSpecimens(diagnosticReport, initialObservations);
+        List<Observation> observations = fetchObservations(diagnosticReport);
+        List<Specimen> specimens = fetchSpecimens(diagnosticReport, observations);
         final IdMapper idMapper = messageContext.getIdMapper();
-        markObservationsAsProcessed(idMapper, initialObservations);
+        markObservationsAsProcessed(idMapper, observations);
 
         final List<Observation> processedObservations =
-                assignDummySpecimensToOrphanedTestResults(initialObservations, specimens);
+                assignDummySpecimensToOrphanedTestResults(observations, specimens);
 
         String mappedSpecimens = specimens.stream()
             .map(specimen -> specimenMapper.mapSpecimenToCompoundStatement(specimen, processedObservations, diagnosticReport))
@@ -121,11 +122,12 @@ private List<Specimen> fetchSpecimens(DiagnosticReport diagnosticReport, List<Ob
 
         List<Specimen> specimens = new ArrayList<>();
 
+        // At least one specimen is required to exist for any DiagnosticReport
         if (!diagnosticReport.hasSpecimen() || hasOrphanedTestResults(observations)) {
-            specimens.add(generateDefaultSpecimen(diagnosticReport));
+            specimens.add(generateDummySpecimen(diagnosticReport));
         }
 
-        InputBundle inputBundleHolder = messageContext.getInputBundleHolder();
+        var inputBundleHolder = messageContext.getInputBundleHolder();
         List<Specimen> preExistingSpecimens = diagnosticReport.getSpecimen()
                 .stream()
                 .map(specimenReference -> inputBundleHolder.getResource(specimenReference.getReferenceElement()))
@@ -140,7 +142,6 @@ private List<Specimen> fetchSpecimens(DiagnosticReport diagnosticReport, List<Ob
     }
 
     private boolean hasOrphanedTestResults(List<Observation> observations) {
-
         return observations
                 .stream()
                 .anyMatch(observation -> !observation.hasSpecimen());
@@ -153,7 +154,7 @@ private List<Observation> assignDummySpecimensToOrphanedTestResults(
             return observations;
         }
 
-        // The assumption was made that all test results without a specimen will have the same specimen referenced
+        // 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(DUMMY_SPECIMEN_ID_PREFIX))
                 .toList().getFirst();
@@ -169,7 +170,7 @@ private List<Observation> assignDummySpecimensToOrphanedTestResults(
         return observations;
     }
 
-    private Specimen generateDefaultSpecimen(DiagnosticReport diagnosticReport) {
+    private Specimen generateDummySpecimen(DiagnosticReport diagnosticReport) {
         Specimen specimen = new Specimen();
 
         specimen.setId(DUMMY_SPECIMEN_ID_PREFIX + randomIdGeneratorService.createNewId());
@@ -181,7 +182,11 @@ private Specimen generateDefaultSpecimen(DiagnosticReport diagnosticReport) {
     }
 
     private List<Observation> fetchObservations(DiagnosticReport diagnosticReport) {
-        InputBundle inputBundleHolder = messageContext.getInputBundleHolder();
+        if (!diagnosticReport.hasResult()) {
+            return Collections.singletonList(generateDefaultObservation(diagnosticReport));
+        }
+
+        var inputBundleHolder = messageContext.getInputBundleHolder();
         return diagnosticReport.getResult().stream()
             .map(Reference::getReferenceElement)
             .map(inputBundleHolder::getResource)

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

@@ -421,7 +421,7 @@ private String prepareStatementsForDerivedObservations(List<MultiStatementObserv
         StringBuilder derivedObservationsBlock = new StringBuilder();
 
         derivedObservations.forEach(derivedObservationHolder -> {
-            Observation derivedObservation = derivedObservationHolder.getObservation();
+            var derivedObservation = derivedObservationHolder.getObservation();
             Optional<String> observationStatement =
                 prepareObservationStatement(derivedObservationHolder, CompoundStatementClassCode.CLUSTER);
             Optional<String> narrativeStatements = prepareNarrativeStatements(

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

@@ -137,16 +137,26 @@ private Optional<String> buildSpecimenMaterialType(Specimen specimen) {
     }
 
     private String mapObservationsAssociatedWithSpecimen(Specimen specimen, List<Observation> observations) {
+        List<Observation> observationsAssociatedWithSpecimen;
+
+        if (dummySpecimenOrObservationExists(specimen, observations)) {
+            observationsAssociatedWithSpecimen = observations;
+        } else {
+            observationsAssociatedWithSpecimen = observations.stream()
+                    .filter(Observation::hasSpecimen)
+                    .filter(observation -> observation.getSpecimen().getReference().equals(specimen.getId()))
+                    .collect(Collectors.toList());
+        }
 
-        return observations.stream()
-            .filter(Predicate.not(DiagnosticReportMapper::isFilingComment))
-            .map(observationMapper::mapObservationToCompoundStatement)
-            .collect(Collectors.joining());
+        return observationsAssociatedWithSpecimen.stream()
+                .filter(Predicate.not(DiagnosticReportMapper::isFilingComment))
+                .map(observationMapper::mapObservationToCompoundStatement)
+                .collect(Collectors.joining());
     }
 
     private boolean dummySpecimenOrObservationExists(Specimen specimen, List<Observation> observations) {
         return specimen.getIdElement().getIdPart().contains(DUMMY_SPECIMEN_ID_PREFIX)
-            || (!observations.isEmpty() && observations.getFirst().getIdElement().getIdPart().contains(DUMMY_OBSERVATION_ID_PREFIX));
+                || (!observations.isEmpty() && observations.getFirst().getIdElement().getIdPart().contains(DUMMY_OBSERVATION_ID_PREFIX));
     }
 
     private Optional<String> buildSpecimenNarrativeStatement(Specimen specimen, String availabilityTimeElement,