SORMAS-Foundation#3424 - handle dropped contact even if it becomes dropped as a result of case classification not a contact change (SORMAS-Foundation#3785)

Co-authored-by: barnabartha <[email protected]>

Author: BarnaBartha

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

@@ -308,10 +308,11 @@ public ContactDto saveContact(ContactDto dto, boolean handleChanges) {
 
 			final boolean convertedToCase =
 				(existingContactDto == null || existingContactDto.getResultingCase() == null) && entity.getResultingCase() != null;
-			final boolean dropped = entity.getContactStatus() == ContactStatus.DROPPED;
+			final boolean dropped = entity.getContactStatus() == ContactStatus.DROPPED
+				&& (existingContactDto == null || existingContactDto.getContactStatus() != ContactStatus.DROPPED);
 			if (dropped || convertedToCase) {
-				entity.setFollowUpStatus(FollowUpStatus.CANCELED);
-				entity.setFollowUpComment(
+				contactService.cancelFollowUp(
+					entity,
 					I18nProperties
 						.getString(convertedToCase ? Strings.messageSystemFollowUpCanceled : Strings.messageSystemFollowUpCanceledByDropping));
 			} else {

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

@@ -753,6 +753,7 @@ public void udpateContactStatus(Contact contact) {
 			break;
 		case NO_CONTACT:
 			contact.setContactStatus(ContactStatus.DROPPED);
+			cancelFollowUp(contact, I18nProperties.getString(Strings.messageSystemFollowUpCanceledByDropping));
 			break;
 		case CONFIRMED:
 			if (contact.getResultingCase() != null) {
@@ -863,6 +864,12 @@ public void updateFollowUpUntilAndStatus(Contact contact) {
 		ensurePersisted(contact);
 	}
 
+	public void cancelFollowUp(Contact contact, String comment) {
+		contact.setFollowUpStatus(FollowUpStatus.CANCELED);
+		contact.setFollowUpComment(comment);
+		ensurePersisted(contact);
+	}
+
 	// Used only for testing; directly retrieve the contacts from the visit instead
 	public List<Contact> getAllByVisit(Visit visit) {