Merge remote-tracking branch 'origin/cbrelease-4.8.14' into cbrelease…

…-4.8.15
sunbird-cb · Jun 20, 2024 · 0df11d0 · 0df11d0
2 parents 634651d + 3644fd5
commit 0df11d0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/org/sunbird/workflow/service/UserBulkUploadService.java b/src/main/java/org/sunbird/workflow/service/UserBulkUploadService.java
@@ -653,6 +653,7 @@ private boolean validateGroupValue(String groupValue){
     }
 
     private boolean validateFieldValue(String fieldKey, String fieldValue) {
+        fieldValue = fieldValue.toLowerCase();
         if(redisCacheMgr.keyExists(fieldKey)){
             return !redisCacheMgr.valueExists(fieldKey, fieldValue);
         } else{
@@ -663,7 +664,7 @@ private boolean validateFieldValue(String fieldKey, String fieldValue) {
             if(!CollectionUtils.isEmpty(fieldValueList)) {
                 String columnName = fieldValueList.get(0).get("contextname") != null ? "contextname" : "contextName";
                 for(Map<String, Object> languageMap : fieldValueList){
-                    designationsSet.add((String)languageMap.get(columnName));
+                    designationsSet.add(((String)languageMap.get(columnName)).toLowerCase());
                 }
             }
             redisCacheMgr.putCache(fieldKey, designationsSet.toArray(new String[0]), null);

diff --git a/src/main/java/org/sunbird/workflow/utils/ValidationUtil.java b/src/main/java/org/sunbird/workflow/utils/ValidationUtil.java
@@ -77,7 +77,7 @@ public static Boolean validateEmployeeId(String employeeId) {
 	}
 
 	public static Boolean validateRegexPatternWithNoSpecialCharacter(String regex) {
-		return regex.matches("^[a-zA-Z0-9 -()]*$");
+		return regex.matches("^[a-zA-Z0-9 \\-()]*$");
 	}
 
 	public static Boolean validatePinCode(String regex) {