SORMAS-Foundation#3873 - execute follow up calculation logic also for import (SORMAS-Foundation#3976)

* SORMAS-Foundation#3873 - execute follow up calculation logic also for import
      - the issue due to which this was ignored for import from SORMAS-Foundation#2641 has been fixed in the meantime with SORMAS-Foundation#3424

* SORMAS-Foundation#3873 - remove unnecessary commented lines + do not execute handle case changes for contact imports

* SORMAS-Foundation#3873 - fix compilation issue

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

Author: BarnaBartha

sormas-api/src/main/java/de/symeda/sormas/api/contact/ContactFacade.java

@@ -42,7 +42,7 @@ public interface ContactFacade {
 
 	ContactDto saveContact(ContactDto dto);
 
-	ContactDto saveContact(ContactDto dto, boolean handleChanges);
+	ContactDto saveContact(ContactDto dto, boolean handleChanges, boolean handleCaseChanges);
 
 	ContactReferenceDto getReferenceByUuid(String uuid);
 

sormas-backend/src/main/java/de/symeda/sormas/backend/caze/CaseFacadeEjb.java

@@ -2872,7 +2872,7 @@ private void mergeCase(CaseDataDto leadCaseData, CaseDataDto otherCaseData, bool
 				ContactDto newContact = ContactDto.build(leadCase.toReference(), leadCase.getDisease(), leadCase.getDiseaseDetails());
 				newContact.setPerson(new PersonReferenceDto(contact.getPerson().getUuid()));
 				fillDto(newContact, ContactFacadeEjb.toDto(contact), cloning);
-				contactFacade.saveContact(newContact, false);
+				contactFacade.saveContact(newContact, false, false);
 			} else {
 				// simply move existing entities to the merge target
 				contact.setCaze(leadCase);

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.backend.common.CriteriaBuilderHelper;
 import org.apache.commons.collections.CollectionUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -123,7 +122,7 @@
 import de.symeda.sormas.backend.caze.CaseService;
 import de.symeda.sormas.backend.clinicalcourse.ClinicalCourseFacadeEjb;
 import de.symeda.sormas.backend.common.AbstractDomainObject;
-import de.symeda.sormas.backend.common.BaseAdoService;
+import de.symeda.sormas.backend.common.CriteriaBuilderHelper;
 import de.symeda.sormas.backend.common.TaskCreationException;
 import de.symeda.sormas.backend.epidata.EpiData;
 import de.symeda.sormas.backend.epidata.EpiDataFacadeEjb;
@@ -275,11 +274,11 @@ public ContactReferenceDto getReferenceByUuid(String uuid) {
 
 	@Override
 	public ContactDto saveContact(ContactDto dto) {
-		return saveContact(dto, true);
+		return saveContact(dto, true, true);
 	}
 
 	@Override
-	public ContactDto saveContact(ContactDto dto, boolean handleChanges) {
+	public ContactDto saveContact(ContactDto dto, boolean handleChanges, boolean handleCaseChanges) {
 		final Contact existingContact = dto.getUuid() != null ? contactService.getByUuid(dto.getUuid()) : null;
 		final ContactDto existingContactDto = toDto(existingContact);
 		restorePseudonymizedDto(dto, existingContact, existingContactDto);
@@ -321,7 +320,7 @@ public ContactDto saveContact(ContactDto dto, boolean handleChanges) {
 			}
 			contactService.udpateContactStatus(entity);
 
-			if (entity.getCaze() != null) {
+			if (handleCaseChanges && entity.getCaze() != null) {
 				caseFacade.onCaseChanged(CaseFacadeEjbLocal.toDto(entity.getCaze()), entity.getCaze());
 			}
 		}
@@ -531,7 +530,8 @@ public List<ContactExportDto> getExportList(ContactCriteria contactCriteria, int
 			ContactJoins visitContactJoins = new ContactJoins(visitsCqRoot);
 
 			visitsCq.where(
-				CriteriaBuilderHelper.and(cb, contact.get(AbstractDomainObject.ID).in(exportContactIds), cb.isNotEmpty(visitsCqRoot.get(Contact.VISITS))));
+				CriteriaBuilderHelper
+					.and(cb, contact.get(AbstractDomainObject.ID).in(exportContactIds), cb.isNotEmpty(visitsCqRoot.get(Contact.VISITS))));
 			visitsCq.multiselect(
 				Stream
 					.concat(

sormas-ui/src/main/java/de/symeda/sormas/ui/contact/importer/ContactImporter.java

@@ -202,7 +202,7 @@ protected ImportLineResult importDataFromCsvLine(
 						}
 					}
 
-					FacadeProvider.getContactFacade().saveContact(newContact, false);
+					FacadeProvider.getContactFacade().saveContact(newContact, true, false);
 
 					consumer.result = null;
 					return ImportLineResult.SUCCESS;