diff --git a/server/src/main/java/com/ticketing/server/user/domain/repository/UserRepository.java b/server/src/main/java/com/ticketing/server/user/domain/repository/UserRepository.java index 917570a..adec774 100644 --- a/server/src/main/java/com/ticketing/server/user/domain/repository/UserRepository.java +++ b/server/src/main/java/com/ticketing/server/user/domain/repository/UserRepository.java @@ -10,4 +10,6 @@ public interface UserRepository extends JpaRepository { Optional findByEmail(String email); + Optional findByEmailAndIsDeletedFalse(String email); + } 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 7cc3ccc..020b8ed 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 @@ -51,7 +51,7 @@ public class UserServiceImpl implements UserService { @Override public Optional modifyPassword(@Valid ChangePassword changePassword) { - Optional optionalUser = userRepository.findByEmail(changePassword.getEmail()); + Optional optionalUser = userRepository.findByEmailAndIsDeletedFalse(changePassword.getEmail()); if (optionalUser.isEmpty()) { log.error("존재하지 않는 이메일 입니다. :: {}", changePassword); return Optional.empty(); diff --git a/server/src/test/java/com/ticketing/server/user/service/UserServiceImplTest.java b/server/src/test/java/com/ticketing/server/user/service/UserServiceImplTest.java index 2ff5ff3..0a0be6c 100644 --- a/server/src/test/java/com/ticketing/server/user/service/UserServiceImplTest.java +++ b/server/src/test/java/com/ticketing/server/user/service/UserServiceImplTest.java @@ -99,7 +99,7 @@ class UserServiceImplTest { @DisplayName("패스워드 변경 시 이메일이 존재하지 않을 경우") void modifyPasswordFail() { // given - when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.empty()); + when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.empty()); // when Optional user = userService.modifyPassword(changePassword); @@ -112,7 +112,7 @@ class UserServiceImplTest { @DisplayName("패스워드 변경 성공했을 경우") void modifyPasswordSuccess() { // given - when(userRepository.findByEmail("ticketing@gmail.com")).thenReturn(Optional.of(user)); + when(userRepository.findByEmailAndIsDeletedFalse("ticketing@gmail.com")).thenReturn(Optional.of(user)); // when Optional user = userService.modifyPassword(changePassword);