[FEAT] Validator 구현 - #130

dateroad-api/src/main/java/org/dateroad/auth/jwt/JwtProvider.java

@@ -23,13 +23,6 @@ public Token issueToken(final long userId) {
         );
     }
 
-    //refreshToken 재발급할 때 검증
-    public void validateRefreshToken(LocalDateTime expireDate) {
-        if (expireDate.isBefore(LocalDateTime.now())) {
-            throw new UnauthorizedException(FailureCode.EXPIRED_REFRESH_TOKEN);
-        }
-    }
-
     public long getUserIdFromSubject(String token) {
         Jws<Claims> jws = jwtGenerator.parseToken(token);
         String subject = jws.getBody().getSubject();

dateroad-api/src/main/java/org/dateroad/common/ValidatorUtil.java

@@ -0,0 +1,29 @@
+package org.dateroad.common;
+
+import lombok.AccessLevel;
+import lombok.NoArgsConstructor;
+import org.dateroad.code.FailureCode;
+import org.dateroad.exception.InvalidValueException;
+import org.dateroad.exception.UnauthorizedException;
+import org.dateroad.tag.domain.DateTagType;
+
+import java.time.LocalDateTime;
+import java.util.List;
+
+@NoArgsConstructor(access = AccessLevel.PRIVATE)
+public final class ValidatorUtil {
+
+    //태그 리스트 사이즈 검증
+    public static void validateUserTagSize(final List<DateTagType> userTags) {
+        if (userTags.isEmpty() || userTags.size() > 3) {
+            throw new InvalidValueException((FailureCode.WRONG_USER_TAG_SIZE));
+        }
+    }
+
+    //refreshToken 재발급할 때 검증
+    public static void validateRefreshToken(LocalDateTime expireDate) {
+        if (expireDate.isBefore(LocalDateTime.now())) {
+            throw new UnauthorizedException(FailureCode.EXPIRED_REFRESH_TOKEN);
+        }
+    }
+}

dateroad-api/src/main/java/org/dateroad/user/service/AuthService.java

@@ -6,6 +6,7 @@
 import org.dateroad.auth.jwt.JwtProvider;
 import org.dateroad.auth.jwt.Token;
 import org.dateroad.code.FailureCode;
+import org.dateroad.common.ValidatorUtil;
 import org.dateroad.exception.*;
 import org.dateroad.feign.apple.AppleFeignProvider;
 import org.dateroad.feign.kakao.KakaoFeignProvider;
@@ -33,6 +34,9 @@
 import java.io.IOException;
 import java.util.List;
 
+import static org.dateroad.common.ValidatorUtil.validateRefreshToken;
+import static org.dateroad.common.ValidatorUtil.validateUserTagSize;
+
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 @Service
@@ -74,7 +78,7 @@ public UserJwtInfoRes signIn(final String token, final UserSignInReq userSignInR
     @Transactional
     public UserJwtInfoRes reissue(final String refreshToken) {
         RefreshToken foundRefreshToken = getRefreshTokenByToken(refreshToken);
-        jwtProvider.validateRefreshToken(foundRefreshToken.getExpiredAt());
+        validateRefreshToken(foundRefreshToken.getExpiredAt());
         Long userId = foundRefreshToken.getUserId();
         deleteRefreshToken(userId);
         Token newToken = issueToken(userId);
@@ -156,13 +160,6 @@ private User getUserByUserId(final long userId) {
         );
     }
 
-    //태그 리스트 사이즈 검증
-    public void validateUserTagSize(final List<DateTagType> userTags) {
-        if (userTags.isEmpty() || userTags.size() > 3) {
-            throw new InvalidValueException((FailureCode.WRONG_USER_TAG_SIZE));
-        }
-    }
-
     private RefreshToken getRefreshTokenByToken(final String refreshToken) {
         try {
             return refreshTokenRepository.findRefreshTokenByToken(refreshToken)

dateroad-api/src/main/java/org/dateroad/user/service/UserService.java

@@ -21,6 +21,8 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
+import static org.dateroad.common.ValidatorUtil.validateUserTagSize;
+
 @Service
 @Transactional(readOnly = true)
 @RequiredArgsConstructor
@@ -60,7 +62,7 @@ public void editUserProfile(final Long userId,
 
         //tag 변경
         userTagRepository.deleteAllByUserId(foundUser.getId());
-        authService.validateUserTagSize(tags);
+        validateUserTagSize(tags);
         saveUserTag(foundUser, tags);
 
         //이미지 변경