Merge pull request SORMAS-Foundation#4250 from hzi-braunschweig/feature/4247-reportingDateTolerance

Feature/4247 report date tolerance

Author: JonasCir

sormas-api/src/main/java/de/symeda/sormas/api/caze/CaseFacade.java

@@ -205,5 +205,7 @@ void saveBulkEditWithFacilities(
 		boolean surveillanceOfficerChange,
 		Boolean doTransfer);
 
+	List<CasePersonDto> getDuplicates(CasePersonDto casePerson, int reportDateThreshold);
+
 	List<CasePersonDto> getDuplicates(CasePersonDto casePerson);
 }

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

@@ -72,6 +72,7 @@
 import javax.validation.constraints.NotNull;
 
 import org.apache.commons.lang3.StringUtils;
+import org.joda.time.DateTime;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -3432,12 +3433,18 @@ public String getFirstCaseUuidWithOwnershipHandedOver(List<String> caseUuids) {
 	 * * same externalToken
 	 * * same first name, last name, date of birth, sex (null is considered equal to any sex), disease, reportDate (ignore time), district
 	 *
+	 * The reportDateThreshold allows to return duplicates where
+	 * -reportDateThreshold <= match.reportDate <= reportDateThreshold
+	 *
 	 * @param casePerson
 	 *            - case and person
+	 * @param reportDateThreshold
+	 * 			  - the range bounds on match.reportDate
 	 * @return list of duplicate cases
 	 */
 	@Override
-	public List<CasePersonDto> getDuplicates(CasePersonDto casePerson) {
+	public List<CasePersonDto> getDuplicates(CasePersonDto casePerson, int reportDateThreshold) {
+
 		CaseDataDto searchCaze = casePerson.getCaze();
 		PersonDto searchPerson = casePerson.getPerson();
 
@@ -3502,13 +3509,32 @@ public List<CasePersonDto> getDuplicates(CasePersonDto casePerson) {
 					and(cb, personPredicate, or(cb, cb.isNull(person.get(Person.SEX)), cb.equal(person.get(Person.SEX), searchPerson.getSex())));
 			}
 
+			Predicate reportDatePredicate;
+
+			if (reportDateThreshold == 0){
+				// threshold is zero: we want to get exact matches
+				reportDatePredicate = cb.equal(
+						cb.function("date", Date.class, caseRoot.get(Case.REPORT_DATE)),
+						cb.function("date", Date.class, cb.literal(searchCaze.getReportDate()))
+				);
+			} else{
+				// threshold is nonzero: apply time range of threshold to the reportDate
+				Date reportDate = casePerson.getCaze().getReportDate();
+				Date dateBefore = new DateTime(reportDate).minusDays(reportDateThreshold).toDate();
+				Date dateAfter= new DateTime(reportDate).plusDays(reportDateThreshold).toDate();;
+
+				reportDatePredicate = cb.between(
+						cb.function("date", Date.class, caseRoot.get(Case.REPORT_DATE)),
+						cb.function("date", Date.class, cb.literal(dateBefore)),
+						cb.function("date", Date.class, cb.literal(dateAfter))
+				);
+			}
+
 			combinedPredicate = and(
 				cb,
 				personPredicate,
 				cb.equal(caseRoot.get(Case.DISEASE), searchCaze.getDisease()),
-				cb.equal(
-					cb.function("date", Date.class, caseRoot.get(Case.REPORT_DATE)),
-					cb.function("date", Date.class, cb.literal(searchCaze.getReportDate()))),
+				reportDatePredicate,
 				cb.equal(caseCaseJoins.getDistrict().get(District.UUID), searchCaze.getDistrict().getUuid()));
 		}
 
@@ -3529,6 +3555,11 @@ public List<CasePersonDto> getDuplicates(CasePersonDto casePerson) {
 			.collect(Collectors.toList());
 	}
 
+	@Override
+	public List<CasePersonDto> getDuplicates(CasePersonDto casePerson) {
+		return getDuplicates(casePerson, 0);
+	}
+
 	@LocalBean
 	@Stateless
 	public static class CaseFacadeEjbLocal extends CaseFacadeEjb {

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

@@ -43,6 +43,8 @@
 import org.hamcrest.MatcherAssert;
 import org.hibernate.internal.SessionImpl;
 import org.hibernate.query.spi.QueryImplementor;
+import org.hamcrest.MatcherAssert;
+import org.joda.time.DateTime;
 import org.junit.Assert;
 import org.junit.Rule;
 import org.junit.Test;
@@ -1552,6 +1554,54 @@ public void testCreateCaseWithoutUuid() {
 		MatcherAssert.assertThat(savedCaze.getEpiData().getExposures().get(0).getUuid(), not(isEmptyOrNullString()));
 	}
 
+	@Test
+	public void testGetDuplicatesWithReportDateThreshold() {
+		RDCF rdcf = creator.createRDCF();
+		Date now = new Date();
+		//case and person matching for asserts
+		PersonDto person = creator.createPerson("Fname", "Lname", (p) -> {
+			p.setBirthdateDD(12);
+			p.setBirthdateMM(3);
+			p.setBirthdateYYYY(1968);
+		});
+
+		CaseDataDto caze = creator.createCase(creator.createUser(rdcf, UserRole.SURVEILLANCE_OFFICER).toReference(), rdcf, (c) -> {
+			c.setPerson(person.toReference());
+			c.setDisease(Disease.CORONAVIRUS);
+			c.setDistrict(rdcf.district);
+			c.setReportDate(new Date());
+		});
+
+		PersonDto person2 = creator.createPerson("Fname", "Lname", (p) -> {
+			p.setBirthdateMM(3);
+			p.setBirthdateYYYY(1968);
+		});
+		creator.createCase(creator.createUser(rdcf, UserRole.SURVEILLANCE_OFFICER).toReference(), rdcf, (c) -> {
+			c.setPerson(person2.toReference());
+			c.setDisease(Disease.CORONAVIRUS);
+			c.setReportDate(new DateTime(now).minusDays(1).toDate());
+		});
+
+		CasePersonDto casePerson = new CasePersonDto();
+		PersonDto duplicatePerson = PersonDto.build();
+		CaseDataDto duplicateCaze = CaseDataDto.build(duplicatePerson.toReference(), Disease.CORONAVIRUS);
+		duplicateCaze.setDistrict(rdcf.district);
+		duplicateCaze.setReportDate(new Date());
+
+		casePerson.setCaze(duplicateCaze);
+		casePerson.setPerson(duplicatePerson);
+
+		List<CasePersonDto> duplicates;
+
+		duplicateCaze.setExternalToken(null);
+		duplicatePerson.setFirstName("Fname");
+		duplicatePerson.setLastName("Lname");
+		duplicates = getCaseFacade().getDuplicates(casePerson, 1);
+		MatcherAssert.assertThat(duplicates, hasSize(2));
+	}
+
+
+
 //	@Test
 //	public void testGetSimilarCases() {
 //		RDCFEntities rdcf = creator.createRDCFEntities("Region", "District", "Community", "Facility");