mindol1004/Ticketing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: 패스워드 변경 시 삭제된 이메일 제외하고 불러오는 형식으로 변경

Browse Source
This commit is contained in:
dongHyo
2022-05-22 22:24:59 +09:00
parent 205297bc10
commit f575528e39
3 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
server/src/main/java/com/ticketing/server/user/domain/repository/UserRepository.java
View File

@@ -10,4 +10,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
Optional<User> findByEmail(String email);
Optional<User> findByEmailAndIsDeletedFalse(String email);
}

2
server/src/main/java/com/ticketing/server/user/service/UserServiceImpl.java
View File

@@ -51,7 +51,7 @@ public class UserServiceImpl implements UserService {
@Override
public Optional<User> modifyPassword(@Valid ChangePassword changePassword) {
Optional<User> optionalUser = userRepository.findByEmail(changePassword.getEmail());
Optional<User> optionalUser = userRepository.findByEmailAndIsDeletedFalse(changePassword.getEmail());
if (optionalUser.isEmpty()) {
log.error("존재하지 않는 이메일 입니다. :: {}", changePassword);
return Optional.empty();

4
server/src/test/java/com/ticketing/server/user/service/UserServiceImplTest.java
View File

@@ -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> 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> user = userService.modifyPassword(changePassword);