Skip to content

Commit aa14f93

Browse files
deleted method 'findTaskStatusByIdOrThrow()' to TaskStatusService.java
1 parent c2e6e4e commit aa14f93

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

src/main/java/hexlet/code/service/UserService.java

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
import hexlet.code.dto.user.UserUpdateDTO;
66
import hexlet.code.exception.ResourceNotFoundException;
77
import hexlet.code.mapper.UserMapper;
8-
import hexlet.code.model.User;
98
import hexlet.code.repository.UserRepository;
109
import lombok.AllArgsConstructor;
1110
import 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

Comments
 (0)