Added better marking in tests for mapped specimens.

Author: Alex-Nita

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

@@ -115,7 +115,7 @@ private List<Specimen> fetchSpecimens(DiagnosticReport diagnosticReport, List<Ob
 
         List<Specimen> specimens = new ArrayList<>();
 
-        if (hasOrphanedTestResults(observations)) {
+        if (!diagnosticReport.hasSpecimen() || hasOrphanedTestResults(observations)) {
             specimens.add(generateDefaultSpecimen(diagnosticReport));
         }
 

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

@@ -6,6 +6,7 @@
 import static org.mockito.Mockito.when;
 
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -316,7 +317,7 @@ void When_DiagnosticReport_Has_SpecimenAndUnlinkedTestResult_ExpectADummySpecime
                 REGEXP_UUID +
                 " " + MOCKED_SPECIMEN_LINKED_OBSERVATION + ": " +
                 expectObservation +
-                ", -->.*"
+                "-->.*"
         );
     }
 
@@ -337,15 +338,15 @@ void When_DiagnosticReport_Has_SpecimenALinkedTestResultAndAnUnlinkedTestResult_
                 REGEXP_UUID +
                 " " + MOCKED_SPECIMEN_LINKED_OBSERVATION + ": " +
                 expectObservation +
-                ", -->.*"
+                "-->.*"
         );
 
         // This checks that the linked test result has its correct specimen.
         assertThat(actualXml).containsIgnoringWhitespaces("<!-- " + MOCKED_SPECIMEN_PREFIX + ": " +
                 "Specimen/96B93E28-293D-46E7-B4C2-D477EEBF7098-SPEC-0" +
                 MOCKED_SPECIMEN_LINKED_OBSERVATION + ":" +
                 "Observation/B7F05EA7-A1A4-48C0-9C4C-CDB5768796B2" +
-                ", -->"
+                " -->"
         );
 
     }
@@ -403,15 +404,19 @@ private Answer<String> mockSpecimenMapping() {
             Specimen specimen = invocation.getArgument(0);
             List<Observation> observations = invocation.getArgument(1);
 
-            String linkedObservations = "";
+            List<String> linkedObservations = new ArrayList<>();
 
             for (Observation observation : observations) {
                 if(observation.getSpecimen().getReference() != null && observation.getSpecimen().getReference().equals(specimen.getId())){
-                    linkedObservations = linkedObservations + observation.getId() + ", ";
+                    linkedObservations.add(observation.getId());
                 }
             }
+
+            if(linkedObservations.isEmpty()){
+                return String.format("<!-- " + MOCKED_SPECIMEN_PREFIX + ": %s -->", specimen.getId());
+            }
 
-            return String.format("<!-- " + MOCKED_SPECIMEN_PREFIX + ": %s " + MOCKED_SPECIMEN_LINKED_OBSERVATION + ": %s-->", specimen.getId(), linkedObservations);
+            return String.format("<!-- " + MOCKED_SPECIMEN_PREFIX + ": %s " + MOCKED_SPECIMEN_LINKED_OBSERVATION + ": %s-->", specimen.getId(), String.join(",", linkedObservations));
         };
     }
 }

service/src/test/resources/ehr/mapper/diagnosticreport/diagnostic-report-with-multiple-results.xml

@@ -62,6 +62,6 @@ CommentDate:20100225154100
         <availabilityTime value="20100225154100"/>
     </NarrativeStatement>
 </component>
-            <!-- Mapped Specimen with id: DUMMY-SPECIMEN-5E496953-065B-41F2-9577-BE8F2FBD0757 -->
+            <!-- Mapped Specimen with id: DUMMY-SPECIMEN-5E496953-065B-41F2-9577-BE8F2FBD0757 with linked Observations: Observation/B7F05EA7-A1A4-48C0-9C4C-CDB5768796B2-COMM,Observation/6E30A9E3-FF9A-4868-8FCD-7DAC26A16E78-COMM,Observation/D0A358C9-4833-4827-B14B-E8515C25CB12-COMM-->
     </CompoundStatement>
 </component>