From a68257b9c62fd8b8a43eebc199fb18ac34be07cc Mon Sep 17 00:00:00 2001 From: dongHyo Date: Fri, 10 Jun 2022 22:17:58 +0900 Subject: [PATCH] =?UTF-8?q?refactor:=20Exception=20Class=20Naming=20?= =?UTF-8?q?=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...FoundEmailException.java => EmailNotFoundException.java} | 4 ++-- ...otFindTokenException.java => TokenNotFindException.java} | 4 ++-- .../server/user/service/AuthenticationServiceImpl.java | 4 ++-- .../com/ticketing/server/user/service/UserServiceImpl.java | 6 +++--- .../ticketing/server/user/service/UserServiceImplTest.java | 6 +++--- 5 files changed, 12 insertions(+), 12 deletions(-) rename server/src/main/java/com/ticketing/server/global/exception/{NotFoundEmailException.java => EmailNotFoundException.java} (62%) rename server/src/main/java/com/ticketing/server/global/exception/token/{NotFindTokenException.java => TokenNotFindException.java} (64%) diff --git a/server/src/main/java/com/ticketing/server/global/exception/NotFoundEmailException.java b/server/src/main/java/com/ticketing/server/global/exception/EmailNotFoundException.java similarity index 62% rename from server/src/main/java/com/ticketing/server/global/exception/NotFoundEmailException.java rename to server/src/main/java/com/ticketing/server/global/exception/EmailNotFoundException.java index d04c4e8..3f621fc 100644 --- a/server/src/main/java/com/ticketing/server/global/exception/NotFoundEmailException.java +++ b/server/src/main/java/com/ticketing/server/global/exception/EmailNotFoundException.java @@ -1,10 +1,10 @@ package com.ticketing.server.global.exception; -public class NotFoundEmailException extends IllegalArgumentException { +public class EmailNotFoundException extends IllegalArgumentException { private static final String MESSAGE = "존재하지 않는 이메일 입니다."; - public NotFoundEmailException() { + public EmailNotFoundException() { super(MESSAGE); } diff --git a/server/src/main/java/com/ticketing/server/global/exception/token/NotFindTokenException.java b/server/src/main/java/com/ticketing/server/global/exception/token/TokenNotFindException.java similarity index 64% rename from server/src/main/java/com/ticketing/server/global/exception/token/NotFindTokenException.java rename to server/src/main/java/com/ticketing/server/global/exception/token/TokenNotFindException.java index 5884e72..72aff4d 100644 --- a/server/src/main/java/com/ticketing/server/global/exception/token/NotFindTokenException.java +++ b/server/src/main/java/com/ticketing/server/global/exception/token/TokenNotFindException.java @@ -1,10 +1,10 @@ package com.ticketing.server.global.exception.token; -public class NotFindTokenException extends TokenException { +public class TokenNotFindException extends TokenException { private static final String MESSAGE = "일치하는 토큰을 찾지 못하였습니다."; - public NotFindTokenException() { + public TokenNotFindException() { super(MESSAGE); } } diff --git a/server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java b/server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java index aab1a64..4aee68a 100644 --- a/server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java +++ b/server/src/main/java/com/ticketing/server/user/service/AuthenticationServiceImpl.java @@ -1,6 +1,6 @@ package com.ticketing.server.user.service; -import com.ticketing.server.global.exception.token.NotFindTokenException; +import com.ticketing.server.global.exception.token.TokenNotFindException; import com.ticketing.server.global.exception.token.TokenTypeException; import com.ticketing.server.global.exception.token.UnavailableRefreshTokenException; import com.ticketing.server.global.redis.RefreshRedisRepository; @@ -60,7 +60,7 @@ public class AuthenticationServiceImpl implements AuthenticationService { // Redis 에 토큰이 있는지 검증 RefreshToken findTokenEntity = refreshRedisRepository.findByEmail(authentication.getName()) - .orElseThrow(NotFindTokenException::new); + .orElseThrow(TokenNotFindException::new); // redis 토큰과 input 토큰이 일치한지 확인 if (!refreshToken.equals(findTokenEntity.getToken())) { 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 c42ba49..34830f8 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 @@ -1,6 +1,6 @@ package com.ticketing.server.user.service; -import com.ticketing.server.global.exception.NotFoundEmailException; +import com.ticketing.server.global.exception.EmailNotFoundException; import com.ticketing.server.user.domain.User; import com.ticketing.server.user.domain.repository.UserRepository; import com.ticketing.server.user.service.dto.ChangePasswordDTO; @@ -42,7 +42,7 @@ public class UserServiceImpl implements UserService { User user = userRepository.findByEmail(deleteUserDto.getEmail()) .orElseThrow(() -> { log.error("존재하지 않는 이메일 입니다. :: {}", deleteUserDto.getEmail()); - throw new NotFoundEmailException(); + throw new EmailNotFoundException(); } ); @@ -60,7 +60,7 @@ public class UserServiceImpl implements UserService { return userRepository.findByEmailAndIsDeletedFalse(email) .orElseThrow(() -> { log.error("존재하지 않는 이메일 입니다. :: {}", email); - throw new NotFoundEmailException(); + throw new EmailNotFoundException(); }); } 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 5088a08..312ea5f 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 @@ -5,7 +5,7 @@ import static org.assertj.core.api.Assertions.assertThatThrownBy; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.when; -import com.ticketing.server.global.exception.NotFoundEmailException; +import com.ticketing.server.global.exception.EmailNotFoundException; import com.ticketing.server.user.domain.User; import com.ticketing.server.user.domain.UserGrade; import com.ticketing.server.user.domain.repository.UserRepository; @@ -79,7 +79,7 @@ class UserServiceImplTest { // when // then assertThatThrownBy(() -> userService.delete(deleteUserDto)) - .isInstanceOf(NotFoundEmailException.class); + .isInstanceOf(EmailNotFoundException.class); } @Test @@ -104,7 +104,7 @@ class UserServiceImplTest { // when // then assertThatThrownBy(() -> userService.changePassword(changePasswordDto)) - .isInstanceOf(NotFoundEmailException.class); + .isInstanceOf(EmailNotFoundException.class); } @Test