feat: update user editing functionality to include user ID in the request
This commit is contained in:
@@ -13,7 +13,6 @@ import org.springframework.beans.factory.annotation.Autowired;
|
|||||||
import org.springframework.data.domain.Page;
|
import org.springframework.data.domain.Page;
|
||||||
import org.springframework.data.domain.PageRequest;
|
import org.springframework.data.domain.PageRequest;
|
||||||
import org.springframework.data.domain.Sort;
|
import org.springframework.data.domain.Sort;
|
||||||
import org.springframework.http.ResponseEntity;
|
|
||||||
import org.springframework.security.access.prepost.PreAuthorize;
|
import org.springframework.security.access.prepost.PreAuthorize;
|
||||||
import org.springframework.validation.annotation.Validated;
|
import org.springframework.validation.annotation.Validated;
|
||||||
import org.springframework.web.bind.annotation.*;
|
import org.springframework.web.bind.annotation.*;
|
||||||
@@ -82,13 +81,16 @@ public class UserController {
|
|||||||
/**
|
/**
|
||||||
* Edit a user.
|
* Edit a user.
|
||||||
*
|
*
|
||||||
|
* @param id user ID
|
||||||
* @param request user to be edited
|
* @param request user to be edited
|
||||||
* @return edited user
|
* @return edited user
|
||||||
*/
|
*/
|
||||||
@PutMapping
|
@PutMapping("/{id:\\d+}")
|
||||||
public ResponseEntity<Void> editUser(@Validated @RequestBody EditUserRequest request) {
|
public UserDetailResponse editUser(
|
||||||
userService.updateUser(request);
|
@PathVariable Long id,
|
||||||
return ResponseEntity.ok(null);
|
@Validated @RequestBody EditUserRequest request
|
||||||
|
) {
|
||||||
|
return userService.updateUser(id, request);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -143,9 +143,9 @@ public class UserService {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(rollbackFor = Throwable.class)
|
@Transactional(rollbackFor = Throwable.class)
|
||||||
public void updateUser(EditUserRequest request) {
|
public UserDetailResponse updateUser(Long id, EditUserRequest request) {
|
||||||
userManager.updateUser(User.builder()
|
userManager.updateUser(User.builder()
|
||||||
.id(request.id())
|
.id(id)
|
||||||
.fullName(request.fullName())
|
.fullName(request.fullName())
|
||||||
.email(request.email())
|
.email(request.email())
|
||||||
.regionAbbreviation(request.regionAbbreviation())
|
.regionAbbreviation(request.regionAbbreviation())
|
||||||
@@ -155,6 +155,8 @@ public class UserService {
|
|||||||
.departmentId(request.departmentId())
|
.departmentId(request.departmentId())
|
||||||
.positionId(request.positionId())
|
.positionId(request.positionId())
|
||||||
.build());
|
.build());
|
||||||
|
|
||||||
|
return getUserDetailByUserId(id);
|
||||||
}
|
}
|
||||||
|
|
||||||
public UserDetailResponse getUserDetailByUserId(Long userId) {
|
public UserDetailResponse getUserDetailByUserId(Long userId) {
|
||||||
|
|||||||
Reference in New Issue
Block a user