refactor : ImageRepository 를 ImageStorage 로 변경

leegwichan · leegwichan · commit a22fd5c23ad8 · 2025-07-23T12:08:50.000+09:00
diff --git a/src/main/java/eatda/domain/ImageDomain.java b/src/main/java/eatda/domain/ImageDomain.java
@@ -1,4 +1,4 @@
-package eatda.repository.image;
+package eatda.domain;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/src/main/java/eatda/repository/image/ImageRepository.java b/src/main/java/eatda/repository/image/ImageRepository.java
diff --git a/src/main/java/eatda/service/article/ArticleService.java b/src/main/java/eatda/service/article/ArticleService.java
@@ -3,7 +3,7 @@
 import eatda.controller.article.ArticleResponse;
 import eatda.controller.article.ArticlesResponse;
 import eatda.repository.article.ArticleRepository;
-import eatda.repository.image.ImageRepository;
+import eatda.storage.image.ImageStorage;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.PageRequest;
@@ -14,7 +14,7 @@
 public class ArticleService {
 
     private final ArticleRepository articleRepository;
-    private final ImageRepository imageRepository;
+    private final ImageStorage imageStorage;
 
     public ArticlesResponse getAllArticles(int size) {
         PageRequest pageRequest = PageRequest.of(0, size);
@@ -24,7 +24,7 @@ public ArticlesResponse getAllArticles(int size) {
                         article.getTitle(),
                         article.getSubtitle(),
                         article.getArticleUrl(),
-                        imageRepository.getPresignedUrl(article.getImageKey())
+                        imageStorage.getPresignedUrl(article.getImageKey())
                 ))
                 .toList();
 
diff --git a/src/main/java/eatda/service/store/CheerService.java b/src/main/java/eatda/service/store/CheerService.java
@@ -6,16 +6,16 @@
 import eatda.controller.store.CheerRegisterRequest;
 import eatda.controller.store.CheerResponse;
 import eatda.controller.store.CheersResponse;
+import eatda.domain.ImageDomain;
 import eatda.domain.member.Member;
 import eatda.domain.store.Cheer;
-import eatda.repository.image.ImageDomain;
-import eatda.repository.image.ImageRepository;
 import eatda.domain.store.Store;
 import eatda.exception.BusinessErrorCode;
 import eatda.exception.BusinessException;
 import eatda.repository.member.MemberRepository;
 import eatda.repository.store.CheerRepository;
 import eatda.repository.store.StoreRepository;
+import eatda.storage.image.ImageStorage;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Pageable;
@@ -34,7 +34,7 @@ public class CheerService {
     private final MemberRepository memberRepository;
     private final StoreRepository storeRepository;
     private final CheerRepository cheerRepository;
-    private final ImageRepository imageRepository;
+    private final ImageStorage imageStorage;
 
     @Transactional
     public CheerResponse registerCheer(CheerRegisterRequest request, MultipartFile image, long memberId) {
@@ -43,12 +43,12 @@ public CheerResponse registerCheer(CheerRegisterRequest request, MultipartFile i
 
         List<StoreSearchResult> searchResults = mapClient.searchShops(request.storeName());
         StoreSearchResult result = storeSearchFilter.filterStoreByKakaoId(searchResults, request.storeKakaoId());
-        String imageKey = imageRepository.upload(image, ImageDomain.CHEER);
+        String imageKey = imageStorage.upload(image, ImageDomain.CHEER);
 
         Store store = storeRepository.findByKakaoId(result.kakaoId())
                 .orElseGet(() -> storeRepository.save(result.toStore())); // TODO 상점 조회/저장 동시성 이슈 해결
         Cheer cheer = cheerRepository.save(new Cheer(member, store, request.description(), imageKey));
-        return new CheerResponse(cheer, imageRepository.getPresignedUrl(imageKey), store);
+        return new CheerResponse(cheer, imageStorage.getPresignedUrl(imageKey), store);
     }
 
     private void validateRegisterCheer(Member member, String storeKakaoId) {
@@ -69,7 +69,7 @@ public CheersResponse getCheers(int size) {
     private CheersResponse toCheersResponse(List<Cheer> cheers) {
         return new CheersResponse(cheers.stream()
                 .map(cheer -> new CheerPreviewResponse(cheer, cheer.getStore(),
-                        imageRepository.getPresignedUrl(cheer.getImageKey())))
+                        imageStorage.getPresignedUrl(cheer.getImageKey())))
                 .toList());
     }
 }
diff --git a/src/main/java/eatda/service/store/StoreService.java b/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.storage.image.ImageStorage;
 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 ImageRepository imageRepository;
+    private final ImageStorage imageStorage;
 
     // 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(imageRepository::getPresignedUrl);
+                .map(imageStorage::getPresignedUrl);
     }
 
     public StoreSearchResponses searchStores(String query) {
diff --git a/src/main/java/eatda/service/story/StoryService.java b/src/main/java/eatda/service/story/StoryService.java
@@ -7,14 +7,14 @@
 import eatda.controller.story.StoryRegisterRequest;
 import eatda.controller.story.StoryRegisterResponse;
 import eatda.controller.story.StoryResponse;
+import eatda.domain.ImageDomain;
 import eatda.domain.member.Member;
 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.storage.image.ImageStorage;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -30,7 +30,7 @@ public class StoryService {
 
     private static final int PAGE_START_NUMBER = 0;
 
-    private final ImageRepository imageRepository;
+    private final ImageStorage imageStorage;
     private final MapClient mapClient;
     private final StoryRepository storyRepository;
     private final MemberRepository memberRepository;
@@ -40,7 +40,7 @@ public StoryRegisterResponse registerStory(StoryRegisterRequest request, Multipa
         Member member = memberRepository.getById(memberId);
         List<StoreSearchResult> searchResponses = mapClient.searchShops(request.query());
         FilteredSearchResult matchedStore = filteredSearchResponse(searchResponses, request.storeKakaoId());
-        String imageKey = imageRepository.upload(image, ImageDomain.STORY);
+        String imageKey = imageStorage.upload(image, ImageDomain.STORY);
 
         Story story = Story.builder()
                 .member(member)
@@ -81,7 +81,7 @@ public StoriesResponse getPagedStoryPreviews(int size) {
                 orderByPage.getContent().stream()
                         .map(story -> new StoriesResponse.StoryPreview(
                                 story.getId(),
-                                imageRepository.getPresignedUrl(story.getImageKey())
+                                imageStorage.getPresignedUrl(story.getImageKey())
                         ))
                         .toList()
         );
@@ -99,7 +99,7 @@ public StoryResponse getStory(long storyId) {
                 story.getAddressDistrict(),
                 story.getAddressNeighborhood(),
                 story.getDescription(),
-                imageRepository.getPresignedUrl(story.getImageKey())
+                imageStorage.getPresignedUrl(story.getImageKey())
         );
     }
 }
diff --git a/src/main/java/eatda/storage/image/CachePreSignedUrlStorage.java b/src/main/java/eatda/storage/image/CachePreSignedUrlStorage.java
@@ -1,4 +1,4 @@
-package eatda.repository.image;
+package eatda.storage.image;
 
 import eatda.repository.CacheSetting;
 import java.util.Optional;
@@ -7,13 +7,13 @@
 import org.springframework.stereotype.Component;
 
 @Component
-public class CachePreSignedUrlRepository {
+public class CachePreSignedUrlStorage {
 
     private static final String CACHE_NAME = CacheSetting.IMAGE.getName();
 
     private final Cache cache;
 
-    public CachePreSignedUrlRepository(CacheManager cacheManager) {
+    public CachePreSignedUrlStorage(CacheManager cacheManager) {
         this.cache = cacheManager.getCache(CACHE_NAME);
     }
 
diff --git a/src/main/java/eatda/storage/image/ExternalImageStorage.java b/src/main/java/eatda/storage/image/ExternalImageStorage.java
@@ -1,5 +1,6 @@
-package eatda.repository.image;
+package eatda.storage.image;
 
+import eatda.domain.ImageDomain;
 import eatda.exception.BusinessErrorCode;
 import eatda.exception.BusinessException;
 import java.io.IOException;
@@ -17,7 +18,7 @@
 import software.amazon.awssdk.services.s3.presigner.model.GetObjectPresignRequest;
 
 @Component
-public class S3ImageRepository {
+public class ExternalImageStorage {
 
     private static final Set<String> ALLOWED_CONTENT_TYPES = Set.of("image/jpg", "image/jpeg", "image/png");
     private static final String DEFAULT_CONTENT_TYPE = "bin";
@@ -29,7 +30,7 @@ public class S3ImageRepository {
     private final String bucket;
     private final S3Presigner s3Presigner;
 
-    public S3ImageRepository(
+    public ExternalImageStorage(
             S3Client s3Client,
             @Value("${spring.cloud.aws.s3.bucket}") String bucket,
             S3Presigner s3Presigner) {
diff --git a/src/main/java/eatda/storage/image/ImageStorage.java b/src/main/java/eatda/storage/image/ImageStorage.java
@@ -0,0 +1,41 @@
+package eatda.storage.image;
+
+import eatda.domain.ImageDomain;
+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 ImageStorage {
+
+    private final ExternalImageStorage externalImageStorage;
+    private final CachePreSignedUrlStorage cachePreSignedUrlStorage;
+
+
+    public String upload(MultipartFile file, ImageDomain domain) {
+        String imageKey = externalImageStorage.upload(file, domain);
+
+        String preSignedUrl = externalImageStorage.getPresignedUrl(imageKey);
+        cachePreSignedUrlStorage.put(imageKey, preSignedUrl);
+        return imageKey;
+    }
+
+    @Nullable
+    public String getPresignedUrl(@Nullable String imageKey) {
+        if (imageKey == null || imageKey.isEmpty()) {
+            return null;
+        }
+
+        Optional<String> cachedUrl = cachePreSignedUrlStorage.get(imageKey);
+        if (cachedUrl.isPresent()) {
+            return cachedUrl.get();
+        }
+
+        String preSignedUrl = externalImageStorage.getPresignedUrl(imageKey);
+        cachePreSignedUrlStorage.put(imageKey, preSignedUrl);
+        return preSignedUrl;
+    }
+}
diff --git a/src/test/java/eatda/controller/BaseControllerTest.java b/src/test/java/eatda/controller/BaseControllerTest.java
@@ -16,11 +16,11 @@
 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.story.StoryService;
+import eatda.storage.image.ImageStorage;
 import io.restassured.RestAssured;
 import io.restassured.builder.RequestSpecBuilder;
 import io.restassured.filter.Filter;
@@ -81,7 +81,7 @@ public class BaseControllerTest {
     private MapClient mapClient;
 
     @MockitoBean
-    private ImageRepository imageRepository;
+    private ImageStorage imageStorage;
 
     @MockitoBean
     protected StoryService storyService; // TODO 실 객체로 변환
@@ -113,8 +113,8 @@ final void mockingClient() throws URISyntaxException {
         );
         doReturn(searchResults).when(mapClient).searchShops(anyString());
 
-        doReturn(MOCKED_IMAGE_URL).when(imageRepository).getPresignedUrl(anyString());
-        doReturn(MOCKED_IMAGE_KEY).when(imageRepository).upload(any(), any());
+        doReturn(MOCKED_IMAGE_URL).when(imageStorage).getPresignedUrl(anyString());
+        doReturn(MOCKED_IMAGE_KEY).when(imageStorage).upload(any(), any());
     }
 
     protected final RequestSpecification given() {
diff --git a/src/test/java/eatda/repository/BaseRepositoryTest.java b/src/test/java/eatda/repository/BaseRepositoryTest.java
@@ -13,7 +13,7 @@
 
 @Import({MemberGenerator.class, StoreGenerator.class, CheerGenerator.class})
 @DataJpaTest
-public abstract class BaseJpaRepositoryTest {
+public abstract class BaseRepositoryTest {
 
     @Autowired
     protected MemberGenerator memberGenerator;
diff --git a/src/test/java/eatda/repository/store/CheerRepositoryTest.java b/src/test/java/eatda/repository/store/CheerRepositoryTest.java
@@ -4,12 +4,12 @@
 
 import eatda.domain.member.Member;
 import eatda.domain.store.Store;
-import eatda.repository.BaseJpaRepositoryTest;
+import eatda.repository.BaseRepositoryTest;
 import java.util.Optional;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
-class CheerRepositoryTest extends BaseJpaRepositoryTest {
+class CheerRepositoryTest extends BaseRepositoryTest {
 
     @Nested
     class FindRecentImageKey {
diff --git a/src/test/java/eatda/service/BaseServiceTest.java b/src/test/java/eatda/service/BaseServiceTest.java
@@ -11,11 +11,11 @@
 import eatda.fixture.CheerGenerator;
 import eatda.fixture.MemberGenerator;
 import eatda.fixture.StoreGenerator;
-import eatda.repository.image.S3ImageRepository;
 import eatda.repository.member.MemberRepository;
 import eatda.repository.store.CheerRepository;
 import eatda.repository.store.StoreRepository;
 import eatda.repository.story.StoryRepository;
+import eatda.storage.image.ExternalImageStorage;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.extension.ExtendWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,7 +36,7 @@ public abstract class BaseServiceTest {
     protected MapClient mapClient;
 
     @MockitoBean
-    protected S3ImageRepository imageRepository;
+    protected ExternalImageStorage externalImageStorage;
 
     @Autowired
     protected MemberGenerator memberGenerator;
@@ -64,7 +64,7 @@ public abstract class BaseServiceTest {
 
     @BeforeEach
     void mockingImageService() {
-        doReturn(MOCKED_IMAGE_URL).when(imageRepository).getPresignedUrl(anyString());
-        doReturn(MOCKED_IMAGE_KEY).when(imageRepository).upload(any(), any());
+        doReturn(MOCKED_IMAGE_URL).when(externalImageStorage).getPresignedUrl(anyString());
+        doReturn(MOCKED_IMAGE_KEY).when(externalImageStorage).upload(any(), any());
     }
 }
diff --git a/src/test/java/eatda/service/story/StoryServiceTest.java b/src/test/java/eatda/service/story/StoryServiceTest.java
diff --git a/src/test/java/eatda/storage/BaseStorageTest.java b/src/test/java/eatda/storage/BaseStorageTest.java
diff --git a/src/test/java/eatda/storage/image/ExternalImageStorageTest.java b/src/test/java/eatda/storage/image/ExternalImageStorageTest.java
diff --git a/src/test/java/eatda/storage/image/ImageStorageTest.java b/src/test/java/eatda/storage/image/ImageStorageTest.java

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package eatda.repository.image;`
	`1`	`+package eatda.domain;`
`2`	`2`
`3`	`3`	`import lombok.Getter;`
`4`	`4`	`import lombok.RequiredArgsConstructor;`