[Refactor] Presigned URL 캐싱

build.gradle

@@ -57,6 +57,7 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-cache'
 
     // Lombok
     compileOnly 'org.projectlombok:lombok'
@@ -67,6 +68,7 @@ dependencies {
     runtimeOnly 'com.mysql:mysql-connector-j'
     implementation 'org.flywaydb:flyway-core'
     implementation 'org.flywaydb:flyway-mysql'
+    implementation 'com.github.ben-manes.caffeine:caffeine' // in-memory cache
 
     // JWT
     implementation 'io.jsonwebtoken:jjwt-api:0.11.5'

src/main/java/eatda/config/CacheConfig.java

@@ -0,0 +1,36 @@
+package eatda.config;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+import eatda.repository.CacheSetting;
+import java.util.Arrays;
+import java.util.List;
+import org.springframework.cache.CacheManager;
+import org.springframework.cache.caffeine.CaffeineCache;
+import org.springframework.cache.support.SimpleCacheManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CacheConfig {
+
+    @Bean
+    public CacheManager cacheManager() {
+        List<CaffeineCache> caches = Arrays.stream(CacheSetting.values())
+                .map(this::createCaffeineCache)
+                .toList();
+
+        SimpleCacheManager cacheManager = new SimpleCacheManager();
+        cacheManager.setCaches(caches);
+        cacheManager.afterPropertiesSet();
+        return cacheManager;
+    }
+
+    private CaffeineCache createCaffeineCache(CacheSetting cacheSetting) {
+        return new CaffeineCache(
+                cacheSetting.getName(),
+                Caffeine.newBuilder()
+                        .expireAfterWrite(cacheSetting.getTimeToLive())
+                        .maximumSize(cacheSetting.getMaximumSize())
+                        .build());
+    }
+}

src/main/java/eatda/repository/CacheSetting.java

@@ -0,0 +1,21 @@
+package eatda.repository;
+
+import java.time.Duration;
+import lombok.Getter;
+
+@Getter
+public enum CacheSetting {
+
+    IMAGE("image", Duration.ofMinutes(25), 1_000),
+    ;
+
+    private final String name;
+    private final Duration timeToLive;
+    private final int maximumSize;
+
+    CacheSetting(String image, Duration timeToLive, int maximumSize) {
+        this.name = image;
+        this.timeToLive = timeToLive;
+        this.maximumSize = maximumSize;
+    }
+}

src/main/java/eatda/repository/image/CachePreSignedUrlRepository.java

@@ -0,0 +1,27 @@
+package eatda.repository.image;
+
+import eatda.repository.CacheSetting;
+import java.util.Optional;
+import org.springframework.cache.Cache;
+import org.springframework.cache.CacheManager;
+import org.springframework.stereotype.Component;
+
+@Component
+public class CachePreSignedUrlRepository {
+
+    private static final String CACHE_NAME = CacheSetting.IMAGE.getName();
+
+    private final Cache cache;
+
+    public CachePreSignedUrlRepository(CacheManager cacheManager) {
+        this.cache = cacheManager.getCache(CACHE_NAME);
+    }
+
+    public void put(String imageKey, String preSignedUrl) {
+        cache.put(imageKey, preSignedUrl);
+    }
+
+    public Optional<String> get(String imageKey) {
+        return Optional.ofNullable(cache.get(imageKey, String.class));
+    }
+}

src/main/java/eatda/service/common/ImageDomain.java → src/main/java/eatda/repository/image/ImageDomain.java

@@ -1,4 +1,4 @@
-package eatda.service.common;
+package eatda.repository.image;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;

src/main/java/eatda/repository/image/ImageRepository.java

@@ -0,0 +1,39 @@
+package eatda.repository.image;
+
+import java.util.Optional;
+import lombok.RequiredArgsConstructor;
+import org.springframework.lang.Nullable;
+import org.springframework.stereotype.Component;
+import org.springframework.web.multipart.MultipartFile;
+
+@Component
+@RequiredArgsConstructor
+public class ImageRepository {
+
+    private final S3ImageRepository s3Repository;
+    private final CachePreSignedUrlRepository cachePreSignedUrlRepository;
+
+
+    public String upload(MultipartFile file, ImageDomain domain) {
+        String imageKey = s3Repository.upload(file, domain);
+
+        String preSignedUrl = s3Repository.getPresignedUrl(imageKey);
+        cachePreSignedUrlRepository.put(imageKey, preSignedUrl);
+        return imageKey;
+    }
+
+    @Nullable
+    public String getPresignedUrl(@Nullable String imageKey) {
+        if (imageKey == null || imageKey.isEmpty()) {
+            return null;
+        }
+
+        Optional<String> cachedUrl = cachePreSignedUrlRepository.get(imageKey);
+        if (cachedUrl.isPresent()) {
+            return cachedUrl.get();
+        }
+        String preSignedUrl = s3Repository.getPresignedUrl(imageKey);
+        cachePreSignedUrlRepository.put(imageKey, preSignedUrl);
+        return preSignedUrl;
+    }
+}

src/main/java/eatda/service/common/ImageService.java → src/main/java/eatda/repository/image/S3ImageRepository.java

@@ -1,14 +1,14 @@
-package eatda.service.common;
+package eatda.repository.image;
 
 import eatda.exception.BusinessErrorCode;
 import eatda.exception.BusinessException;
+import eatda.repository.CacheSetting;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Set;
 import java.util.UUID;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.lang.Nullable;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Component;
 import org.springframework.web.multipart.MultipartFile;
 import software.amazon.awssdk.core.sync.RequestBody;
 import software.amazon.awssdk.services.s3.S3Client;
@@ -17,20 +17,21 @@
 import software.amazon.awssdk.services.s3.presigner.S3Presigner;
 import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
 
-@Service
-public class ImageService {
+@Component
+public class S3ImageRepository {
 
     private static final Set<String> ALLOWED_CONTENT_TYPES = Set.of("image/jpg", "image/jpeg", "image/png");
     private static final String DEFAULT_CONTENT_TYPE = "bin";
     private static final String PATH_DELIMITER = "/";
     private static final String EXTENSION_DELIMITER = ".";
-    private static final Duration PRESIGNED_URL_DURATION = Duration.ofMinutes(30);
+    private static final Duration PRESIGNED_URL_DURATION = CacheSetting.IMAGE.getTimeToLive()
+            .plus(Duration.ofMinutes(5));
 
     private final S3Client s3Client;
     private final String bucket;
     private final S3Presigner s3Presigner;
 
-    public ImageService(
+    public S3ImageRepository(
             S3Client s3Client,
             @Value("${spring.cloud.aws.s3.bucket}") String bucket,
             S3Presigner s3Presigner) {
@@ -75,12 +76,8 @@ private String getExtension(String filename) {
         return filename.substring(filename.lastIndexOf(EXTENSION_DELIMITER) + 1);
     }
 
-    @Nullable
-    public String getPresignedUrl(@Nullable String key) {
-        if (key == null) {
-            return null;
-        }
 
+    public String getPresignedUrl(String key) {
         try {
             GetObjectRequest getObjectRequest = GetObjectRequest.builder()
                     .bucket(bucket)

src/main/java/eatda/service/store/CheerService.java

@@ -3,8 +3,8 @@
 import eatda.controller.store.CheerPreviewResponse;
 import eatda.controller.store.CheersResponse;
 import eatda.domain.store.Cheer;
+import eatda.repository.image.ImageRepository;
 import eatda.repository.store.CheerRepository;
-import eatda.service.common.ImageService;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -15,8 +15,8 @@
 @RequiredArgsConstructor
 public class CheerService {
 
-    private final ImageService imageService;
     private final CheerRepository cheerRepository;
+    private final ImageRepository imageRepository;
 
     @Transactional(readOnly = true)
     public CheersResponse getCheers(int size) {
@@ -27,7 +27,7 @@ public CheersResponse getCheers(int size) {
     private CheersResponse toCheersResponse(List<Cheer> cheers) {
         return new CheersResponse(cheers.stream()
                 .map(cheer -> new CheerPreviewResponse(cheer, cheer.getStore(),
-                        imageService.getPresignedUrl(cheer.getImageKey())))
+                        imageRepository.getPresignedUrl(cheer.getImageKey())))
                 .toList());
     }
 }

src/main/java/eatda/service/store/StoreService.java

@@ -9,9 +9,9 @@
 import eatda.controller.store.StoreSearchResponses;
 import eatda.controller.store.StoresResponse;
 import eatda.domain.store.Store;
+import eatda.repository.image.ImageRepository;
 import eatda.repository.store.CheerRepository;
 import eatda.repository.store.StoreRepository;
-import eatda.service.common.ImageService;
 import java.util.List;
 import java.util.Optional;
 import lombok.RequiredArgsConstructor;
@@ -26,7 +26,7 @@ public class StoreService {
     private final StoreSearchFilter storeSearchFilter;
     private final StoreRepository storeRepository;
     private final CheerRepository cheerRepository;
-    private final ImageService imageService;
+    private final ImageRepository imageRepository;
 
     // TODO : N+1 문제 해결
     public StoresResponse getStores(int size) {
@@ -38,7 +38,7 @@ public StoresResponse getStores(int size) {
 
     private Optional<String> getStoreImageUrl(Store store) {
         return cheerRepository.findRecentImageKey(store)
-                .map(imageService::getPresignedUrl);
+                .map(imageRepository::getPresignedUrl);
     }
 
     public StoreSearchResponses searchStores(String query) {

src/main/java/eatda/service/story/StoryService.java

@@ -8,10 +8,10 @@
 import eatda.domain.story.Story;
 import eatda.exception.BusinessErrorCode;
 import eatda.exception.BusinessException;
+import eatda.repository.image.ImageDomain;
+import eatda.repository.image.ImageRepository;
 import eatda.repository.member.MemberRepository;
 import eatda.repository.story.StoryRepository;
-import eatda.service.common.ImageDomain;
-import eatda.service.common.ImageService;
 import eatda.service.store.StoreService;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -25,11 +25,12 @@
 @Service
 @RequiredArgsConstructor
 public class StoryService {
+
     private static final int PAGE_START_NUMBER = 0;
     private static final int PAGE_SIZE = 5;
 
     private final StoreService storeService;
-    private final ImageService imageService;
+    private final ImageRepository imageRepository;
     private final StoryRepository storyRepository;
     private final MemberRepository memberRepository;
 
@@ -38,7 +39,7 @@ public void registerStory(StoryRegisterRequest request, MultipartFile image, Lon
         Member member = memberRepository.getById(memberId);
         List<StoreSearchResult> searchResponses = storeService.searchStoreResults(request.query());
         FilteredSearchResult matchedStore = filteredSearchResponse(searchResponses, request.storeKakaoId());
-        String imageKey = imageService.upload(image, ImageDomain.STORY);
+        String imageKey = imageRepository.upload(image, ImageDomain.STORY);
 
         Story story = Story.builder()
                 .member(member)
@@ -75,7 +76,7 @@ public StoriesResponse getPagedStoryPreviews() {
                 orderByPage.getContent().stream()
                         .map(story -> new StoriesResponse.StoryPreview(
                                 story.getId(),
-                                imageService.getPresignedUrl(story.getImageKey())
+                                imageRepository.getPresignedUrl(story.getImageKey())
                         ))
                         .toList()
         );

src/test/java/eatda/controller/BaseControllerTest.java

@@ -15,11 +15,10 @@
 import eatda.fixture.CheerGenerator;
 import eatda.fixture.MemberGenerator;
 import eatda.fixture.StoreGenerator;
+import eatda.repository.image.ImageRepository;
 import eatda.repository.member.MemberRepository;
 import eatda.repository.store.CheerRepository;
 import eatda.repository.store.StoreRepository;
-import eatda.service.common.ImageService;
-import eatda.service.common.ImageService;
 import eatda.service.story.StoryService;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
@@ -78,7 +77,7 @@ public class BaseControllerTest {
     private MapClient mapClient;
 
     @MockitoBean
-    private ImageService imageService;
+    private ImageRepository imageRepository;
 
     @MockitoBean
     protected StoryService storyService; // TODO 실 객체로 변환
@@ -110,8 +109,8 @@ final void mockingClient() throws URISyntaxException {
         );
         doReturn(searchResults).when(mapClient).searchShops(anyString());
 
-        doReturn(MOCKED_IMAGE_URL).when(imageService).getPresignedUrl(anyString());
-        doReturn(MOCKED_IMAGE_KEY).when(imageService).upload(any(), any());
+        doReturn(MOCKED_IMAGE_URL).when(imageRepository).getPresignedUrl(anyString());
+        doReturn(MOCKED_IMAGE_KEY).when(imageRepository).upload(any(), any());
     }
 
     protected final RequestSpecification given() {

src/test/java/eatda/controller/story/StoryControllerTest.java

@@ -2,12 +2,10 @@
 
 import static org.hamcrest.Matchers.equalTo;
 import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
 
 import eatda.controller.BaseControllerTest;
-import eatda.service.common.ImageDomain;
 import io.restassured.response.Response;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
@@ -42,7 +40,8 @@ class SearchStores {
             Response response = given()
                     .contentType("multipart/form-data")
                     .header("Authorization", accessToken())
-                    .multiPart("request", "request.json", requestJson.getBytes(StandardCharsets.UTF_8), "application/json")
+                    .multiPart("request", "request.json", requestJson.getBytes(StandardCharsets.UTF_8),
+                            "application/json")
                     .multiPart("image", "image.png", imageBytes, "image/png")
                     .when()
                     .post("/api/stories");

src/test/java/eatda/document/BaseDocumentTest.java

@@ -8,7 +8,6 @@
 import eatda.exception.BusinessErrorCode;
 import eatda.exception.EtcErrorCode;
 import eatda.service.auth.AuthService;
-import eatda.service.common.ImageService;
 import eatda.service.member.MemberService;
 import eatda.service.store.CheerService;
 import eatda.service.store.StoreService;
@@ -52,11 +51,9 @@ public abstract class BaseDocumentTest {
     @MockitoBean
     protected StoryService storyService;
 
-    @MockitoBean
-    protected ImageService imageService;
-
     @MockitoBean
     protected CheerService cheerService;
+
     @MockitoBean
     protected JwtManager jwtManager;