Merge pull request #13761 from SORMAS-Foundation/bugfix-labmessage_autoprocessing_caseorder

Fixed issue with case ordering leading to random test failures

Author: raulbob

sormas-backend/src/main/java/de/symeda/sormas/backend/externalmessage/labmessage/AutomaticLabMessageProcessor.java

@@ -314,20 +314,44 @@ protected void handlePickOrCreateEntry(
 					automaticAssignmentSampleDate,
 					automaticSampleAssignmentThreshold);
 
-
 				CaseSelectionDto caseToAssignTo = null;
 
-				// special case for LATENT_TUBERCULOSIS: if there are more caseUuids and we have tuberculosis cases we need to give priority to the tuberculosis cases
-				if (disease == Disease.LATENT_TUBERCULOSIS && autoAssignCaseUuids.size() > 1) {
-					// sort the cases by disease giving priority to tuberculosis cases and take the first one (the one with the highest priority and most recent report date)
-					caseToAssignTo = similarCases.stream()
-						.filter(c -> autoAssignCaseUuids.contains(c.getUuid()))
-						.sorted(Comparator.comparing((CaseSelectionDto c) -> c.getDisease() == Disease.TUBERCULOSIS ? 0 : 1)
-							.thenComparing((CaseSelectionDto c) -> c.getReportDate(), Comparator.reverseOrder()))
-						.findFirst()
-						.orElse(null);
-				} else {
-					caseToAssignTo = similarCases.stream().filter(c -> autoAssignCaseUuids.contains(c.getUuid())).findFirst().orElse(null);
+				if (!autoAssignCaseUuids.isEmpty()) {
+					// special case for LATENT_TUBERCULOSIS: if there are more caseUuids and we have tuberculosis cases we need to give priority to the tuberculosis cases
+					if (disease == Disease.LATENT_TUBERCULOSIS && autoAssignCaseUuids.size() > 1) {
+						// sort the cases by disease giving priority to tuberculosis cases and take the first one (the one with the highest priority and most recent report date)
+						// we can't use the autoAssignCaseUuids order because it may have at position 0 a case with LATENT_TUBERCULOSIS and we need to prioritize TUBERCULOSIS cases
+						caseToAssignTo = similarCases.stream()
+							.filter(c -> autoAssignCaseUuids.contains(c.getUuid()))
+							.sorted(
+								Comparator.comparing((CaseSelectionDto c) -> c.getDisease() == Disease.TUBERCULOSIS ? 0 : 1)
+									.thenComparing((CaseSelectionDto c) -> c.getReportDate(), Comparator.reverseOrder()))
+							.findFirst()
+							.orElse(null);
+					} else {
+						// autoAssignCaseUuids contains at least one element (checked above)
+						// autoAssignCaseUuids is ordered by date descending, so the first element is the most recent case
+						final String autoAssignMostRecentCaseUuid = autoAssignCaseUuids.get(0);
+						caseToAssignTo = similarCases.stream().filter(c -> autoAssignMostRecentCaseUuid.equals(c.getUuid())).findFirst().orElse(null);
+					}
+
+					if (logger.isDebugEnabled()) {
+						logger.debug(
+							"Similar cases : {}",
+							similarCases.stream()
+								.map(c -> String.format("%s(%s,%s)", c.getUuid(), c.getDisease().getName(), c.getReportDate()))
+								.collect(Collectors.joining(";")));
+						logger.debug("Similar case uuids: {}", similarCaseUuids);
+						logger.debug(
+							"Selected case: {}",
+							caseToAssignTo == null
+								? "null"
+								: String.format(
+									"%s(%s,%s)",
+									caseToAssignTo.getUuid(),
+									caseToAssignTo.getDisease().getName(),
+									caseToAssignTo.getReportDate()));
+					}
 				}
 
 				if (caseToAssignTo == null) {

sormas-backend/src/test/java/de/symeda/sormas/backend/externalmessage/labmessage/AutomaticLabMessageProcessorTest.java

@@ -27,7 +27,6 @@
 import java.util.Date;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
@@ -301,8 +300,8 @@ public void testThresholdAgainstSampleDate() throws ExecutionException, Interrup
 
 	@ParameterizedTest
 	@CsvSource({
-		"lu, 2010010100774" 
-	})
+		"null, null",
+		"lu, 2010010100774" })
 	public void testProcessWithExistingPersonAndCaseWithBySampleDate(final String countryLocale, final String personalHealthId)
 		throws ExecutionException, InterruptedException {
 
@@ -345,15 +344,13 @@ public void testProcessWithExistingPersonAndCaseWithBySampleDate(final String co
 		sample.setSampleDateTime(DateHelper.subtractDays(new Date(), 11));
 		getSampleFacade().saveSample(sample);
 
-		TimeUnit.SECONDS.sleep(1);
-
 		// STEP 2: Process the message again now with a set threshold but with a sample date that is too old
 		final int sampleCountBeforeStep2 = getSampleFacade().getAllActiveSamplesAfter(new Date(0)).size();
 		result = runFlow(externalMessage);
 		assertThat(result.getStatus(), is(DONE));
 		assertThat(externalMessage.getStatus(), is(ExternalMessageStatus.PROCESSED));
 		final int sampleCountAfterStep2 = getSampleFacade().getAllActiveSamplesAfter(new Date(0)).size();
-		
+
 		final String step2ResultCaseUuid = result.getData().getCase().getUuid();
 
 		assertThat("Sample count should have incresed, new sample for new case.", sampleCountAfterStep2, is(greaterThan(sampleCountBeforeStep2)));
@@ -368,8 +365,6 @@ public void testProcessWithExistingPersonAndCaseWithBySampleDate(final String co
 		sample.setSampleDateTime(DateHelper.subtractDays(new Date(), 5));
 		getSampleFacade().saveSample(sample);
 
-		TimeUnit.SECONDS.sleep(2);
-
 		// STEP 3: Process the message again now with a set threshold but with a sample date that is valid
 		final int sampleCountBeforeStep3 = getSampleFacade().getAllActiveSamplesAfter(new Date(0)).size();
 		result = runFlow(externalMessage);
@@ -380,8 +375,14 @@ public void testProcessWithExistingPersonAndCaseWithBySampleDate(final String co
 
 		cases = getCaseFacade().getAllAfter(new Date(0));
 		assertThat("Case count should not have increased, sample date theshold was set in valid range", cases, hasSize(2));
-		assertThat("Sample count should have incresed, new sample for existing case.", sampleCountAfterStep3, is(greaterThan(sampleCountBeforeStep3)));
-		assertThat("Case UUID should be the same as the result of the previous step (result should be added to existing case).", step3ResultCaseUuid, is(step2ResultCaseUuid));
+		assertThat(
+			"Sample count should have incresed, new sample for existing case.",
+			sampleCountAfterStep3,
+			is(greaterThan(sampleCountBeforeStep3)));
+		assertThat(
+			"Case UUID should be the same as the result of the previous step (result should be added to existing case).",
+			step3ResultCaseUuid,
+			is(step2ResultCaseUuid));
 
 		persons = getPersonFacade().getAllAfter(new Date(0));
 		assertThat(persons, hasSize(1));