🐛 personContact details path

Author: Pa-Touche

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

@@ -20,22 +20,12 @@
 import de.symeda.sormas.api.EntityDto;
 import de.symeda.sormas.api.caze.CaseDataDto;
 import de.symeda.sormas.api.i18n.I18nProperties;
-import de.symeda.sormas.api.patch.partial_retrieval.DisplayableFieldInfo;
-import de.symeda.sormas.api.patch.partial_retrieval.DisplayablePartialRetrievalResponse;
-import de.symeda.sormas.api.patch.partial_retrieval.FieldInfo;
-import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalFailureCause;
-import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalRequest;
-import de.symeda.sormas.api.patch.partial_retrieval.PartialRetrievalResponse;
-import de.symeda.sormas.api.patch.partial_retrieval.PartialRetriever;
+import de.symeda.sormas.api.patch.partial_retrieval.*;
 import de.symeda.sormas.api.utils.Tuple;
 import de.symeda.sormas.api.utils.fieldvisibility.FieldVisibilityCheckers;
 import de.symeda.sormas.backend.common.ConfigFacadeEjb;
 import de.symeda.sormas.backend.feature.FeatureConfigurationFacadeEjb;
-import de.symeda.sormas.backend.patch.BusinessDtoFacade;
-import de.symeda.sormas.backend.patch.PatchFieldHelper;
-import de.symeda.sormas.backend.patch.PathFailureCause;
-import de.symeda.sormas.backend.patch.PropertyAccessFailure;
-import de.symeda.sormas.backend.patch.PropertyAccessor;
+import de.symeda.sormas.backend.patch.*;
 import de.symeda.sormas.backend.patch.alias.PathAliasHelper;
 
 @ApplicationScoped
@@ -105,8 +95,8 @@ public PartialRetrievalResponse retrievePartial(PartialRetrievalRequest request)
 					return Tuple.of(originalFieldName, new Tuple<>(specificFieldInfo.get(), (PartialRetrievalFailureCause) null));
 				}
 
-				Tuple<Tuple<Class<?>, Object>, PropertyAccessFailure> propertyType = PropertyAccessor
-					.getPropertyTypeAndValue(adequateBean, physicalPathName, getFieldVisibilityCheckers(caseData.getDisease()));
+				Tuple<Tuple<Class<?>, Object>, PropertyAccessFailure> propertyType =
+					PropertyAccessor.getPropertyTypeAndValue(adequateBean, physicalPathName, getFieldVisibilityCheckers(caseData.getDisease()));
 
 				PropertyAccessFailure propertyAccessFailure = propertyType.getSecond();
 				if (propertyAccessFailure != null) {
@@ -161,13 +151,13 @@ public DisplayablePartialRetrievalResponse retrievePartialForDisplay(PartialRetr
 	}
 
 	private Optional<EntityDto> getAdequateBean(
-		@NotNull String aliasPath,
+		@NotNull String path,
 		@NotNull CaseDataDto caseData,
 		@NotNull Map<String, Optional<EntityDto>> beanCache) {
 
-		int i = aliasPath.indexOf(".");
+		int i = path.indexOf(".");
 
-		String prefix = StringUtils.substring(aliasPath, 0, i);
+		String prefix = StringUtils.substring(path, 0, i);
 
 		if (CaseDataDto.I18N_PREFIX.equals(prefix)) {
 			return Optional.of(caseData);
@@ -182,7 +172,7 @@ private Optional<EntityDto> getAdequateBean(
 				}
 
 				if (entitiesSize != 1) {
-					logger.warn("Only first element is supported for now: [{}], was: [{}]", aliasPath, entitiesSize);
+					logger.warn("Only first element is supported for now: [{}], was: [{}]", path, entitiesSize);
 				}
 
 				return Optional.ofNullable(entityDtos).map(actualEntities -> actualEntities.get(0));

sormas-backend/src/test/java/de/symeda/sormas/backend/patch/partial_retrieval/PartialRetrieverImplTest.java

@@ -4,7 +4,6 @@
 import java.util.Set;
 
 import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.RepeatedTest;
 import org.junit.jupiter.api.Test;
 
 import de.symeda.sormas.api.Disease;
@@ -168,7 +167,7 @@ void retrievePartial_null_value() {
 			() -> Assertions.assertNull(classificationDateFieldInfo.getFieldValue()));
 	}
 
-	@RepeatedTest(12)
+	@Test
 	void retrieve_contact_details_phone() {
 		// PREPARE
 		Disease disease = Disease.PERTUSSIS;
@@ -203,7 +202,8 @@ void retrieve_contact_details_phone() {
 		getPersonFacade().save(person);
 
 		// EXECUTE
-		String personContactDetails = toFieldName(PersonContactDetailDto.I18N_PREFIX, PersonContactDetailDto.PHONE_NUMBER_TYPE);
+		String personContactDetails =
+			toFieldName(toFieldName(PersonDto.I18N_PREFIX, PersonDto.PERSON_CONTACT_DETAILS), PersonContactDetailDto.PHONE_NUMBER_TYPE);
 		PartialRetrievalResponse actual = victim()
 			.retrievePartial(new PartialRetrievalRequest().setCaseUuid(originalCase.getUuid()).setFieldsToRetrieve(Set.of(personContactDetails)));