Merge branch 'feat/#147' into dev

# Conflicts:
#	cakey-api/src/main/java/com/cakey/common/filter/RequiredAuthenticationFilter.java
#	cakey-api/src/main/java/com/cakey/user/service/UserService.java
#	cakey-auth/src/main/java/com/cakey/jwt/auth/JwtProvider.java

cakey-api/build.gradle

@@ -24,8 +24,7 @@ dependencies {
     implementation group: 'io.jsonwebtoken', name: 'jjwt-jackson', version: '0.11.5'
 
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-    implementation 'org.springframework.boot:spring-boot-starter-cache'
-    implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1'
+
 }
 
 // 실행가능한 jar로 생성하는 옵션, main이 없는 라이브러리에서는 false로 비활성화함

cakey-api/src/main/java/com/cakey/cake/controller/CakeController.java

@@ -10,6 +10,7 @@
 import com.cakey.store.domain.Station;
 import jakarta.validation.constraints.Min;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;

cakey-api/src/main/java/com/cakey/common/filter/RequiredAuthenticationFilter.java

@@ -86,6 +86,9 @@ protected void doFilterInternal(
 
             filterChain.doFilter(request, response); // 다음 필터로 요청 전달
         } catch (Exception e) {
+            log.error("--------------------쿠키 에러------------------------");
+            log.error(e.getMessage());
+
             // 예외 발생 시 JSON 응답 생성
             final ErrorBaseCode errorCode = ErrorBaseCode.UNAUTHORIZED;
 

cakey-api/src/main/java/com/cakey/store/controller/StoreController.java

@@ -10,16 +10,17 @@
 import com.cakey.store.service.StoreService;
 import jakarta.validation.constraints.Min;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 @RestController
 @Validated
 @RequiredArgsConstructor
+@Slf4j
 @RequestMapping("/api/v1/store")
 public class StoreController {
-
     private final StoreService storeService;
 
     //스토어 좌표 리스트 조회
@@ -71,6 +72,7 @@ public ResponseEntity<BaseResponse<?>> getStoreInfoListByStationAndLatest(
     //전체 지하철역 조회
     @GetMapping("/station")
     public ResponseEntity<BaseResponse<?>> getAllStation() {
+        log.error("----------------------testtestsetset---------------"); // todo: 추후 삭제( 로그 테스트용)
         return ApiResponseUtil.success(
                 SuccessCode.OK,
                 storeService.getAllStation());

cakey-api/src/main/java/com/cakey/user/service/UserService.java

@@ -26,6 +26,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.cloud.openfeign.aot.FeignChildContextInitializer;
 import org.springframework.http.ResponseCookie;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -85,7 +86,7 @@ public LoginSuccessRes login(
         } else { //전에 이미 우리 유저
 
             //리프레시 토큰 캐시 삭제
-            deleteRefreshToken(userId);
+            jwtProvider.deleteRefreshToken(userId);
 
             final Token newToken = jwtProvider.issueToken(userId);
 
@@ -113,7 +114,7 @@ public void logout(final long userId, final HttpServletResponse response) {
             throw new UserNotFoundException(UserErrorCode.USER_NOT_FOUND);
         }
         deleteRefreshCookie(response);
-        deleteRefreshToken(userId);
+        jwtProvider.deleteRefreshToken(userId);
     }
 
     @CacheEvict(value = "refresh")

cakey-api/src/main/resources/logback-spring.xml

@@ -19,10 +19,10 @@
             <encoder>
                 <pattern>%d{yyyy-MM-dd HH:mm:ss} %highlight(%-5level) %logger{0} - %msg%n</pattern>
             </encoder>
-            <file>/home/ubuntu/CAKEY-ERROR-LOG.log</file>
+            <file>*/home/ubuntu/CAKEY-ERROR-LOG.log</file>
 
             <rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
-                <fileNamePattern>/home/ubuntu/CAKEY-ERROR-LOG-%d{yyyy-MM-dd}-%i-log.zip</fileNamePattern>
+                <fileNamePattern>*/home/ubuntu/CAKEY-ERROR-LOG-%d{yyyy-MM-dd}-%i-log.zip</fileNamePattern>
                 <maxFileSize>50MB</maxFileSize>
                 <maxHistory>30</maxHistory>
                 <totalSizeCap>3GB</totalSizeCap>

cakey-auth/build.gradle

@@ -11,4 +11,8 @@ dependencies {
 
     implementation 'org.springframework.cloud:spring-cloud-starter-openfeign:4.1.0' //feign
     implementation 'org.springframework.boot:spring-boot-starter-oauth2-client' //oauth2
+
+    //cache
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
+    implementation 'com.github.ben-manes.caffeine:caffeine:3.1.1'
 }

cakey-auth/src/main/java/com/cakey/jwt/CacheConfig.java

@@ -0,0 +1,33 @@
+package com.cakey.jwt;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cache.caffeine.CaffeineCache;
+import org.springframework.cache.caffeine.CaffeineCacheManager;
+import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@EnableCaching
+@Configuration
+public class CacheConfig {
+
+    @Bean
+    public CacheManager cacheManager() {
+        SimpleCacheManager cacheManager = new SimpleCacheManager();
+        List<Cache> caches = new ArrayList<>();
+        caches.add(new CaffeineCache("refresh", Caffeine.newBuilder()
+                .initialCapacity(100)
+                .maximumSize(500)
+                .recordStats()
+                .build()));
+        cacheManager.setCaches(caches);
+        return cacheManager;
+    }
+}

cakey-auth/src/main/java/com/cakey/jwt/auth/JwtProvider.java

@@ -9,7 +9,7 @@
 import io.jsonwebtoken.Jws;
 import jakarta.servlet.http.HttpServletRequest;
 import lombok.RequiredArgsConstructor;
-import org.antlr.v4.runtime.BaseErrorListener;
+import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.stereotype.Component;
 import org.springframework.util.StringUtils;
 
@@ -33,6 +33,9 @@ public String generateRefreshToken(final long userId) {
         return jwtGenerator.generateRefreshToken(userId);
     }
 
+    @CacheEvict(value = "refresh")
+    public void deleteRefreshToken(final long userId) { }
+
     public long getUserIdFromSubject(final String token) {
         Jws<Claims> jws = jwtGenerator.parseToken(token);
         String subject = jws.getBody().getSubject();

cakey-auth/src/test/java/com/cakey/TestConfiguration.java

@@ -0,0 +1,13 @@
+package com.cakey;
+
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+@EnableCaching
+@SpringBootApplication
+@ComponentScan(basePackages = "com.cakey.jwt") // 실제 패키지 경로로 수정
+public class TestConfiguration {
+}

cakey-auth/src/test/java/com/cakey/jwt/auth/JwtGeneratorTest.java

@@ -0,0 +1,100 @@
+package com.cakey.jwt.auth;
+
+import org.assertj.core.api.Assertions;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.annotation.CacheEvict;
+import org.springframework.test.context.TestPropertySource;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
+
+@SpringBootTest(properties = {
+        "spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration"
+})
+@TestPropertySource(properties = {
+        "jwt.secret=testasdfasdfasddfsecretfdadfsdfasdfasdfasdfasdf",
+        "jwt.accessTokenExpirationTime=3600",
+        "jwt.refreshTokenExpirationTime=604800"
+})
+//@ComponentScan(basePackages = "com.cakey.jwt.auth")
+class JwtGeneratorTest {
+
+    @Autowired
+    private JwtGenerator jwtGenerator;
+
+    @Autowired
+    private CacheManager cacheManager;
+
+    @Autowired
+    private JwtProvider jwtProvider;
+
+    @Test
+    @DisplayName("리프레시 토큰 캐시에 등록")
+    void generateRefreshToken() {
+        // Given
+        // 캐시 초기화
+        cacheManager.getCacheNames().forEach(cacheName -> {
+            Cache cache = cacheManager.getCache(cacheName);
+            if (cache != null) {
+                cache.clear();
+            }
+        });
+
+        long firstId = 123L;
+        long secondId = 456L;
+
+        final String token1 = jwtGenerator.generateRefreshToken(firstId);
+        System.out.println("token 1 : " + token1);
+
+        final String token2 = jwtGenerator.generateRefreshToken(secondId);
+        System.out.println("token 2 : " + token2);
+
+        // When
+        final Cache cache = cacheManager.getCache("refresh");
+
+        // Then
+        // 캐시에서 값 가져오기
+        final String firstCachedToken = cache.get(firstId, String.class);
+        assertThat(firstCachedToken).isNotNull();
+        System.out.println("token 1: " + firstCachedToken);
+        assertThat(firstCachedToken).isEqualTo(token1); // 캐시된 값이 첫 번째 토큰과 동일해야 함
+
+        final String secondCachedToken = cache.get(secondId, String.class);
+        assertThat(secondCachedToken).isNotNull();
+        System.out.println("token 2: " + secondCachedToken);
+        assertThat(secondCachedToken).isEqualTo(token2); // 캐시된 값이 두 번째 토큰과 동일해야 함
+    }
+
+    @Test
+    @DisplayName("리프레시 토큰 캐시 삭제")
+    void deleteRefreshToken() {
+        //Given
+        final long userId = 123L;
+
+        Cache cache = cacheManager.getCache("refresh");
+        System.out.println(cache);
+        assertThat(cache).isNotNull();
+
+        String cachedValue = cache.get(userId, String.class);
+        System.out.println(cachedValue);
+        assertThat(cachedValue).isNotNull();
+
+        //When
+        jwtProvider.deleteRefreshToken(userId);
+
+        //Then
+        cache = cacheManager.getCache("refresh");
+        System.out.println(cache);
+
+        cachedValue = cache.get(userId, String.class);
+        System.out.println(cachedValue);
+
+        Assertions.assertThat(cachedValue).isNull(); // 키에 해당하는 값이 삭제되었는지 확인
+    }
+}