BugFix: 충돌 해결

Author: goodjunseon

backend/src/main/java/com/together/backend/domain/user/repository/UserRepository.java

@@ -7,4 +7,5 @@
 
 public interface UserRepository extends JpaRepository<User, Long> {
     Optional<User> findByEmail(String email);
+    Optional<User> findByUserId(Long userId);
 }

backend/src/main/java/com/together/backend/global/common/BaseResponse.java

@@ -20,9 +20,9 @@ public class BaseResponse<T> {
 
     // 요청에 성공한 경우
     public BaseResponse(T result) {
-        this.isSuccess = BaseResponseStatus.SUCCESS.isSuccess();
-        this.status = BaseResponseStatus.SUCCESS.getCode();
-        this.message = BaseResponseStatus.SUCCESS.getMessage();
+        this.isSuccess = BaseResponseStatus.OK.isSuccess();
+        this.status = BaseResponseStatus.OK.getCode();
+        this.message = BaseResponseStatus.OK.getMessage();
         this.result = result;
     }
 

backend/src/main/java/com/together/backend/global/security/jwt/JWTFilter.java

@@ -1,6 +1,8 @@
 package com.together.backend.global.security.jwt;
 
 
+import com.together.backend.global.security.jwt.model.BlackListToken;
+import com.together.backend.global.security.jwt.service.BlackListTokenService;
 import com.together.backend.global.security.jwt.util.CookieUtil;
 import com.together.backend.global.security.jwt.util.JWTUtil;
 import com.together.backend.global.security.oauth2.dto.CustomOAuth2User;
@@ -24,6 +26,7 @@
 public class JWTFilter extends OncePerRequestFilter {
 
     private final JWTUtil jwtUtil;
+    private final BlackListTokenService blackListTokenService;
 
     @Override
     protected void doFilterInternal(HttpServletRequest request, HttpServletResponse response, FilterChain filterChain)

backend/src/main/java/com/together/backend/global/security/jwt/util/CookieUtil.java

@@ -36,10 +36,10 @@ public static void createCookie(HttpServletResponse response, String name, Strin
         response.addCookie(cookie); // 쿠키를 응답에 추가
     }
 
-    public static Cookie deleteCookie(String name) {
+    public static Cookie deleteCookie(String name, String path) {
         Cookie cookie = new Cookie(name, null);
         cookie.setMaxAge(0); // 쿠키 즉시 만료
-        cookie.setPath("/"); // 쿠키 경로 설정
+        cookie.setPath(path); // 쿠키 경로 설정
         cookie.setHttpOnly(true);
         return cookie; // 삭제할 쿠키 반환
     }

backend/src/main/java/com/together/backend/global/security/oauth2/CustomOAuth2UserService.java

@@ -14,6 +14,8 @@
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.stereotype.Service;
 
+import java.util.Optional;
+
 
 @Slf4j
 @RequiredArgsConstructor
@@ -33,10 +35,10 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
 
 
 
-        User existData = userRepository.findByEmail(kakaoResponse.getEmail()); // 이메일로 사용자 조회
+        Optional<User> existData = userRepository.findByEmail(kakaoResponse.getEmail()); // 이메일로 사용자 조회
 
         // 신규 회원일 때
-        if (existData == null) {
+        if (existData.isEmpty()) {
             User user = new User();
             user.setSocialId(kakaoResponse.getSocialId());
             user.setNickname(kakaoResponse.getName());
@@ -56,24 +58,24 @@ public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2Authentic
         }
         // 기존 회원일 때
         else {
-
+            User user = existData.get();
             // 이메일 또는 닉네임이 변경되었는지 확인
-            if (!existData.getNickname().equals(kakaoResponse.getName())||
-            !existData.getEmail().equals(kakaoResponse.getEmail()) ||
-            !existData.getProfileImageUrl().equals(kakaoResponse.getProfileImageUrl())) {
+            if (!user.getNickname().equals(kakaoResponse.getName())||
+            !user.getEmail().equals(kakaoResponse.getEmail()) ||
+            !user.getProfileImageUrl().equals(kakaoResponse.getProfileImageUrl())) {
                 log.info("기존 사용자 정보 업데이트: 이메일 또는 닉네임 변경");
-                existData.setEmail(kakaoResponse.getEmail());
-                existData.setNickname(kakaoResponse.getName());
-                existData.setProfileImageUrl(kakaoResponse.getProfileImageUrl());
-                userRepository.save(existData); // 변경된 내용 저장
+                user.setEmail(kakaoResponse.getEmail());
+                user.setNickname(kakaoResponse.getName());
+                user.setProfileImageUrl(kakaoResponse.getProfileImageUrl());
+                userRepository.save(user); // 변경된 내용 저장
             }
 
             UserDTO userDTO = UserDTO.builder()
                     .socialId(kakaoResponse.getSocialId())
                     .name(kakaoResponse.getName())
                     .email(kakaoResponse.getEmail())
                     .profileImageUrl(kakaoResponse.getProfileImageUrl())
-                    .role(existData.getRole())
+                    .role(user.getRole())
                     .build();
             return new CustomOAuth2User(userDTO);
         }