SORMAS-Foundation#3182 remove redundant GET quanatineEndDate from ExternalVisitsResource

Author: [email protected]

sormas-api/src/main/java/de/symeda/sormas/api/person/PersonFacade.java

@@ -63,8 +63,6 @@ public interface PersonFacade {
 
 	Boolean isValidPersonUuid(String personUuid);
 
-	List<PersonQuarantineEndDto> getLatestQuarantineEndDates(Date since);
-
 	List<PersonFollowUpEndDto> getLatestFollowUpEndDates(Date since, boolean forSymptomsJournal);
 
 	Date getLatestFollowUpEndDateByUuid(String uuid);

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

@@ -343,28 +343,6 @@ public void validate(PersonDto source) throws ValidationRuntimeException {
 		}
 	}
 
-	@Override
-	public List<PersonQuarantineEndDto> getLatestQuarantineEndDates(Date since) {
-		CriteriaBuilder cb = em.getCriteriaBuilder();
-		CriteriaQuery<PersonQuarantineEndDto> cq = cb.createQuery(PersonQuarantineEndDto.class);
-		Root<Contact> contactRoot = cq.from(Contact.class);
-		Join<Contact, Person> personJoin = contactRoot.join(Contact.PERSON, JoinType.LEFT);
-
-		Predicate filter = contactService.createUserFilter(cb, cq, contactRoot);
-		if (since != null) {
-			filter = PersonService.and(cb, filter, contactService.createChangeDateFilter(cb, contactRoot, since));
-		}
-
-		if (filter != null) {
-			cq.where(filter);
-		}
-
-		cq.multiselect(personJoin.get(Person.UUID), contactRoot.get(Contact.QUARANTINE_TO));
-		cq.orderBy(cb.asc(personJoin.get(Person.UUID)), cb.desc(contactRoot.get(Contact.QUARANTINE_TO)));
-
-		return em.createQuery(cq).getResultList().stream().distinct().collect(Collectors.toList());
-	}
-
 	@Override
 	public List<PersonFollowUpEndDto> getLatestFollowUpEndDates(Date since, boolean forSymptomJournal) {
 		CriteriaBuilder cb = em.getCriteriaBuilder();

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

@@ -142,38 +142,6 @@ public void testIsValidPersonUuid() {
 		Assert.assertFalse(getPersonFacade().isValidPersonUuid("2341235234534"));
 	}
 
-	@Test
-	public void testGetLatestQuarantineEndDates() {
-		RDCFEntities rdcfEntities = creator.createRDCFEntities();
-		UserDto user = creator.createUser(rdcfEntities, UserRole.REST_EXTERNAL_VISITS_USER);
-
-		creator.createPerson(); // Person without contact
-		final PersonDto person1 = creator.createPerson();
-		final PersonDto person2 = creator.createPerson();
-		final ContactDto contact11 = creator.createContact(user.toReference(), person1.toReference());
-		final ContactDto contact12 = creator.createContact(user.toReference(), person1.toReference());
-		final ContactDto contact2 = creator.createContact(user.toReference(), person2.toReference());
-
-		Date now = new Date();
-		contact11.setQuarantineTo(DateHelper.subtractDays(now, 20));
-		contact12.setQuarantineTo(DateHelper.subtractDays(now, 8));
-		contact2.setQuarantineTo(now);
-
-		getContactFacade().saveContact(contact11);
-		getContactFacade().saveContact(contact12);
-		getContactFacade().saveContact(contact2);
-
-		List<PersonQuarantineEndDto> quarantineEndDtos = getPersonFacade().getLatestQuarantineEndDates(null);
-
-		assertThat(quarantineEndDtos, hasSize(2));
-		Optional<PersonQuarantineEndDto> result1 = quarantineEndDtos.stream().filter(p -> p.getPersonUuid().equals(person1.getUuid())).findFirst();
-		assertTrue(result1.isPresent());
-		assertTrue(DateHelper.isSameDay(result1.get().getLatestQuarantineEndDate(), DateHelper.subtractDays(now, 8)));
-		Optional<PersonQuarantineEndDto> result2 = quarantineEndDtos.stream().filter(p -> p.getPersonUuid().equals(person2.getUuid())).findFirst();
-		assertTrue(result2.isPresent());
-		assertTrue(DateHelper.isSameDay(result2.get().getLatestQuarantineEndDate(), now));
-	}
-
 	@Test
 	public void testGetFollowUpEndDates() {
 		RDCFEntities rdcfEntities = creator.createRDCFEntities();

sormas-rest/src/main/java/de/symeda/sormas/rest/ExternalVisitsResource.java

@@ -120,12 +120,6 @@ public String getVersion() {
 		return EXTERNAL_VISITS_API_VERSION;
 	}
 
-	@GET
-	@Path("/quarantineEndDates/{since}")
-	public List<PersonQuarantineEndDto> getLatestQuarantineEndDates(@PathParam("since") long since) {
-		return FacadeProvider.getPersonFacade().getLatestQuarantineEndDates(new Date(since));
-	}
-
 	@GET
 	@Path("/followUpEndDates/{since}")
 	@Operation(summary = "Get follow up end dates",