Enhance default value handling for customizable fields with disease context

Author: raulbob

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

@@ -1796,7 +1796,10 @@ private void ensureDefaultCustomizableFieldValues(Case caze, CaseDataDto existin
 			customizableFieldValueService.ensureDefaultValuesForEntity(caze.getUuid(), CustomizableFieldContext.CASE);
 		}
 
-		epiDataFacade.ensureDefaultCustomizableFieldValues(caze.getEpiData(), existingCaseDto != null ? existingCaseDto.getEpiData() : null);
+		epiDataFacade.ensureDefaultCustomizableFieldValues(
+			caze.getEpiData(),
+			existingCaseDto != null ? existingCaseDto.getEpiData() : null,
+			caze.getDisease());
 	}
 
 	private void updateCaseVisitAssociations(CaseDataDto existingCase, Case caze) {

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

@@ -419,7 +419,10 @@ public ContactDto save(ContactDto dto, boolean handleChanges, boolean handleCase
 
 		Contact entity = fillOrBuildEntity(dto, existingContact, checkChangeDate);
 		service.ensurePersisted(entity);
-		epiDataFacade.ensureDefaultCustomizableFieldValues(entity.getEpiData(), existingContactDto != null ? existingContactDto.getEpiData() : null);
+		epiDataFacade.ensureDefaultCustomizableFieldValues(
+			entity.getEpiData(),
+			existingContactDto != null ? existingContactDto.getEpiData() : null,
+			entity.getDisease());
 
 		if (existingContact == null && featureConfigurationFacade.isTaskGenerationFeatureEnabled(TaskType.CONTACT_INVESTIGATION)) {
 			createInvestigationTask(entity);

sormas-backend/src/main/java/de/symeda/sormas/backend/customizablefield/CustomizableFieldMetadataFacadeEjb.java

@@ -287,7 +287,7 @@ protected CustomizableFieldMetadataDto toDto(CustomizableFieldMetadata source) {
 		return target;
 	}
 
-	private static CustomizableFieldVisibilityRestrictions parseVisibilityRestrictions(String json) {
+	public static CustomizableFieldVisibilityRestrictions parseVisibilityRestrictions(String json) {
 		if (StringUtils.isBlank(json)) {
 			return null;
 		}

sormas-backend/src/main/java/de/symeda/sormas/backend/customizablefield/CustomizableFieldValueService.java

@@ -36,6 +36,8 @@
 import de.symeda.sormas.api.common.DeletionDetails;
 import de.symeda.sormas.api.customizablefield.CustomizableFieldContext;
 import de.symeda.sormas.api.customizablefield.CustomizableFieldValueDto;
+import de.symeda.sormas.api.customizablefield.CustomizableFieldVisibilityContext;
+import de.symeda.sormas.api.customizablefield.CustomizableFieldVisibilityRestrictions;
 import de.symeda.sormas.backend.common.AbstractCoreAdoService;
 import de.symeda.sormas.backend.common.AbstractDomainObject;
 import de.symeda.sormas.backend.common.DeletableAdo;
@@ -107,6 +109,28 @@ public void saveEntityValues(
 	}
 
 	public void ensureDefaultValuesForEntity(String entityUuid, CustomizableFieldContext contextClass) {
+		ensureDefaultValuesForEntity(entityUuid, contextClass, null);
+	}
+
+	/**
+	 * Ensures default values for customizable fields for the given entity.
+	 * <p>
+	 * Only fields that are visible for the given visibility context will have their default values
+	 * persisted. Fields with disease-specific visibility restrictions that don't match the context
+	 * will be skipped.
+	 *
+	 * @param entityUuid
+	 *            the UUID of the entity
+	 * @param contextClass
+	 *            the context class for the customizable fields
+	 * @param visibilityContext
+	 *            the visibility context to check against field restrictions; may be null to skip
+	 *            visibility checks
+	 */
+	public void ensureDefaultValuesForEntity(
+		String entityUuid,
+		CustomizableFieldContext contextClass,
+		CustomizableFieldVisibilityContext visibilityContext) {
 		if (StringUtils.isBlank(entityUuid) || contextClass == null) {
 			return;
 		}
@@ -122,6 +146,15 @@ public void ensureDefaultValuesForEntity(String entityUuid, CustomizableFieldCon
 				continue;
 			}
 
+			// Skip fields that are not visible for the given context
+			if (visibilityContext != null && metadata.getVisibilityRestrictions() != null) {
+				CustomizableFieldVisibilityRestrictions metadataVisibilityRestrictions =
+					CustomizableFieldMetadataFacadeEjb.parseVisibilityRestrictions(metadata.getVisibilityRestrictions());
+				if (metadataVisibilityRestrictions.matches(visibilityContext)) {
+					continue;
+				}
+			}
+
 			CustomizableFieldValue value = createNewValue(metadata, entityUuid, contextClass);
 			value.setValue(metadata.getDefaultValue());
 			ensurePersisted(value);

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

@@ -28,9 +28,11 @@
 import javax.ejb.LocalBean;
 import javax.ejb.Stateless;
 
+import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.activityascase.ActivityAsCaseDto;
 import de.symeda.sormas.api.common.DeletionDetails;
 import de.symeda.sormas.api.customizablefield.CustomizableFieldContext;
+import de.symeda.sormas.api.customizablefield.CustomizableFieldVisibilityContext;
 import de.symeda.sormas.api.epidata.EpiDataDto;
 import de.symeda.sormas.api.epidata.EpiDataFacade;
 import de.symeda.sormas.api.exposure.ExposureDto;
@@ -79,13 +81,16 @@ public void softDeleteCustomizableFieldValues(EpiData epiData, DeletionDetails d
 		}
 	}
 
-	public void ensureDefaultCustomizableFieldValues(EpiData epiData, EpiDataDto existingEpiData) {
+	public void ensureDefaultCustomizableFieldValues(EpiData epiData, EpiDataDto existingEpiData, Disease disease) {
 		if (epiData == null || epiData.getUuid() == null) {
 			return;
 		}
 
+		// Build visibility context from the provided disease
+		CustomizableFieldVisibilityContext visibilityContext = disease != null ? new CustomizableFieldVisibilityContext().withDisease(disease) : null;
+
 		if (existingEpiData == null || existingEpiData.getUuid() == null) {
-			customizableFieldValueService.ensureDefaultValuesForEntity(epiData.getUuid(), CustomizableFieldContext.EPIDATA);
+			customizableFieldValueService.ensureDefaultValuesForEntity(epiData.getUuid(), CustomizableFieldContext.EPIDATA, visibilityContext);
 		}
 
 		HashSet<String> existingExposureUuids = new HashSet<>();
@@ -99,7 +104,8 @@ public void ensureDefaultCustomizableFieldValues(EpiData epiData, EpiDataDto exi
 
 		for (Exposure exposure : epiData.getExposures()) {
 			if (exposure.getUuid() != null && !existingExposureUuids.contains(exposure.getUuid())) {
-				customizableFieldValueService.ensureDefaultValuesForEntity(exposure.getUuid(), CustomizableFieldContext.EXPOSURE);
+				// Exposure inherits disease from parent EpiData's disease
+				customizableFieldValueService.ensureDefaultValuesForEntity(exposure.getUuid(), CustomizableFieldContext.EXPOSURE, visibilityContext);
 			}
 		}
 	}