fixed the possible issues.

Author: KarnaiahPesula

sormas-api/src/main/resources/validations.properties

@@ -332,4 +332,4 @@ smsAuthKeyValueValidation = SMS Auth key value is not valid
 smsAuthSecretValueValidation = SMS Auth secret value is not valid
 systemConfigurationValueValidationInvalidBackgroundColor = Pre-defined values are: green, red, indigo, gray, default (case-sensitive) otherwise must match hexadecimal format (with or without hash "#"), example: #dd2b0e or #4AA or dd2b0e
 systemConfigurationValueValidationMenuSubtitle = Can be empty or up to 16 (any) characters. Can be used to define name of the environment: PRODUCTION - TEST etc.
-customizableEnumValueAlreadyInUse = The customizable value %s is being used for %s case(IDs) and therefore cannot be deleted or deactivated. Please remove all references to this value before attempting to deactivate.
+customizableEnumValueAlreadyInUse = The customizable value %s is being used by case IDs %s and therefore cannot be deleted or deactivated. Please remove all references to this value before attempting to deactivate.

sormas-backend/src/main/java/de/symeda/sormas/backend/customizableenum/CustomizableEnumFacadeEjb.java

@@ -170,18 +170,25 @@ public CustomizableEnumValueDto save(CustomizableEnumValueDto dto) {
 
 		CustomizableEnumValue existingEntity = service.getByUuid(dto.getUuid());
 		// if existingEntity disease removed and it is mapped to the cases, shouldn't allow to save the entity
-		if (existingEntity != null && CollectionUtils.isNotEmpty(existingEntity.getDiseases()) && CollectionUtils.isNotEmpty(dto.getDiseases())) {
-			existingEntity.getDiseases().stream().filter(disease -> !dto.getDiseases().contains(disease)).findAny().ifPresent(disease -> {
-				List<String> uuids = service.areCasesUsingCustomizableEnumValue(disease, getEnumValue(dto.getDataType(), disease, dto.getValue()));
-				if (!uuids.isEmpty()) {
-					throw new ValidationRuntimeException(
-						I18nProperties.getValidationError(
-							Validations.customizableEnumValueAlreadyInUse,
-							disease.getName(),
-							uuids.stream().filter(Objects::nonNull).collect(Collectors.joining(", "))));
+		
+		if (existingEntity != null && CollectionUtils.isNotEmpty(existingEntity.getDiseases())) {
+			Set<Disease> incomingDiseases = dto.getDiseases() != null ? dto.getDiseases() : Collections.emptySet();
+			for (Disease removedDisease : existingEntity.getDiseases()) {
+				if (!incomingDiseases.contains(removedDisease)) {
+					List<String> uuids = service.areCasesUsingCustomizableEnumValue(
+						removedDisease,
+						getEnumValue(dto.getDataType(), removedDisease, existingEntity.getValue()));
+					if (!uuids.isEmpty()) {
+						throw new ValidationRuntimeException(
+							I18nProperties.getValidationError(
+								Validations.customizableEnumValueAlreadyInUse,
+								removedDisease.getName(),
+								uuids.stream().filter(Objects::nonNull).collect(Collectors.joining(", "))));
+					}
 				}
-			});
+			}
 		}
+
 		for (Disease disease : dto.getDiseases()) {
 			List<String> dataTypeValues = enumValues.get(dto.getDataType()).getOrDefault(disease, Collections.emptyList());
 			if (existingEntity == null && dataTypeValues != null && dataTypeValues.contains(dto.getValue())) {

sormas-backend/src/main/java/de/symeda/sormas/backend/customizableenum/CustomizableEnumValueService.java

@@ -94,7 +94,7 @@ public List<String> areCasesUsingCustomizableEnumValue(Disease disease, DiseaseV
 		CaseCriteria caseCriteria = new CaseCriteria();
 		caseCriteria.setDisease(disease);
 		caseCriteria.setDiseaseVariant(diseaseVariant);
-		List<Case> result = caseService.findBy(caseCriteria, false);
+		List<Case> result = caseService.findBy(caseCriteria, true);
 		return result.stream().map(Case::getUuid).collect(Collectors.toList());
 	}