SORMAS-Foundation#3424 - set follow up comment as well when contact is converted or dropped (SORMAS-Foundation#3756)

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

Author: BarnaBartha

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Strings.java

@@ -736,6 +736,7 @@ public interface Strings {
 	String messageSymptomsHint = "messageSymptomsHint";
 	String messageSymptomsVisitHint = "messageSymptomsVisitHint";
 	String messageSystemFollowUpCanceled = "messageSystemFollowUpCanceled";
+	String messageSystemFollowUpCanceledByDropping = "messageSystemFollowUpCanceledByDropping";
 	String messageTasksDeleted = "messageTasksDeleted";
 	String messageTemplateNotAvailable = "messageTemplateNotAvailable";
 	String messageTreatmentCreated = "messageTreatmentCreated";

sormas-api/src/main/resources/strings.properties

@@ -785,6 +785,7 @@ messageContactCaseRemoved = The source case has been removed from this contact
 messageContactCaseChanged = The source case of the contact has been changed
 messageSampleOpened = Opened sample found for search string
 messageSystemFollowUpCanceled = [System] Follow-up automatically canceled because contact was converted to a case
+messageSystemFollowUpCanceledByDropping = [System] Follow-up automatically canceled because contact was dropped
 messageSetContactRegionAndDistrict = Please choose a responsible region and responsible district and save the contact before removing the source case.
 messageAllCampaignFormsValid = All campaign forms have been successfully validated
 messageEnterSms = Please enter your SMS message here:

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

@@ -58,7 +58,6 @@
 import javax.persistence.criteria.Root;
 import javax.validation.constraints.NotNull;
 
-import de.symeda.sormas.api.person.JournalPersonDto;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -92,8 +91,10 @@
 import de.symeda.sormas.api.followup.FollowUpDto;
 import de.symeda.sormas.api.i18n.Captions;
 import de.symeda.sormas.api.i18n.I18nProperties;
+import de.symeda.sormas.api.i18n.Strings;
 import de.symeda.sormas.api.i18n.Validations;
 import de.symeda.sormas.api.location.LocationDto;
+import de.symeda.sormas.api.person.JournalPersonDto;
 import de.symeda.sormas.api.person.PersonReferenceDto;
 import de.symeda.sormas.api.region.DistrictReferenceDto;
 import de.symeda.sormas.api.region.RegionReferenceDto;
@@ -309,6 +310,9 @@ public ContactDto saveContact(ContactDto dto, boolean handleChanges) {
 			final boolean dropped = entity.getContactStatus() == ContactStatus.DROPPED;
 			if (dropped || convertedToCase) {
 				entity.setFollowUpStatus(FollowUpStatus.CANCELED);
+				entity.setFollowUpComment(
+					I18nProperties
+						.getString(convertedToCase ? Strings.messageSystemFollowUpCanceled : Strings.messageSystemFollowUpCanceledByDropping));
 			} else {
 				contactService.updateFollowUpUntilAndStatus(entity);
 			}
@@ -908,8 +912,7 @@ public List<ContactIndexDetailedDto> getIndexDetailedList(
 
 		// Load event count and latest events info per contact
 		Map<String, List<ContactEventSummaryDetails>> eventSummaries =
-			eventService.getEventSummaryDetailsByContacts(
-				dtos.stream().map(ContactIndexDetailedDto::getUuid).collect(Collectors.toList()))
+			eventService.getEventSummaryDetailsByContacts(dtos.stream().map(ContactIndexDetailedDto::getUuid).collect(Collectors.toList()))
 				.stream()
 				.collect(Collectors.groupingBy(ContactEventSummaryDetails::getContactUuid, Collectors.toList()));
 		for (ContactIndexDetailedDto contact : dtos) {