From da677ca039ee67f8fa94556c311073a2826a3ed7 Mon Sep 17 00:00:00 2001 From: rajesh Date: Thu, 6 Feb 2025 20:33:40 +0530 Subject: [PATCH] Created a new endpoint to update user --- .../gepafin/tendermanagement/dao/UserDao.java | 54 +++++++++++++++++++ .../request/UpdateUserReqForBeneficiary.java | 18 +++++++ .../tendermanagement/service/UserService.java | 2 + .../service/impl/UserServiceImpl.java | 6 +++ .../web/rest/api/UserApi.java | 20 ++++++- .../web/rest/api/impl/UserApiController.java | 18 ++++++- 6 files changed, 116 insertions(+), 2 deletions(-) create mode 100644 src/main/java/net/gepafin/tendermanagement/model/request/UpdateUserReqForBeneficiary.java diff --git a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java index 0ffa0b42..acb098ef 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/UserDao.java @@ -20,6 +20,7 @@ import net.gepafin.tendermanagement.util.LoggingUtil; import net.gepafin.tendermanagement.util.Utils; import net.gepafin.tendermanagement.util.Validator; import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException; +import net.gepafin.tendermanagement.web.rest.api.errors.ForbiddenAccessException; import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException; import net.gepafin.tendermanagement.web.rest.api.errors.Status; @@ -597,5 +598,58 @@ public class UserDao { return userResponseBeans; } + public UserResponseBean updateUserDetails(HttpServletRequest request , Long userId, UpdateUserReqForBeneficiary userReq){ + log.info("Updating user by beneficiary with ID: {}", userId); + UserEntity userEntity = validator.validateUserId(request, userId); + + UserEntity oldUserEntity = Utils.getClonedEntityForData(userEntity); + log.info("Current user details: {}", userEntity); + log.info("New user details: {}", userReq); + + HubEntity hubEntity = hubService.valdateHub(userEntity.getHub().getId()); + String beneficiaryRoleType = RoleStatusEnum.ROLE_BENEFICIARY.getValue(); + + if (validator.checkIsBeneficiary()) { + // Validate if the new email already exists for another beneficiary in the same hub + boolean emailExistsForBeneficiary = userRepository.existsByEmailIgnoreCaseForBeneficiaries( + userReq.getEmail(), hubEntity.getUniqueUuid(), beneficiaryRoleType); + + if (emailExistsForBeneficiary) { + throw new CustomValidationException(Status.VALIDATION_ERROR, + Translator.toLocale(GepafinConstant.EMAIL_ALREADY_EXISTS)); + } + + setIfUpdated(userEntity::getEmail,userEntity::setEmail,userReq.getEmail()); // Only update email if role is beneficiary + } + + BeneficiaryEntity oldBeneficiaryEntity = null; + + if(userEntity.getBeneficiary()!=null) { + oldBeneficiaryEntity = Utils.getClonedEntityForData(userEntity.getBeneficiary()); + setIfUpdated(userEntity.getBeneficiary()::getFirstName, userEntity.getBeneficiary()::setFirstName, userReq.getFirstName()); + setIfUpdated(userEntity.getBeneficiary()::getLastName, userEntity.getBeneficiary()::setLastName, userReq.getLastName()); + setIfUpdated(userEntity.getBeneficiary()::getOrganization, userEntity.getBeneficiary()::setOrganization, userReq.getOrganization()); + setIfUpdated(userEntity.getBeneficiary()::getAddress, userEntity.getBeneficiary()::setAddress, userReq.getAddress()); + setIfUpdated(userEntity.getBeneficiary()::getPhoneNumber, userEntity.getBeneficiary()::setPhoneNumber, userReq.getPhoneNumber()); + setIfUpdated(userEntity.getBeneficiary()::getDateOfBirth, userEntity.getBeneficiary()::setDateOfBirth, userReq.getDateOfBirth()); + setIfUpdated(userEntity.getBeneficiary()::getCity, userEntity.getBeneficiary()::setCity, userReq.getCity()); + setIfUpdated(userEntity.getBeneficiary()::getCountry, userEntity.getBeneficiary()::setCountry, userReq.getCountry()); + + /** This code is responsible for adding a version history log for the "Update beneficiary details " operation **/ + loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.INSERT).oldData(oldBeneficiaryEntity).newData(userEntity.getBeneficiary()).build()); + } + + userEntity = userRepository.save(userEntity); + + /** This code is responsible for adding a version history log for the "Update user details by beneficiary" operation **/ + loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.INSERT).oldData(oldUserEntity).newData(userEntity).build()); + + return convertUserEntityToUserResponse(userEntity); + } + + + + + } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateUserReqForBeneficiary.java b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateUserReqForBeneficiary.java new file mode 100644 index 00000000..3516db8f --- /dev/null +++ b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateUserReqForBeneficiary.java @@ -0,0 +1,18 @@ +package net.gepafin.tendermanagement.model.request; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class UpdateUserReqForBeneficiary { + private String firstName; + private String lastName; + private String email; + private String phoneNumber; + private String organization; + private String address; + private String city; + private String country; + private LocalDateTime dateOfBirth; +} diff --git a/src/main/java/net/gepafin/tendermanagement/service/UserService.java b/src/main/java/net/gepafin/tendermanagement/service/UserService.java index 6a92a667..d13d8dff 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/UserService.java +++ b/src/main/java/net/gepafin/tendermanagement/service/UserService.java @@ -47,4 +47,6 @@ public interface UserService { public UserEntity getUserEntityById(Long userId); List getAllUsers(HttpServletRequest request, List roleIds); + UserResponseBean updateUserDetails(HttpServletRequest request, Long userId, UpdateUserReqForBeneficiary userReq); + } diff --git a/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java b/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java index b959ba61..320cb616 100644 --- a/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java +++ b/src/main/java/net/gepafin/tendermanagement/service/impl/UserServiceImpl.java @@ -130,4 +130,10 @@ public class UserServiceImpl implements UserService { UserEntity user=validator.validateUser(request); return userDao.getAllUsers(user, roleIds); } + + @Override + @Transactional(rollbackFor = Exception.class) + public UserResponseBean updateUserDetails(HttpServletRequest request, Long userId, UpdateUserReqForBeneficiary userReq) { + return userDao.updateUserDetails(request , userId, userReq); + } } \ No newline at end of file diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java index 6dc45bec..b5517cd6 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/UserApi.java @@ -47,7 +47,7 @@ public interface UserApi { return new ResponseEntity>(HttpStatus.NOT_IMPLEMENTED); } - @Operation(summary = "Api to update user", + @Operation(summary = "Api to update user (Only for super admin)", responses = { @ApiResponse(responseCode = "200", description = "OK"), @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @@ -243,6 +243,24 @@ public interface UserApi { @RequestMapping("favicon.ico") @ResponseBody void returnNoFavicon(); + + @Operation(summary = "Api to update user", + responses = { + @ApiResponse(responseCode = "200", description = "OK"), + @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE)})), + @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE)})), + @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { + @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE)}))}) + @RequestMapping(value = "/{userId}/update-details", + produces = {"application/json"}, + method = RequestMethod.PUT) + default ResponseEntity> updateUserDetails(HttpServletRequest request, + @Parameter(description = "The user id", required = true) @PathVariable("userId") Long userId, + @Parameter(description = "User request object", required = true) @Valid @RequestBody UpdateUserReqForBeneficiary userReq) { + return new ResponseEntity<>(HttpStatus.NOT_IMPLEMENTED); + } diff --git a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java index 0d649943..35088a3b 100644 --- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java +++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/UserApiController.java @@ -247,5 +247,21 @@ public class UserApiController implements UserApi { public void returnNoFavicon() { // Do nothing } - + + @Override + public ResponseEntity> updateUserDetails(HttpServletRequest request, + @PathVariable("userId") Long userId, + @Valid @RequestBody UpdateUserReqForBeneficiary userReq) { + log.info("Update User for Beneficiary- User ID: {}, Request Body: {}", userId, userReq); + + /** This code is responsible for "Updating user details by beneficiary" operation. **/ + loggingUtil.logUserAction(UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPDATE) + .actionContext(UserActionContextEnum.UPDATE_USER_DETAILS).build()); + + UserResponseBean updatedUser = userService.updateUserDetails(request, userId, userReq); + + return ResponseEntity.status(HttpStatus.OK) + .body(new Response<>(updatedUser, Status.SUCCESS, Translator.toLocale(GepafinConstant.USER_UPDATED_SUCCESS_MSG))); + } + } \ No newline at end of file