Merge pull request SORMAS-Foundation#4037 from hzi-braunschweig/bug-4008-MergeCasesFilterFix

SORMAS-Foundation#4008 - cases merge filter fix

Author: BarnaBartha

sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java

@@ -1353,7 +1353,12 @@ public List<CaseIndexDto[]> getCasesForDuplicateMerging(CaseCriteria criteria, b
 						cb.function("date_part", Long.class, cb.parameter(String.class, "date_type"), symptoms2.get(Symptoms.ONSET_DATE)))),
 				new Long(30 * 24 * 60 * 60) // 30 days
 			));
-		Predicate creationDateFilter = cb.lessThan(root.get(Case.CREATION_DATE), root2.get(Case.CREATION_DATE));
+
+		Predicate creationDateFilter = cb.or(
+			cb.lessThan(root.get(Case.CREATION_DATE), root2.get(Case.CREATION_DATE)),
+			cb.or(
+				cb.lessThanOrEqualTo(root2.get(Case.CREATION_DATE), DateHelper.getStartOfDay(criteria.getCreationDateFrom())),
+				cb.greaterThanOrEqualTo(root2.get(Case.CREATION_DATE), DateHelper.getEndOfDay(criteria.getCreationDateTo()))));
 
 		Predicate filter = cb.and(caseService.createDefaultFilter(cb, root), caseService.createDefaultFilter(cb, root2));
 		if (userFilter != null) {
@@ -1379,6 +1384,7 @@ public List<CaseIndexDto[]> getCasesForDuplicateMerging(CaseCriteria criteria, b
 		filter = cb.and(filter, cb.or(sexFilter, birthDateFilter));
 		filter = cb.and(filter, onsetDateFilter);
 		filter = cb.and(filter, creationDateFilter);
+		filter = cb.and(filter, cb.notEqual(root.get(Case.ID), root2.get(Case.ID)));
 
 		cq.where(filter);
 		cq.multiselect(root.get(Case.ID), root2.get(Case.ID), root.get(Case.CREATION_DATE));

sormas-backend/src/test/java/de/symeda/sormas/backend/H2Function.java

@@ -11,10 +11,12 @@ public static float similarity(String a, String b) {
 		return a.equalsIgnoreCase(b) ? 1 : 0;
 	}
 
-	public static int date_part(String part, Date date) {
+	public static long date_part(String part, Date date) {
 		switch (part) {
 		case "year":
 			return DateHelper8.toLocalDate(date).getYear();
+		case "epoch":
+			return date.getTime() / 1000;
 		default:
 			throw new IllegalArgumentException(part);
 		}

sormas-backend/src/test/java/de/symeda/sormas/backend/caze/CaseFacadeEjbTest.java

@@ -27,6 +27,7 @@
 import static org.junit.Assert.assertThat;
 import static org.junit.Assert.assertTrue;
 
+import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -36,6 +37,9 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.time.DateUtils;
+import org.hibernate.internal.SessionImpl;
+import org.hibernate.query.spi.QueryImplementor;
 import org.hamcrest.MatcherAssert;
 import org.junit.Assert;
 import org.junit.Rule;
@@ -118,6 +122,52 @@ public class CaseFacadeEjbTest extends AbstractBeanTest {
 	@Rule
 	public final ExpectedException exception = ExpectedException.none();
 
+	@Test
+	public void testGetCasesForDuplicateMerging() {
+
+		final Date today = new Date();
+		final Date threeDaysAgo = DateUtils.addDays(today, -3);
+
+		RDCFEntities rdcf = creator.createRDCFEntities("Region", "District", "Community", "Facility");
+		UserDto user = creator
+			.createUser(rdcf.region.getUuid(), rdcf.district.getUuid(), rdcf.facility.getUuid(), "Surv", "Sup", UserRole.SURVEILLANCE_SUPERVISOR);
+		PersonDto cazePerson = creator.createPerson("Case", "Person");
+		CaseDataDto caze = creator.createCase(
+			user.toReference(),
+			cazePerson.toReference(),
+			Disease.EVD,
+			CaseClassification.PROBABLE,
+			InvestigationStatus.PENDING,
+			today,
+			rdcf);
+
+		SessionImpl em = (SessionImpl) getEntityManager();
+		QueryImplementor query = em.createQuery("select c from cases c where c.uuid=:uuid");
+		query.setParameter("uuid", caze.getUuid());
+		Case singleResult = (Case) query.getSingleResult();
+
+		singleResult.setCreationDate(new Timestamp(threeDaysAgo.getTime()));
+		singleResult.setReportDate(threeDaysAgo);
+		em.save(singleResult);
+
+		PersonDto cazePerson2 = creator.createPerson("Case", "Person");
+		CaseDataDto case2 = creator.createCase(
+			user.toReference(),
+			cazePerson2.toReference(),
+			Disease.EVD,
+			CaseClassification.PROBABLE,
+			InvestigationStatus.PENDING,
+			DateUtils.addMinutes(today, -3),
+			rdcf);
+
+		final List<CaseIndexDto[]> casesForDuplicateMergingToday =
+			getCaseFacade().getCasesForDuplicateMerging(new CaseCriteria().creationDateFrom(today).creationDateTo(today), true);
+		final List<CaseIndexDto[]> casesForDuplicateMergingThreeDaysAgo =
+			getCaseFacade().getCasesForDuplicateMerging(new CaseCriteria().creationDateFrom(threeDaysAgo).creationDateTo(threeDaysAgo), true);
+		Assert.assertEquals(1, casesForDuplicateMergingToday.size());
+		Assert.assertEquals(1, casesForDuplicateMergingThreeDaysAgo.size());
+	}
+
 	@Test
 	public void testDiseaseChangeUpdatesContacts() {