Fixed SORMAS-Foundation#3624 by replacing the redundant method to collect source case names

Author: MateStrysewske

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

@@ -151,5 +151,9 @@ public String getFirstName() {
 		public String getLastName() {
 			return lastName;
 		}
+
+		public String toString() {
+			return firstName + " " + lastName;
+		}
 	}
 }

sormas-api/src/main/java/de/symeda/sormas/api/epidata/EpiDataFacade.java

@@ -17,13 +17,9 @@
  *******************************************************************************/
 package de.symeda.sormas.api.epidata;
 
-import java.util.List;
-import java.util.Map;
-
 import javax.ejb.Remote;
 
 @Remote
 public interface EpiDataFacade {
 
-	Map<String, String> getExposureSourceCaseNames(List<String> exposureUuids);
 }

sormas-backend/src/main/java/de/symeda/sormas/backend/epidata/EpiDataFacadeEjb.java

@@ -21,7 +21,6 @@
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 import javax.ejb.EJB;
 import javax.ejb.LocalBean;
@@ -55,11 +54,6 @@ public class EpiDataFacadeEjb implements EpiDataFacade {
 	@EJB
 	private UserService userService;
 
-	@Override
-	public Map<String, String> getExposureSourceCaseNames(List<String> exposureUuids) {
-		return service.getExposureSourceCaseNames(exposureUuids);
-	}
-
 	public EpiData fromDto(EpiDataDto source) {
 
 		if (source == null) {

sormas-backend/src/main/java/de/symeda/sormas/backend/epidata/EpiDataService.java

@@ -18,10 +18,6 @@
 package de.symeda.sormas.backend.epidata;
 
 import java.sql.Timestamp;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
@@ -31,19 +27,11 @@
 import javax.persistence.criteria.Join;
 import javax.persistence.criteria.JoinType;
 import javax.persistence.criteria.Predicate;
-import javax.persistence.criteria.Root;
-
-import org.apache.commons.collections.CollectionUtils;
 
 import de.symeda.sormas.api.utils.DataHelper;
-import de.symeda.sormas.backend.caze.Case;
 import de.symeda.sormas.backend.common.AbstractAdoService;
 import de.symeda.sormas.backend.common.AbstractDomainObject;
-import de.symeda.sormas.backend.contact.Contact;
 import de.symeda.sormas.backend.exposure.Exposure;
-import de.symeda.sormas.backend.person.Person;
-import de.symeda.sormas.backend.util.IterableHelper;
-import de.symeda.sormas.backend.util.ModelConstants;
 
 @Stateless
 @LocalBean
@@ -60,34 +48,6 @@ public EpiData createEpiData() {
 		return epiData;
 	}
 
-	public Map<String, String> getExposureSourceCaseNames(List<String> exposureUuids) {
-		if (CollectionUtils.isEmpty(exposureUuids)) {
-			return Collections.emptyMap();
-		}
-
-		Map<String, String> sourceCaseNameMap = new HashMap<>();
-
-		IterableHelper.executeBatched(exposureUuids, ModelConstants.PARAMETER_LIMIT, batchedExposureUuids -> {
-			CriteriaBuilder cb = em.getCriteriaBuilder();
-			CriteriaQuery<Object[]> cq = cb.createQuery(Object[].class);
-			Root<Exposure> root = cq.from(Exposure.class);
-			Join<Exposure, Contact> contactJoin = root.join(Exposure.CONTACT_TO_CASE);
-			Join<Contact, Case> caseJoin = contactJoin.join(Contact.CAZE);
-			Join<Case, Person> casePersonJoin = caseJoin.join(Case.PERSON);
-
-			cq.where(root.get(AbstractDomainObject.UUID).in(batchedExposureUuids));
-			cq.multiselect(root.get(AbstractDomainObject.UUID), casePersonJoin.get(Person.FIRST_NAME), casePersonJoin.get(Person.LAST_NAME));
-
-			List<Object[]> resultList = em.createQuery(cq).getResultList();
-
-			for (Object[] result : resultList) {
-				sourceCaseNameMap.put((String) result[0], DataHelper.toStringNullable(result[1]) + " " + DataHelper.toStringNullable(result[2]));
-			}
-		});
-
-		return sourceCaseNameMap;
-	}
-
 	@SuppressWarnings("rawtypes")
 	@Override
 	public Predicate createUserFilter(CriteriaBuilder cb, CriteriaQuery cq, From<?, EpiData> from) {

sormas-ui/src/main/java/de/symeda/sormas/ui/exposure/ExposuresField.java

@@ -15,10 +15,7 @@
 
 package de.symeda.sormas.ui.exposure;
 
-import java.util.Collection;
-import java.util.HashMap;
 import java.util.List;
-import java.util.Map;
 import java.util.function.Consumer;
 import java.util.function.Supplier;
 import java.util.stream.Collectors;
@@ -28,13 +25,11 @@
 
 import com.vaadin.icons.VaadinIcons;
 import com.vaadin.ui.Window;
-import com.vaadin.v7.data.Property;
 import com.vaadin.v7.shared.ui.label.ContentMode;
 import com.vaadin.v7.ui.Label;
 import com.vaadin.v7.ui.Table;
 
 import de.symeda.sormas.api.EntityDto;
-import de.symeda.sormas.api.FacadeProvider;
 import de.symeda.sormas.api.caze.CaseDataDto;
 import de.symeda.sormas.api.contact.ContactReferenceDto;
 import de.symeda.sormas.api.event.TypeOfPlace;
@@ -67,7 +62,6 @@ public class ExposuresField extends AbstractTableField<ExposureDto> {
 	private static final String COLUMN_SOURCE_CASE_NAME = Captions.exposureSourceCaseName;
 
 	private final FieldVisibilityCheckers fieldVisibilityCheckers;
-	private Map<String, String> sourceCaseNames = new HashMap<>();
 	private Supplier<List<ContactReferenceDto>> getSourceContactsCallback;
 	private Class<? extends EntityDto> epiDataParentClass;
 	private boolean isPseudonymized;
@@ -161,7 +155,7 @@ private void addGeneratedColumns(Table table) {
 		table.addGeneratedColumn(COLUMN_SOURCE_CASE_NAME, (Table.ColumnGenerator) (source, itemId, columnId) -> {
 			ExposureDto exposure = (ExposureDto) itemId;
 			return !isPseudonymized
-				? DataHelper.toStringNullable(sourceCaseNames.get(exposure.getUuid()))
+				? DataHelper.toStringNullable(exposure.getContactToCase().getCaseName())
 				: I18nProperties.getCaption(Captions.inaccessibleValue);
 		});
 	}
@@ -238,19 +232,6 @@ protected ExposureDto createEntry() {
 		return exposure;
 	}
 
-	@SuppressWarnings("unchecked")
-	@Override
-	public void setPropertyDataSource(Property newDataSource) {
-		super.setPropertyDataSource(newDataSource);
-		if (newDataSource != null) {
-			sourceCaseNames = FacadeProvider.getEpiDataFacade()
-				.getExposureSourceCaseNames(
-					((Collection<ExposureDto>) newDataSource.getValue()).stream().map(EntityDto::getUuid).collect(Collectors.toList()));
-		} else {
-			sourceCaseNames = new HashMap<>();
-		}
-	}
-
 	public void setGetSourceContactsCallback(Supplier<List<ContactReferenceDto>> callback) {
 		getSourceContactsCallback = callback;
 	}