Skip to content

Commit

Permalink
4.8.14 dev v4 (#568)
Browse files Browse the repository at this point in the history 
* Update the field and remove the roles field (#566)

* Update the field and remove the roles field

* Update the field and adding validation

* Adding the verified field
  • Loading branch information
@Sahil-tarento
Sahil-tarento authored May 23, 2024
1 parent 3e28f9f commit 61d359c
Show file tree
Hide file tree
Showing 3 changed files with 71 additions and 60 deletions.
23 changes: 18 additions & 5 deletions src/main/java/org/sunbird/common/util/ProjectUtil.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,9 @@

import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.UUID;
import java.util.*;
import java.util.regex.Pattern;
import java.util.stream.Collectors;
import java.util.stream.Stream;
Expand Down Expand Up @@ -185,4 +182,20 @@ public static String decodeUrl(String encodeString){
throw new RuntimeException(e);
}
}

public static Boolean validateDate(String dateString){
SimpleDateFormat dateFormat = new SimpleDateFormat("dd-MM-yyyy");
dateFormat.setLenient(false);
try {
Date todaysDate = new Date();
Calendar calendar = Calendar.getInstance();
calendar.add(Calendar.YEAR, -65);
Date pastDate = calendar.getTime();
Date date = dateFormat.parse(dateString);
return date.after(pastDate) && (date.before(todaysDate) || date.equals(todaysDate));
} catch (ParseException e) {
e.printStackTrace();
}
return false;
}
}
101 changes: 47 additions & 54 deletions src/main/java/org/sunbird/profile/service/UserBulkUploadService.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
// incrementing the iterator inorder to skip the headers in the first row
if (rowIterator.hasNext()) {
Row firstRow = rowIterator.next();
Cell statusCell = firstRow.getCell(15);
Cell errorDetails = firstRow.getCell(16);
Cell statusCell = firstRow.getCell(14);
Cell errorDetails = firstRow.getCell(15);
if (statusCell == null) {
statusCell = firstRow.createCell(15);
statusCell = firstRow.createCell(14);
}
if (errorDetails == null) {
errorDetails = firstRow.createCell(16);
errorDetails = firstRow.createCell(15);
}
statusCell.setCellValue("Status");
errorDetails.setCellValue("Error Details");
Expand All @@ -147,7 +147,7 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
invalidErrList.add("Invalid Full Name");
}
} else {
invalidErrList.add("Invalid column type. Expecting string format");
invalidErrList.add("Invalid value for Full Name column type. Expecting string format");
}
}
if (nextRow.getCell(1) == null || nextRow.getCell(1).getCellType() == CellType.BLANK) {
Expand All @@ -156,19 +156,25 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
if (nextRow.getCell(1).getCellType() == CellType.STRING) {
userRegistration.setEmail(nextRow.getCell(1).getStringCellValue().trim());
} else {
invalidErrList.add("Invalid column type. Expecting string format");
invalidErrList.add("Invalid value for Email column type. Expecting string format");
}
}
if (nextRow.getCell(2) == null || nextRow.getCell(2).getCellType() == CellType.BLANK) {
errList.add("Phone");
errList.add("Mobile Number");
} else {
if (nextRow.getCell(2).getCellType() == CellType.NUMERIC) {
phone = NumberToTextConverter.toText(nextRow.getCell(2).getNumericCellValue());
userRegistration.setPhone(phone.trim());
} else if (nextRow.getCell(2).getCellType() == CellType.STRING) {
userRegistration.setPhone(nextRow.getCell(2).getStringCellValue().trim());
phone = nextRow.getCell(2).getStringCellValue();
userRegistration.setPhone(phone.trim());
} else {
invalidErrList.add("Invalid column type. Expecting number/string format");
invalidErrList.add("Invalid value for Mobile Number column type. Expecting number/string format");
}
}
if (StringUtils.isNotBlank(phone)) {
if (!ProjectUtil.validateContactPattern(phone)) {
invalidErrList.add("The Mobile Number provided is Invalid");
}
}
if (nextRow.getCell(3) == null || nextRow.getCell(3).getCellType() == CellType.BLANK) {
Expand All @@ -180,7 +186,7 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
invalidErrList.add("Invalid Group : Group can be only among one of these " + serverProperties.getBulkUploadGroupValue());
}
} else {
invalidErrList.add("Invalid column type. Expecting string format");
invalidErrList.add("Invalid value for Group Name column type. Expecting string format");
}
}
if (nextRow.getCell(4) == null || nextRow.getCell(4).getCellType() == CellType.BLANK) {
Expand All @@ -189,44 +195,48 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
if (nextRow.getCell(4).getCellType() == CellType.STRING) {
userRegistration.setPosition(nextRow.getCell(4).getStringCellValue().trim());
} else {
invalidErrList.add("Invalid column type. Expecting string format");
invalidErrList.add("Invalid value for Designation column type. Expecting string format");
}
}
if (nextRow.getCell(5) != null && nextRow.getCell(5).getCellType() != CellType.BLANK) {
if (nextRow.getCell(5).getCellType() == CellType.NUMERIC) {
userRegistration.setEmployeeId(NumberToTextConverter.toText(nextRow.getCell(5).getNumericCellValue()).trim());
} else if (nextRow.getCell(5).getCellType() == CellType.STRING) {
userRegistration.setEmployeeId(nextRow.getCell(5).getStringCellValue().trim());
if (nextRow.getCell(5).getCellType() == CellType.STRING) {
userRegistration.setGender(nextRow.getCell(5).getStringCellValue().trim());
} else {
invalidErrList.add("Invalid column type. Expecting string/number format");
invalidErrList.add("Invalid value for Gender column type. Expecting string format");
}
}
if (nextRow.getCell(6) != null && nextRow.getCell(6).getCellType() != CellType.BLANK) {
if (nextRow.getCell(6).getCellType() == CellType.STRING) {
userRegistration.setGender(nextRow.getCell(6).getStringCellValue().trim());
userRegistration.setCategory(nextRow.getCell(6).getStringCellValue().trim());
} else {
invalidErrList.add("Invalid column type. Expecting string format");
invalidErrList.add("Invalid value for Category column type. Expecting string format");
}
}
if (nextRow.getCell(7) != null && nextRow.getCell(7).getCellType() != CellType.BLANK) {
if (nextRow.getCell(7).getCellType() == CellType.STRING) {
userRegistration.setDob(nextRow.getCell(7).getStringCellValue().trim());
if (ProjectUtil.validateDate(nextRow.getCell(7).getStringCellValue().trim())) {
userRegistration.setDob(nextRow.getCell(7).getStringCellValue().trim());
} else {
invalidErrList.add("Invalid format for Date of Birth type. Expecting in format dd-MM-yyyy");
}
} else {
invalidErrList.add("Invalid column type. Expecting string format");
invalidErrList.add("Invalid value for Date of Birth column type. Expecting string format");
}
}
if (nextRow.getCell(8) != null && nextRow.getCell(8).getCellType() != CellType.BLANK) {
if (nextRow.getCell(8).getCellType() == CellType.STRING) {
userRegistration.setDomicileMedium(nextRow.getCell(8).getStringCellValue().trim());
} else {
invalidErrList.add("Invalid column type. Expecting string format");
invalidErrList.add("Invalid value for Mother Tongue column type. Expecting string format");
}
}
if (nextRow.getCell(9) != null && nextRow.getCell(9).getCellType() != CellType.BLANK) {
if (nextRow.getCell(9).getCellType() == CellType.STRING) {
userRegistration.setCategory(nextRow.getCell(9).getStringCellValue().trim());
if (nextRow.getCell(9).getCellType() == CellType.NUMERIC) {
userRegistration.setEmployeeId(NumberToTextConverter.toText(nextRow.getCell(9).getNumericCellValue()).trim());
} else if (nextRow.getCell(9).getCellType() == CellType.STRING) {
userRegistration.setEmployeeId(nextRow.getCell(9).getStringCellValue().trim());
} else {
invalidErrList.add("Invalid column type. Expecting string format");
invalidErrList.add("Invalid value for Employee ID column type. Expecting string/number format");
}
}
if (nextRow.getCell(10) != null && nextRow.getCell(10).getCellType() != CellType.BLANK) {
Expand All @@ -235,7 +245,7 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
} else if (nextRow.getCell(10).getCellType() == CellType.STRING) {
userRegistration.setPincode(nextRow.getCell(10).getStringCellValue().trim());
} else {
invalidErrList.add("Invalid column type. Expecting number/string format");
invalidErrList.add("Invalid value for Office Pin Code column type. Expecting number/string format");
}
}
if (nextRow.getCell(11) != null && nextRow.getCell(11).getCellType() != CellType.BLANK) {
Expand All @@ -250,17 +260,17 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
invalidErrList.add("Invalid External System ID : External System Id can contain alphanumeric characters and have a max length of 30");
}
} else {
invalidErrList.add("Invalid column type. Expecting string/number format");
invalidErrList.add("Invalid value for External System ID column type. Expecting string/number format");
}
}
if (nextRow.getCell(12) != null && !StringUtils.isBlank(nextRow.getCell(12).toString())) {
if (nextRow.getCell(12).getCellType() == CellType.STRING) {
userRegistration.setExternalSystem(nextRow.getCell(12).getStringCellValue().trim());
if (!ProjectUtil.validateExternalSystem(userRegistration.getExternalSystem())) {
invalidErrList.add("Invalid External System : External System can contain only alphabets and can have a max length of 255");
invalidErrList.add("Invalid External System : External System Name can contain only alphabets and can have a max length of 255");
}
} else {
invalidErrList.add("Invalid column type. Expecting string format");
invalidErrList.add("Invalid value for External System Name column type. Expecting string format");
}
}
if (nextRow.getCell(13) != null && nextRow.getCell(13).getCellType() != CellType.BLANK) {
Expand All @@ -278,37 +288,19 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
invalidErrList.add("Invalid Tag : Tags are comma seperated string values. A Tag can contain only alphabets with spaces. eg: Bihar Circle, Patna Division");
}
} else {
invalidErrList.add("Invalid column type. Expecting string format");
}
}
if (nextRow.getCell(14) != null && nextRow.getCell(14).getCellType() != CellType.BLANK) {
if (nextRow.getCell(14).getCellType() == CellType.STRING) {
String rolesStr = nextRow.getCell(14).getStringCellValue().trim();
List<String> rolesList = new ArrayList<String>();
if (!StringUtils.isEmpty(rolesStr)) {
String[] rolesStrList = rolesStr.split(",", -1);
for (String role : rolesStrList) {
rolesList.add(role.trim());
if (!serverProperties.getBulkUploadAllowedRolesCreation().contains(role.trim())) {
invalidErrList.add("Invalid userRoles, allowed Roles are: " + serverProperties.getBulkUploadAllowedRolesCreation());
}
}
}
userRegistration.setRoles(rolesList);
} else {
invalidErrList.add("Invalid column type. Expecting string format");
invalidErrList.add("Invalid value for Tags column type. Expecting string format");
}
}
userRegistration.setOrgName(inputDataMap.get(Constants.ORG_NAME));
userRegistration.setChannel(inputDataMap.get(Constants.ORG_NAME));
userRegistration.setSbOrgId(inputDataMap.get(Constants.ROOT_ORG_ID));
Cell statusCell = nextRow.getCell(15);
Cell errorDetails = nextRow.getCell(16);
Cell statusCell = nextRow.getCell(14);
Cell errorDetails = nextRow.getCell(15);
if (statusCell == null) {
statusCell = nextRow.createCell(15);
statusCell = nextRow.createCell(14);
}
if (errorDetails == null) {
errorDetails = nextRow.createCell(16);
errorDetails = nextRow.createCell(15);
}
if (totalRecordsCount == 0 && errList.size() == 4) {
setErrorDetails(str, errList, statusCell, errorDetails);
Expand Down Expand Up @@ -338,7 +330,8 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
} else {
failedRecordsCount++;
statusCell.setCellValue(Constants.FAILED_UPPERCASE);
errorDetails.setCellValue(invalidErrList.toString());
String invalidErrString = String.join(", ", invalidErrList);
errorDetails.setCellValue(invalidErrString);
}
}
duration = System.currentTimeMillis() - startTime;
Expand All @@ -347,8 +340,8 @@ private void processBulkUpload(HashMap<String, String> inputDataMap) throws IOEx
}
if (totalRecordsCount == 0) {
XSSFRow row = sheet.createRow(sheet.getLastRowNum() + 1);
Cell statusCell = row.createCell(15);
Cell errorDetails = row.createCell(16);
Cell statusCell = row.createCell(14);
Cell errorDetails = row.createCell(15);
statusCell.setCellValue(Constants.FAILED_UPPERCASE);
errorDetails.setCellValue(Constants.EMPTY_FILE_FAILED);

Expand Down
7 changes: 6 additions & 1 deletion src/main/java/org/sunbird/user/service/UserUtilityServiceImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -675,7 +675,12 @@ public String updateBulkUploadUser(UserRegistration userRegistration) {
profileDetails.put(Constants.ADDITIONAL_PROPERTIES, additionalProperties);
profileDetails.put(Constants.VERIFIED_KARMAYOGI, false);
profileDetails.put(Constants.MANDATORY_FIELDS_EXISTS, false);
profileDetails.put(Constants.PROFILE_STATUS, Constants.NOT_VERIFIED);
if (StringUtils.isNotBlank(userRegistration.getGroup())
&& StringUtils.isNotBlank(userRegistration.getPosition())) {
profileDetails.put(Constants.PROFILE_STATUS, Constants.VERIFIED);
} else {
profileDetails.put(Constants.PROFILE_STATUS, Constants.NOT_VERIFIED);
}
requestBody.put(Constants.PROFILE_DETAILS, profileDetails);
request.put(Constants.REQUEST, requestBody);
Map<String, Object> readData = (Map<String, Object>) outboundRequestHandlerService.fetchResultUsingPatch(
Expand Down

0 comments on commit 61d359c

Please sign in to comment.