55import hexlet .code .dto .user .UserUpdateDTO ;
66import hexlet .code .exception .ResourceNotFoundException ;
77import hexlet .code .mapper .UserMapper ;
8- import hexlet .code .model .User ;
98import hexlet .code .repository .UserRepository ;
109import lombok .AllArgsConstructor ;
1110import org .springframework .stereotype .Service ;
@@ -27,7 +26,8 @@ public List<UserDTO> getAllUsers() {
2726 }
2827
2928 public UserDTO findByIdUser (Long id ) {
30- var user = findUserByIdOrThrow (id );
29+ var user = userRepository .findById (id )
30+ .orElseThrow (() -> new ResourceNotFoundException ("User with id " + id + " not found" ));
3131
3232 return userMapper .map (user );
3333 }
@@ -40,7 +40,9 @@ public UserDTO createUser(UserCreateDTO userData) {
4040 }
4141
4242 public UserDTO updateUser (UserUpdateDTO userData , Long id ) {
43- var user = findUserByIdOrThrow (id );
43+ var user = userRepository .findById (id )
44+ .orElseThrow (() -> new ResourceNotFoundException ("User with id " + id + " not found" ));
45+
4446 userMapper .update (userData , user );
4547 userRepository .save (user );
4648
@@ -50,9 +52,4 @@ public UserDTO updateUser(UserUpdateDTO userData, Long id) {
5052 public void deleteUser (Long id ) {
5153 userRepository .deleteById (id );
5254 }
53-
54- private User findUserByIdOrThrow (Long id ) {
55- return userRepository .findById (id )
56- .orElseThrow (() -> new ResourceNotFoundException ("User with id " + id + " not found" ));
57- }
5855}
0 commit comments