diff --git a/server/src/main/java/com/ticketing/server/user/service/UserServiceImpl.java b/server/src/main/java/com/ticketing/server/user/service/UserServiceImpl.java index a25a567..6f0fd81 100644 --- a/server/src/main/java/com/ticketing/server/user/service/UserServiceImpl.java +++ b/server/src/main/java/com/ticketing/server/user/service/UserServiceImpl.java @@ -25,16 +25,9 @@ public class UserServiceImpl implements UserService { private final UserRepository userRepository; - @Override public User login(LoginDTO loginDto) { - Optional optionalUser = userRepository.findByEmailAndIsDeletedFalse(loginDto.getEmail()); - if (optionalUser.isEmpty()) { - log.error("존재하지 않는 이메일 입니다. :: {}", loginDto); - throw new NotFoundEmailException(); - } - - User user = optionalUser.get(); + User user = findNotDeletedUserByEmail(loginDto.getEmail()); user.checkPassword(loginDto); return user; } @@ -56,7 +49,7 @@ public class UserServiceImpl implements UserService { public User delete(@Valid DeleteUserDTO deleteUserDto) { Optional optionalUser = userRepository.findByEmail(deleteUserDto.getEmail()); if (optionalUser.isEmpty()) { - log.error("존재하지 않는 이메일 입니다. :: {}", deleteUserDto); + log.error("존재하지 않는 이메일 입니다. :: {}", deleteUserDto.getEmail()); throw new NotFoundEmailException(); } @@ -67,14 +60,17 @@ public class UserServiceImpl implements UserService { @Override @Transactional public User changePassword(@Valid ChangePasswordDTO changePasswordDto) { - Optional optionalUser = userRepository.findByEmailAndIsDeletedFalse(changePasswordDto.getEmail()); - if (optionalUser.isEmpty()) { - log.error("존재하지 않는 이메일 입니다. :: {}", changePasswordDto); - throw new NotFoundEmailException(); - } - - User user = optionalUser.get(); + User user = findNotDeletedUserByEmail(changePasswordDto.getEmail()); return user.changePassword(changePasswordDto); } + private User findNotDeletedUserByEmail(String email) { + Optional optionalUser = userRepository.findByEmailAndIsDeletedFalse(email); + if (optionalUser.isEmpty()) { + log.error("존재하지 않는 이메일 입니다. :: {}", email); + throw new NotFoundEmailException(); + } + return optionalUser.get(); + } + }