From 92c5427080c1af4f5566ba9d68db2253328735b2 Mon Sep 17 00:00:00 2001 From: Karthikeyan Rajendran <70887864+karthik-tarento@users.noreply.github.com> Date: Wed, 12 Jun 2024 12:53:45 +0530 Subject: [PATCH] 4.8.14 dev v9 (#594) (#595) * 4.8.14 dev v9 (#589) * 4.8.15 dev v1 (#584) * KB-4705 | DEV| Assessment | BE | Consumption Logic for the QuestionWeightage Assessment Type (#564) * Added string handling in admin patch API * Assessment V5 Changes Assessment V5 Changes * KB-4705 | DEV| Assessment | BE | Consumption Logic for the QuestionWeightage Assessment Type 1. Removed the hardcoded attributes and added from assessment hierarchy. * KB-4705 | DEV| Assessment | BE | Consumption Logic for the QuestionWeightage Assessment Type 1. Added proper comments and logs. 2. Refractored the code. 3. Added logic for optionweightage. --------- * Retry Attempts Enabled for Assessment V5 * KB-4705 | DEV| Assessment | BE | Consumption Logic for the QuestionWeightage Assessment Type (#565) 1. Optional weightage score calculation enhancements. * Adding the insight API implementation for MDO channel (#571) * SaveStateMethod * Maintaining the order of the fields. * KB-4705 | DEV| Assessment | BE | Consumption Logic for the QuestionWeightage Assessment Type (#580) 1. Enhanchements for questionScheme. * KB-5130 | DEV| Assessment | BE | Enhancement in Consumption Logic for the QuestionWeightage Assessment Type. (#581) 1. Added logic for new attributes added. 2. Added questionLevel param in Question read API. * KB-5130 | DEV| Assessment | BE | Enhancement in Consumption Logic for the QuestionWeightage Assessment Type. (#583) 1. Score calculation fix. --------- * KB-4754:Validation for language, designation fix * removed changes from cbrelaease-4.8.15 * Modified error message on date of birth validation failure * changed approach for fetchind and storing data from redis --------- * KB-4754 changed regex for employee Id to allow all alphabets, updated error message for employee Id containing spaces. --------- Co-authored-by: ravisaurav-tarento <142487505+ravisaurav-tarento@users.noreply.github.com> Co-authored-by: Sahil-tarento <140611066+Sahil-tarento@users.noreply.github.com> Co-authored-by: tarentomaheshvakkund <139739142+tarentomaheshvakkund@users.noreply.github.com> Co-authored-by: saipradeep_ravipati --- src/main/java/org/sunbird/common/util/ProjectUtil.java | 2 +- .../java/org/sunbird/profile/service/UserBulkUploadService.java | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/main/java/org/sunbird/common/util/ProjectUtil.java b/src/main/java/org/sunbird/common/util/ProjectUtil.java index b08105c4a..02a169bca 100644 --- a/src/main/java/org/sunbird/common/util/ProjectUtil.java +++ b/src/main/java/org/sunbird/common/util/ProjectUtil.java @@ -200,7 +200,7 @@ public static Boolean validateDate(String dateString){ } public static Boolean validateEmployeeId(String employeeId) { - return employeeId.matches("^(?=.*\\d|[a-zA-Z]{30})[a-zA-Z0-9 .-]{1,30}$"); // Allow only alphanumeric, numeric and restrict if only alphabets character + return employeeId.matches("^[a-zA-Z0-9]{1,30}$"); // Allow only alphanumeric,numeric and alphabetic. } public static Boolean validateRegexPatternWithNoSpecialCharacter(String regex) { diff --git a/src/main/java/org/sunbird/profile/service/UserBulkUploadService.java b/src/main/java/org/sunbird/profile/service/UserBulkUploadService.java index cae10192f..3d225aecd 100644 --- a/src/main/java/org/sunbird/profile/service/UserBulkUploadService.java +++ b/src/main/java/org/sunbird/profile/service/UserBulkUploadService.java @@ -16,8 +16,6 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; import org.springframework.stereotype.Service; -import org.springframework.util.CollectionUtils; -import org.sunbird.cache.RedisCacheMgr; import org.sunbird.cassandra.utils.CassandraOperation; import org.sunbird.common.model.SBApiResponse; import org.sunbird.common.util.CbExtServerProperties;