Prepared code to retrieve field with specific handling.

Author: =

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/ContactDetailsFieldValueRetriever.java

@@ -0,0 +1,19 @@
+package de.symeda.sormas.backend.patch.partial_retrieval;
+
+import de.symeda.sormas.api.EntityDto;
+import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo;
+
+import java.util.Set;
+
+public class ContactDetailsFieldValueRetriever implements SpecificFieldValueRetriever {
+    @Override
+    public FieldInfo getFieldInfo(String fieldName, EntityDto entityDto) {
+        // TODO.
+        return null;
+    }
+
+    @Override
+    public Set<String> getSupportedFields() {
+        return Set.of();
+    }
+}

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImpl.java

@@ -1,5 +1,6 @@
 package de.symeda.sormas.backend.patch.partial_retrieval;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -65,6 +66,8 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request)
 
 		CaseDataDto caseData = businessDtoFacade.getCaseDataDto(request.getCaseUuid());
 
+		Map<String, Optional<EntityDto>> beanCache = new HashMap<>();
+
 		List<Tuple<String, Tuple<FieldInfo, PartialRetrievalFailureCause>>> results =
 			patchFieldHelper.extractFieldTuples(request.getFieldsToRetrieve(), businessDtoFacade.fetchablePrefixes()).stream().map(tuple -> {
 
@@ -86,7 +89,7 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request)
 				String physicalPathName = pathWithoutAlias.substring(pathWithoutAlias.indexOf('.') + 1);
 
 				String aliasPath = pathAliasHelper.toAliasPath(pathWithoutAlias);
-				Optional<EntityDto> adequateBean = getAdequateBean(pathWithoutAlias, caseData);
+				Optional<EntityDto> adequateBean = getAdequateBean(pathWithoutAlias, caseData, beanCache);
 
 				if (adequateBean.isEmpty()) {
 					return Tuple.of(originalFieldName, new Tuple<>((FieldInfo) null, PartialRetrievalFailureCause.ENTITY_COULD_NOT_BE_FOUND));
@@ -147,7 +150,10 @@ public DisplayablePartialRetrievalResponse retrievePartialForDisplay(PartialRetr
 					.collect(Collectors.toMap(Map.Entry::getKey, entry -> I18nProperties.getEnumCaption(entry.getValue()))));
 	}
 
-	private Optional<EntityDto> getAdequateBean(@NotNull String aliasPath, @NotNull CaseDataDto caseData) {
+	private Optional<EntityDto> getAdequateBean(
+		@NotNull String aliasPath,
+		@NotNull CaseDataDto caseData,
+		@NotNull Map<String, Optional<EntityDto>> beanCache) {
 
 		int i = aliasPath.indexOf(".");
 
@@ -156,19 +162,21 @@ private Optional<EntityDto> getAdequateBean(@NotNull String aliasPath, @NotNull
 		if (CaseDataDto.I18N_PREFIX.equals(prefix)) {
 			return Optional.of(caseData);
 		} else {
-			List<? extends EntityDto> entityDtos = businessDtoFacade.fetchByI18nName(prefix, caseData);
+			return beanCache.computeIfAbsent(prefix, prefixCandidate -> {
+				List<? extends EntityDto> entityDtos = businessDtoFacade.fetchByI18nName(prefixCandidate, caseData);
 
-			int entitiesSize = CollectionUtils.size(entityDtos);
+				int entitiesSize = CollectionUtils.size(entityDtos);
 
-			if (entitiesSize == 0) {
-				return Optional.empty();
-			}
+				if (entitiesSize == 0) {
+					return Optional.empty();
+				}
 
-			if (entitiesSize != 1) {
-				logger.warn("Only first element is supported for now: [{}], was: [{}]", aliasPath, entitiesSize);
-			}
+				if (entitiesSize != 1) {
+					logger.warn("Only first element is supported for now: [{}], was: [{}]", aliasPath, entitiesSize);
+				}
 
-			return Optional.ofNullable(entityDtos).map(actualEntities -> actualEntities.get(0));
+				return Optional.ofNullable(entityDtos).map(actualEntities -> actualEntities.get(0));
+			});
 		}
 	}
 

sormas-backend/src/main/java/de/symeda/sormas/backend/patch/partial_retrieval/SpecificFieldValueRetriever.java

@@ -1,14 +1,24 @@
 package de.symeda.sormas.backend.patch.partial_retrieval;
 
+import de.symeda.sormas.api.EntityDto;
 import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo;
 import de.symeda.sormas.api.utils.OrderedRegisterable;
 
 import javax.validation.constraints.NotNull;
+import java.util.Optional;
 import java.util.Set;
+import java.util.function.Function;
 
+// TODO: check for adequate entityDto / generics usage to make it nicer.
 public interface SpecificFieldValueRetriever {
 
-    FieldInfo getFieldInfo(String fieldName);
+    /**
+     *
+     * @param fieldName
+     * @param entityDto
+     * @return
+     */
+    FieldInfo getFieldInfo(String fieldName, EntityDto entityDto);
 
     /**
      * Meant to be implemented by classes implementing this {@link OrderedRegisterable} contract but to be used.