[refactor] : DDD구조 변경 및 코드 리뷰를 기반으로 1차 리팩토링을 진행한다

build.gradle

@@ -73,8 +73,33 @@ dependencies {
 
 }
 
-def querydslDir = "src/main/generated"
+java {
+    toolchain {
+        languageVersion = JavaLanguageVersion.of(17) // Java 버전
+    }
+}
 
+tasks.named('compileJava', JavaCompile).configure {
+    options.annotationProcessorGeneratedSourcesDirectory = file("$build/generated/sources/annotationProcessor/java/main")
+}
+
+sourceSets {
+    main {
+        java {
+            srcDirs += "$build/generated/sources/annotationProcessor/java/main"
+        }
+    }
+}
+
+tasks.named('compileJava') {
+    doFirst {
+        // QClass 파일 자동 삭제
+        def querydslGeneratedDir = layout.buildDirectory.dir("generated/sources/annotationProcessor/java/main").get().asFile
+        if (querydslGeneratedDir.exists()) {
+            querydslGeneratedDir.deleteDir()
+        }
+    }
+}
 ext {
     snippetsDir = file('build/generated-snippets')
 }

src/main/java/kusitms/backend/auth/application/AuthService.java

@@ -1,51 +1,38 @@
 package kusitms.backend.auth.application;
 
-import jakarta.servlet.http.HttpServletResponse;
+import kusitms.backend.auth.dto.response.TokenResponseDto;
 import kusitms.backend.auth.jwt.JWTUtil;
 import kusitms.backend.auth.status.AuthErrorStatus;
 import kusitms.backend.global.exception.CustomException;
 import kusitms.backend.global.redis.RedisManager;
