Fixed issues in validating Designation

sunbird-cb · Jun 20, 2024 · 2707734 · 2707734
1 parent ae9cb1c
commit 2707734
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/src/main/java/org/sunbird/common/util/ProjectUtil.java b/src/main/java/org/sunbird/common/util/ProjectUtil.java
@@ -204,7 +204,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) {

diff --git a/src/main/java/org/sunbird/profile/service/UserBulkUploadService.java b/src/main/java/org/sunbird/profile/service/UserBulkUploadService.java
@@ -478,6 +478,7 @@ private List<String> validateReceivedKafkaMessage(HashMap<String, String> inputD
     }
 
     private boolean validateFieldValue(String fieldKey, String fieldValue) {
+        fieldValue = fieldValue.toLowerCase();
         if(redisCacheMgr.keyExists(fieldKey)){
             return !redisCacheMgr.valueExists(fieldKey, fieldValue);
         } else{
@@ -488,7 +489,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.putCacheAsStringArray(fieldKey, designationsSet.toArray(new String[0]), null);