Merge pull request SORMAS-Foundation#3593 from hzi-braunschweig/feature-3424-ContactFollowUpCancel

Feature 3424 contact follow up cancel

Author: BarnaBartha

sormas-backend/src/main/java/de/symeda/sormas/backend/contact/ContactFacadeEjb.java

@@ -303,7 +303,14 @@ public ContactDto saveContact(ContactDto dto, boolean handleChanges) {
 		if (handleChanges) {
 			updateContactVisitAssociations(existingContactDto, entity);
 
-			contactService.updateFollowUpUntilAndStatus(entity);
+			final boolean convertedToCase =
+				(existingContactDto == null || existingContactDto.getResultingCase() == null) && entity.getResultingCase() != null;
+			final boolean dropped = entity.getContactStatus() == ContactStatus.DROPPED;
+			if (dropped || convertedToCase) {
+				entity.setFollowUpStatus(FollowUpStatus.CANCELED);
+			} else {
+				contactService.updateFollowUpUntilAndStatus(entity);
+			}
 			contactService.udpateContactStatus(entity);
 
 			if (entity.getCaze() != null) {

sormas-backend/src/test/java/de/symeda/sormas/backend/contact/ContactFacadeEjbTest.java

@@ -37,6 +37,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 
+import de.symeda.sormas.api.contact.FollowUpStatus;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.time.DateUtils;
 import org.junit.Assert;
@@ -203,6 +204,77 @@ public void testUpdateContactStatus() {
 		assertEquals(ContactStatus.CONVERTED, contact.getContactStatus());
 	}
 
+	@Test
+	public void testContactFollowUpStatusCanceledWhenContactDropped(){
+		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,
+				new Date(),
+				rdcf);
+		PersonDto contactPerson = creator.createPerson("Contact", "Person");
+		Date contactDate = new Date();
+		ContactDto contact =
+				creator.createContact(user.toReference(), user.toReference(), contactPerson.toReference(), caze, contactDate, contactDate, null);
+
+		assertEquals(ContactStatus.ACTIVE, contact.getContactStatus());
+		assertNull(contact.getResultingCase());
+
+		contact.setContactClassification(ContactClassification.CONFIRMED);
+		contact.setContactStatus(ContactStatus.DROPPED);
+		contact = getContactFacade().saveContact(contact);
+		assertEquals(ContactClassification.CONFIRMED, contact.getContactClassification());
+		assertEquals(ContactStatus.DROPPED, contact.getContactStatus());
+		assertEquals(FollowUpStatus.CANCELED, contact.getFollowUpStatus());
+	}
+
+	@Test
+	public void testContactFollowUpStatusCanceledWhenContactConvertedToCase(){
+		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,
+				new Date(),
+				rdcf);
+		PersonDto contactPerson = creator.createPerson("Contact", "Person");
+
+		Date contactDate = new Date();
+		ContactDto contact =
+				creator.createContact(user.toReference(), user.toReference(), contactPerson.toReference(), caze, contactDate, contactDate, null);
+
+		assertEquals(ContactStatus.ACTIVE, contact.getContactStatus());
+		assertNull(contact.getResultingCase());
+
+		contact.setContactClassification(ContactClassification.CONFIRMED);
+		contact = getContactFacade().saveContact(contact);
+
+		final CaseDataDto resultingCase = creator.createCase(
+				user.toReference(),
+				contactPerson.toReference(),
+				Disease.EVD,
+				CaseClassification.PROBABLE,
+				InvestigationStatus.PENDING,
+				new Date(),
+				rdcf);
+		contact.setResultingCase(resultingCase.toReference());
+		contact = getContactFacade().saveContact(contact);
+		assertEquals(ContactClassification.CONFIRMED, contact.getContactClassification());
+		assertEquals(ContactStatus.CONVERTED, contact.getContactStatus());
+		assertEquals(FollowUpStatus.CANCELED, contact.getFollowUpStatus());
+	}
+
 	@Test
 	public void testGenerateContactFollowUpTasks() {