diff --git a/src/main/java/leets/weeth/domain/user/dto/UserDTO.java b/src/main/java/leets/weeth/domain/user/dto/UserDTO.java index 3cd32fdf..51f3d60a 100644 --- a/src/main/java/leets/weeth/domain/user/dto/UserDTO.java +++ b/src/main/java/leets/weeth/domain/user/dto/UserDTO.java @@ -41,7 +41,8 @@ public record Response( String tel, String department, List cardinals, - Position position + Position position, + Role role ) {} public record AdminResponse ( diff --git a/src/main/java/leets/weeth/domain/user/service/UserService.java b/src/main/java/leets/weeth/domain/user/service/UserService.java index d14158c9..c8df4327 100644 --- a/src/main/java/leets/weeth/domain/user/service/UserService.java +++ b/src/main/java/leets/weeth/domain/user/service/UserService.java @@ -50,7 +50,8 @@ public void applyOB(Long userId, Integer cardinal) { User user = userRepository.findById(userId) .orElseThrow(UserNotFoundException::new); - user.applyOB(cardinal); + if(!user.getCardinals().contains(cardinal)) + user.applyOB(cardinal); } public Map> findAll() {