Corrected the regexes

Author: KarnaiahPesula

sormas-api/src/main/java/de/symeda/sormas/api/i18n/Validations.java

@@ -277,7 +277,8 @@ public interface Validations {
 	String systemConfigurationValueValidationNotAFile = "systemConfigurationValueValidationNotAFile";
 	String systemConfigurationValueValidationNotAIPAddr = "systemConfigurationValueValidationNotAIPAddr";
 	String systemConfigurationValueValidationNotANumber = "systemConfigurationValueValidationNotANumber";
-	String systemConfigurationValueValidationNotAValidName = "systemConfigurationValueValidationNotAValidName";
+	String systemConfigurationValueValidationNotAValidEmailsenderName = "systemConfigurationValueValidationNotAValidEmailsenderName";
+	String systemConfigurationValueValidationNotAValidSmsSenderName = "systemConfigurationValueValidationNotAValidSmsSenderName";
 	String systemConfigurationValueValidationNotValid = "systemConfigurationValueValidationNotValid";
 	String taskMissingCaseLink = "taskMissingCaseLink";
 	String taskMissingContactLink = "taskMissingContactLink";

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

@@ -324,6 +324,7 @@ systemConfigurationValueValidationNotANumber = Value is not a valid number
 systemConfigurationValueValidationNotADirectory = Value is not a valid directory
 systemConfigurationValueValidationNotAFile = Value is not a valid file
 systemConfigurationValueValidationNotAEmail = Value is not a valid email address
-systemConfigurationValueValidationNotAValidName = Value is not a valid name. Name should contain only letters and numbers without spaces & special characters. For more info please see https://developer.vonage.com/en/messaging/sms/guides/custom-sender-id .
+systemConfigurationValueValidationNotAValidEmailsenderName = Value is not a valid email sender name. Name should contain only alphabets.
+systemConfigurationValueValidationNotAValidSmsSenderName = Value is not a valid name. Name should contain only letters and numbers without spaces & special characters. For more info please see https://developer.vonage.com/en/messaging/sms/guides/custom-sender-id .
 smsAuthKeyValueValidation = SMS Auth key value is not valid
 smsAuthSecretValueValidation = SMS Auth secret value is not valid

sormas-backend/src/main/resources/sql/sormas_schema.sql

@@ -14145,8 +14145,8 @@ WHERE category_id = email_configuration_id
 INSERT INTO systemconfigurationvalue(config_key, config_value, category_id, value_optional, value_pattern,
                                      value_encrypt, data_provider, validation_message, changedate, creationdate, id,
                                      uuid)
-VALUES ('EMAIL_SENDER_NAME', 'SORMAS Support', email_configuration_id, true, '\s*[^\s]+', false, null,
-        'i18n/systemConfigurationValueValidationNotAValidName', now(), now(), nextval('entity_seq'),
+VALUES ('EMAIL_SENDER_NAME', 'SORMAS Support', email_configuration_id, true, '^[A-Za-z]+( [A-Za-z]+)*$', false, null,
+        'i18n/systemConfigurationValueValidationNotAValidEmailsenderName', now(), now(), nextval('entity_seq'),
         generate_base32_uuid());
 
 
@@ -14162,8 +14162,8 @@ INSERT INTO systemconfigurationvalue(config_key, config_value, category_id, valu
                                      value_encrypt, data_provider, validation_message, changedate, creationdate, id,
                                      uuid)
 VALUES ('SMS_SENDER_NAME', '', sms_configuration_id, true,
-        '^((?:[1-9]{2}[0-9]{0,13})|(?:[A-Za-z1-9]{1}[A-Za-z0-9]{1,10}))$', false, null,
-        'i18n/systemConfigurationValueValidationNotAValidName', now(), now(), nextval('entity_seq'),
+        '^(([1-9]{2}[0-9]{0,13})|([A-Za-z1-9]{1}[A-Za-z0-9]{0,10}))$', false, null,
+        'i18n/systemConfigurationValueValidationNotAValidSmsSenderName', now(), now(), nextval('entity_seq'),
         generate_base32_uuid());
 
 DELETE

sormas-backend/src/test/java/de/symeda/sormas/backend/systemconfiguration/SystemConfigurationValueFacadeEJbTest.java

@@ -232,8 +232,9 @@ void testValidateSystemConfigurationValuePipeSeparatedWordsPatternFail() {
     @CsvSource({
             "'^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$', 192.168.1.1",
             "^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$, test@sormas.org", // Valid email
-            "'^((?:[1-9]{2}[0-9]{0,13})|(?:[A-Za-z1-9]{1}[A-Za-z0-9]{1,10}))$', 'abcXYZ123'", // Valid sms sender name as name
-            "'^((?:[1-9]{2}[0-9]{0,13})|(?:[A-Za-z1-9]{1}[A-Za-z0-9]{0,10}))$', '12345678901234'", // Valid sms sender as phone number
+            "^[A-Za-z]+( [A-Za-z]+)*$, Sormas Support", // Valid email sender name
+            "'^(([1-9]{2}[0-9]{0,13})|([A-Za-z1-9]{1}[A-Za-z0-9]{0,10}))$', 'abcXYZ123'", // Valid sms sender name as name
+            "'^(([1-9]{2}[0-9]{0,13})|([A-Za-z1-9]{1}[A-Za-z0-9]{0,10}))$', '12345678901234'", // Valid sms sender as phone number
             "'\\s*[^\\s]+', 'abCD12!@efGH34#$'", // Valid Auth Key
             "'(?i)(secret|password|token|api[_-]?key)\\s*[:=]\\s*[^\\s]+', 'apiKey=sormas2025orgKEY'", // Valid secret api key
             "'(?i)(secret|password|token|api[_-]?key)\\s*[:=]\\s*[^\\s]+', 'Secret : s3cr3tV@lu3P@ssw0rd!'", // Valid secret key
@@ -257,9 +258,10 @@ void testValidateSystemConfigurationValuePattern(String pattern, String value) {
     @ParameterizedTest
     @CsvSource({
             "'^((25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\\.){3}(25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$', 1.234343.2.3", // invalid IP
-            "^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$, test.sormas.org", // Invalid email
-            "'^((?:[1-9]{2}[0-9]{0,13})|(?:[A-Za-z1-9]{1}[A-Za-z0-9]{1,10}))$', 'abc XYZ123'", // Invalid sms sender name as name
-            "'^((?:[1-9]{2}[0-9]{0,13})|(?:[A-Za-z1-9]{1}[A-Za-z0-9]{0,10}))$', 'ABCdefHI055202'", // Invalid sms sender as phone number
+            "'^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\\.[a-zA-Z0-9-.]+$', test.sormas.org", // Invalid email
+            "'^[A-Za-z]+( [A-Za-z]+)*$', Sormas 123", // Valid email sender name
+            "'^(([1-9]{2}[0-9]{0,13})|([A-Za-z1-9]{1}[A-Za-z0-9]{0,10}))$', 'abc XYZ123'", // Invalid sms sender name as name
+            "'^(([1-9]{2}[0-9]{0,13})|([A-Za-z1-9]{1}[A-Za-z0-9]{0,10}))$', 'ABCdefHI055202'", // Invalid sms sender as phone number
             "'\\s*[^\\s]+', 'abCD12 !@efG H34#$'", // Valid Auth Key
             "'(?i)(secret|password|token|api[_-]?key)\\s*[:=]\\s*[^\\s]+', 'apiKey=abcd EFGH1234ijk lMNOP'", // Invalid secret api key
             "'(?i)(secret|password|token|api[_-]?key)\\s*[:=]\\s*[^\\s]+', 'Secret : s3cr3 tV@lu3P@ ssw0rd!'", // Invalid secret key