-import kusitms.backend.global.util.CookieUtil;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class AuthService {
 
-    @Value("${spring.jwt.access-token.expiration-time}")
-    private long ACCESS_TOKEN_EXPIRATION_TIME;
-
-    @Value("${spring.jwt.refresh-token.expiration-time}")
-    private long REFRESH_TOKEN_EXPIRATION_TIME;
-
     private final JWTUtil jwtUtil;
     private final RedisManager redisManager;
 
-    @Transactional
-    public void reIssueToken(String refreshToken, HttpServletResponse response) {
+    /**
+     * Refresh Token 검증 및 새로운 토큰 발급.
+     *
+     * @param refreshToken 클라이언트로부터 받은 리프레시 토큰
+     * @return 새로 생성된 Access Token과 Refresh Token
+     */
+    public TokenResponseDto reIssueToken(String refreshToken) {
         if (refreshToken == null) {
             throw new CustomException(AuthErrorStatus._EXPIRED_REFRESH_TOKEN);
         }
-        Long userId = jwtUtil.getUserIdFromToken(refreshToken);
-        String storedRefreshToken = redisManager.getRefreshToken(userId.toString());
-        if (!storedRefreshToken.equals(refreshToken)){
-            throw new CustomException(AuthErrorStatus._TOKEN_USER_MISMATCH);
-        }
 
-        jwtUtil.validateRefreshToken(storedRefreshToken);
-        String newAccessToken = jwtUtil.generateToken(userId, ACCESS_TOKEN_EXPIRATION_TIME);  // 1시간 유효기간
-        String newRefreshToken = jwtUtil.generateToken(userId, REFRESH_TOKEN_EXPIRATION_TIME);  // 14일 유효기간
-        redisManager.saveRefreshToken(userId.toString(), newRefreshToken);
+        Long userId = redisManager.validateAndExtractUserId(refreshToken);
+        String newAccessToken = jwtUtil.generateAccessOrRefreshToken(userId, jwtUtil.getAccessTokenExpirationTime());
+        String newRefreshToken = jwtUtil.generateAccessOrRefreshToken(userId, jwtUtil.getRefreshTokenExpirationTime());
 
-        CookieUtil.setCookie(response, "accessToken", newAccessToken, (int) (ACCESS_TOKEN_EXPIRATION_TIME * 1.5) / 1000);
-        CookieUtil.setCookie(response, "refreshToken", newRefreshToken, (int) REFRESH_TOKEN_EXPIRATION_TIME / 1000);
-        CookieUtil.setNotHttpOnlyCookie(response, "expirationTime", String.valueOf((int) ACCESS_TOKEN_EXPIRATION_TIME / 1000), (int) (ACCESS_TOKEN_EXPIRATION_TIME * 1.5) / 1000);
+        redisManager.saveRefreshToken(userId.toString(), newRefreshToken);
+        return new TokenResponseDto(newAccessToken, newRefreshToken, jwtUtil.getAccessTokenExpirationTime(), jwtUtil.getRefreshTokenExpirationTime());
     }
-
-
 }

src/main/java/kusitms/backend/auth/dto/response/TokenResponseDto.java

@@ -0,0 +1,9 @@
+package kusitms.backend.auth.dto.response;
+
+public record TokenResponseDto(
+        String accessToken,
+        String refreshToken,
+        long accessTokenExpiration,
+        long refreshTokenExpiration
+) {
+}

src/main/java/kusitms/backend/auth/handler/OAuth2LoginSuccessHandler.java

@@ -2,82 +2,46 @@
 
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
-import kusitms.backend.auth.dto.response.GoogleUserInfo;
-import kusitms.backend.auth.dto.response.KakaoUserInfo;
-import kusitms.backend.auth.dto.response.NaverUserInfo;
-import kusitms.backend.auth.dto.response.OAuth2UserInfo;
 import kusitms.backend.auth.jwt.JWTUtil;
-import kusitms.backend.global.redis.RedisManager;
-import kusitms.backend.global.util.CookieUtil;
-import kusitms.backend.user.domain.entity.User;
-import kusitms.backend.user.domain.repository.UserRepository;
+import kusitms.backend.user.application.UserApplicationService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.core.Authentication;
 import org.springframework.security.oauth2.client.authentication.OAuth2AuthenticationToken;
 import org.springframework.security.web.authentication.SimpleUrlAuthenticationSuccessHandler;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.io.IOException;
-import java.util.Map;
 
 @Slf4j
 @Component
 @RequiredArgsConstructor
 public class OAuth2LoginSuccessHandler extends SimpleUrlAuthenticationSuccessHandler {
 
-    @Value("${spring.jwt.redirect.onboarding}")
-    private String REDIRECT_URI_ONBOARDING; // 신규 유저 리다이렉트할 URI
-    @Value("${spring.jwt.redirect.base}")
-    private String REDIRECT_URI_BASE; // 기존 유저 리다이렉트할 URI
-
-    @Value("${spring.jwt.register-token.expiration-time}")
-    private long REGISTER_TOKEN_EXPIRATION_TIME;
-
-    @Value("${spring.jwt.access-token.expiration-time}")
-    private long ACCESS_TOKEN_EXPIRATION_TIME;
-
-    @Value("${spring.jwt.refresh-token.expiration-time}")
-    private long REFRESH_TOKEN_EXPIRATION_TIME;
-
-    private OAuth2UserInfo oAuth2UserInfo = null;
     private final JWTUtil jwtUtil;
-    private final RedisManager redisManager;
-    private final UserRepository userRepository;
-
+    private final UserApplicationService userApplicationService;
+
+    /**
+     * OAuth2 로그인 성공 후 처리.
+     *
+     * @param request        HTTP 요청 객체
+     * @param response       HTTP 응답 객체
+     * @param authentication 인증 객체
+     * @throws IOException 리다이렉트 오류 발생 시 예외
+     */
     @Override
-    @Transactional
     public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException {
         OAuth2AuthenticationToken token = (OAuth2AuthenticationToken) authentication;
-        final String provider = token.getAuthorizedClientRegistrationId();
-        final Map<String, Object> attributes = token.getPrincipal().getAttributes();
-        switch (provider) {
-            case "kakao" -> oAuth2UserInfo = new KakaoUserInfo(attributes);
-            case "google" -> oAuth2UserInfo = new GoogleUserInfo(attributes);
-            case "naver" -> oAuth2UserInfo = new NaverUserInfo(attributes);
-        }
-
-        String providerId = oAuth2UserInfo.getProviderId();
-        String email = oAuth2UserInfo.getEmail();
 
-        User existUser = userRepository.findByProviderId(providerId);
-        if (existUser == null) {
-            log.info("신규 유저입니다.");
-            String registerToken = jwtUtil.generateRegisterToken(provider, providerId, email, REGISTER_TOKEN_EXPIRATION_TIME);
-            CookieUtil.setCookie(response, "registerToken", registerToken, (int) REGISTER_TOKEN_EXPIRATION_TIME / 1000);
-            getRedirectStrategy().sendRedirect(request, response, REDIRECT_URI_ONBOARDING);
-        } else {
-            log.info("기존 유저입니다.");
-            String accessToken = jwtUtil.generateToken(existUser.getId(), ACCESS_TOKEN_EXPIRATION_TIME);
-            String refreshToken = jwtUtil.generateToken(existUser.getId(), REFRESH_TOKEN_EXPIRATION_TIME);
-
-            redisManager.saveRefreshToken(existUser.getId().toString(), refreshToken);
-            CookieUtil.setCookie(response, "accessToken", accessToken, (int) (ACCESS_TOKEN_EXPIRATION_TIME * 1.5) / 1000);
-            CookieUtil.setCookie(response, "refreshToken", refreshToken, (int) REFRESH_TOKEN_EXPIRATION_TIME / 1000);
-            CookieUtil.setNotHttpOnlyCookie(response, "expirationTime", String.valueOf((int) ACCESS_TOKEN_EXPIRATION_TIME / 1000), (int) (ACCESS_TOKEN_EXPIRATION_TIME * 1.5) / 1000);
-            getRedirectStrategy().sendRedirect(request, response, REDIRECT_URI_BASE);
+        // 신규 사용자 처리
+        if (userApplicationService.isNewUser(token)) {
+            userApplicationService.handleNewUser(token, response);
+            getRedirectStrategy().sendRedirect(request, response, jwtUtil.getRedirectOnboardingUrl());
+        }
+        // 기존 사용자 처리
+        else {
+            userApplicationService.handleExistingUser(token, response);
+            getRedirectStrategy().sendRedirect(request, response, jwtUtil.getRedirectBaseUrl());
         }
     }
 }

src/main/java/kusitms/backend/auth/jwt/JWTFilter.java

@@ -51,7 +51,7 @@ protected boolean shouldNotFilter(HttpServletRequest request) {
                 || path.equals("/api/v1/token/re-issue")
                 || path.equals("/api/v1/test/docs") || path.startsWith(("/swagger-ui")) || path.startsWith("/v3/api-docs")
                 || path.startsWith("/api/v1/results") || path.startsWith("/api/v1/stadium")
-                || path.startsWith("/api/v1/culture")
+                || path.equals("/api/v1/foods") || path.equals("/api/v1/entertainments")
                 || path.startsWith("/api/v1/chatbot")
                 ;
     }