SORMAS-Foundation#3821: user AbstractAdoService for building the contact and event filters for getting all persons to prevent NPE (SORMAS-Foundation#3884)

* SORMAS-Foundation#3821: user AbstractAdoService for building the contact and event filters for getting all persons to prevent NPE

* SORMAS-Foundation#3821: add unit test to validate NPE fix for getPersonsAfter

Author: vidi42

sormas-backend/src/main/java/de/symeda/sormas/backend/person/PersonService.java

@@ -202,7 +202,7 @@ public List<Person> getAllAfter(Date date, User user) {
 		if (date != null) {
 			Predicate dateFilter = createChangeDateFilter(cb, contactPersonsSelect, DateHelper.toTimestampUpper(date));
 			Predicate contactDateFilter = contactService.createChangeDateFilter(cb, contactPersonsRoot, date);
-			contactPersonsFilter = cb.and(contactPersonsFilter, cb.or(dateFilter, contactDateFilter));
+			contactPersonsFilter = and(cb, contactPersonsFilter, cb.or(dateFilter, contactDateFilter));
 		}
 		if (contactPersonsFilter != null) {
 			contactPersonsQuery.where(contactPersonsFilter);
@@ -222,7 +222,7 @@ public List<Person> getAllAfter(Date date, User user) {
 			Predicate dateFilter = createChangeDateFilter(cb, eventPersonsSelect, DateHelper.toTimestampUpper(date));
 			Predicate eventParticipantDateFilter =
 				eventParticipantService.createChangeDateFilter(cb, eventPersonsRoot, DateHelper.toTimestampUpper(date));
-			eventPersonsFilter = cb.and(eventPersonsFilter, cb.or(dateFilter, eventParticipantDateFilter));
+			eventPersonsFilter = and(cb, eventPersonsFilter, cb.or(dateFilter, eventParticipantDateFilter));
 		}
 		if (eventPersonsFilter != null) {
 			eventPersonsQuery.where(eventPersonsFilter);

sormas-backend/src/test/java/de/symeda/sormas/backend/person/PersonFacadeEjbTest.java

@@ -238,4 +238,34 @@ public void testGetPersonForJournal() {
 		assertEquals(person.getBirthdateDD(), exportPerson.getBirthdateDD());
 		assertEquals(contact2.getFollowUpUntil(), exportPerson.getLatestFollowUpEndDate());
 	}
+
+	@Test
+	public void testGetPersonsAfter() {
+		UserDto natUser = useNationalUserLogin();
+
+		Date t1 = new Date();
+
+		PersonDto person1 = creator.createPerson();
+		person1 = getPersonFacade().savePerson(person1);
+		final ContactDto contact1 = creator.createContact(natUser.toReference(), person1.toReference());
+		getContactFacade().saveContact(contact1);
+
+		List<PersonDto> personsAfterT1 = getPersonFacade().getPersonsAfter(t1);
+		assertEquals(1, personsAfterT1.size());
+		assertEquals(person1.getUuid(), personsAfterT1.get(0).getUuid());
+
+		Date t2 = new Date();
+
+		PersonDto person2 = creator.createPerson();
+		person2 = getPersonFacade().savePerson(person2);
+		final ContactDto contact2 = creator.createContact(natUser.toReference(), person2.toReference());
+		getContactFacade().saveContact(contact2);
+
+		List<PersonDto> personsAfterT2 = getPersonFacade().getPersonsAfter(t2);
+		assertEquals(1, personsAfterT2.size());
+		assertEquals(person2.getUuid(), personsAfterT2.get(0).getUuid());
+
+		personsAfterT1 = getPersonFacade().getPersonsAfter(t1);
+		assertEquals(2, personsAfterT1.size());
+	}
 }