Commit 52eb936e authored by shishir suman's avatar shishir suman
Browse files

removing CORS filter

Showing with 19 additions and 5 deletions
+19 -5
......@@ -88,7 +88,7 @@ public class UserController {
}
}
@PutMapping("/update-user")
@PostMapping("/update-user")
public ResponseEntity<String> updateUser(@RequestBody UpdateUserDto userDto) {
try {
integrationService.updateUser(userDto);
......
......@@ -6,14 +6,28 @@ import java.util.stream.Collectors;
public enum Department {
REGISTRATION(1), EXAM(2), HALL_TICKET(3), OTHERS(-1);
REGISTRATION(1, "Registration"), AFFILIATION(2, "Affiliation"), ASSESSMENT(3, "Assessment"), HALL_TICKET(4, "Hall Ticket"), OTHERS(-1, "Others");
private int id;
private String code;
Department(int id) {
this.id = id;
}
Department(int id, String code) {
this.id = id;
this.code = code;
}
public static List<Department> getById(int id) {
return Arrays.stream(Department.values()).filter(x -> x.id == id).collect(Collectors.toList());
}
public int getId() {
return id;
}
public String getCode() {
return code;
}
}
......@@ -140,7 +140,7 @@ public class IntegrationServiceImpl implements IntegrationService {
if(departmentId != null) {
departmentList = Department.getById(Integer.valueOf(departmentId));
if(departmentList != null && !departmentList.isEmpty()) {
user.getAttributes().put("departmentName", departmentList.get(0).name());
user.getAttributes().put("departmentName", departmentList.get(0).getCode());
}
}
HttpHeaders headers = new HttpHeaders();
......@@ -176,7 +176,7 @@ public class IntegrationServiceImpl implements IntegrationService {
createUserRoleMapping(user, savedUser);
// create user department mapping
if(savedUser != null && savedUser.getId() > 0 && departmentList != null && !departmentList.isEmpty()) {
org.upsmf.grievance.model.Department departmentMap = org.upsmf.grievance.model.Department.builder().departmentName(departmentList.get(0).name()).userId(savedUser.getId()).build();
org.upsmf.grievance.model.Department departmentMap = org.upsmf.grievance.model.Department.builder().departmentName(departmentList.get(0).getCode()).userId(savedUser.getId()).build();
org.upsmf.grievance.model.Department userDepartment = departmentRepository.save(departmentMap);
List<org.upsmf.grievance.model.Department> departments = new ArrayList<>();
departments.add(userDepartment);
......@@ -225,7 +225,7 @@ public class IntegrationServiceImpl implements IntegrationService {
if(departmentId != null) {
departmentList = Department.getById(Integer.valueOf(departmentId));
if(departmentList != null && !departmentList.isEmpty()) {
user.getAttributes().put("departmentName", departmentList.get(0).name());
user.getAttributes().put("departmentName", departmentList.get(0).getCode());
}
}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment