#13227 Allow "+" character as a value (e.g. "A+B") in the customizabl… (#13251)

* #13227 Allow "+" character as a value (e.g. "A+B") in the customizable enums

* #13227 Allow "+" character as a value (e.g. "A+B") in the customizable enums - update validation message

---------

Co-authored-by: Levente Gal <levente.gal.ext@vitagroup.ag>

Author: leventegal-she

sormas-api/src/main/java/de/symeda/sormas/api/customizableenum/CustomizableEnumHelper.java

@@ -19,7 +19,7 @@
 
 public class CustomizableEnumHelper {
 
-	private static final String ENUM_VALUE_PATTERN = "[A-Z0-9_.]+";
+	private static final String ENUM_VALUE_PATTERN = "[A-Z0-9_.+]+";
 
 	public static boolean isValidEnumValue(String value) {
 		return Pattern.matches(ENUM_VALUE_PATTERN, value);

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

@@ -292,7 +292,7 @@ defaultInfrastructureInvalidParentDistrict = This community is in a different di
 defaultInfrastructureNotRemovableChildCommunity = You have to remove the default community before removing the default district.
 defaultInfrastructureNotRemovableChildDistrict = You have to remove the default district before removing the default region.
 emailTemplateSubjectInvalid=The first line of the email template needs to start with a "#" character followed by at most 50 characters
-customizableEnumValueAllowedCharacters = Value may only consist of uppercase letters, numbers, and the characters "_" and ".".
+customizableEnumValueAllowedCharacters = Value may only consist of uppercase letters, numbers, and the characters "_", "." and "+".
 customizableEnumValueEmptyTranslations = Please select languages and enter captions for all translations in the list.
 customizableEnumValueDuplicateLanguage = Please only add one translation per language.
 customizableEnumValueDuplicateValue = The value %s already exists for data type %s. Enum values have to be unique.

sormas-backend/src/test/java/de/symeda/sormas/backend/customizableenum/CustomizableEnumFacadeEjbTest.java

@@ -1,7 +1,9 @@
 package de.symeda.sormas.backend.customizableenum;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 import java.util.HashSet;
 import java.util.List;
@@ -13,6 +15,7 @@
 import de.symeda.sormas.api.Disease;
 import de.symeda.sormas.api.customizableenum.CustomEnumNotFoundException;
 import de.symeda.sormas.api.customizableenum.CustomizableEnum;
+import de.symeda.sormas.api.customizableenum.CustomizableEnumHelper;
 import de.symeda.sormas.api.customizableenum.CustomizableEnumType;
 import de.symeda.sormas.backend.AbstractBeanTest;
 
@@ -61,4 +64,19 @@ public void tetGetUnknownDiseaseVariantWithNullDisease() throws CustomEnumNotFou
 			CustomEnumNotFoundException.class,
 			() -> getCustomizableEnumFacade().getEnumValue(CustomizableEnumType.DISEASE_VARIANT, "any", null));
 	}
+
+	@Test
+	public void testEnumValueValidation() {
+		assertTrue(CustomizableEnumHelper.isValidEnumValue("VALIDSIMPLEVALUE"));
+		assertTrue(CustomizableEnumHelper.isValidEnumValue("VALID_SIMPLE_VALUE"));
+		assertTrue(CustomizableEnumHelper.isValidEnumValue("VALID.SIMPLE.VALUE"));
+		assertTrue(CustomizableEnumHelper.isValidEnumValue("VALID+SIMPLE+VALUE"));
+		assertTrue(CustomizableEnumHelper.isValidEnumValue("VALID_SIM+PLE.VALUE"));
+		assertTrue(CustomizableEnumHelper.isValidEnumValue("VALID_SIMPLE.VALUE+1"));
+
+		assertFalse(CustomizableEnumHelper.isValidEnumValue("invalidvalue"));
+		assertFalse(CustomizableEnumHelper.isValidEnumValue("INVALID-VALUE"));
+		assertFalse(CustomizableEnumHelper.isValidEnumValue("INVALID$VALUE"));
+
+	}
 }