[Feat] 최신 상점 조회 API의 응원 내용 추가

src/main/java/eatda/controller/store/StorePreviewResponse.java

@@ -1,14 +1,16 @@
 package eatda.controller.store;
 
 import eatda.domain.store.Store;
+import java.util.List;
 
 public record StorePreviewResponse(
         long id,
         String imageUrl,
         String name,
         String district,
         String neighborhood,
-        String category
+        String category,
+        List<String> cheerDescriptions
 ) {
 
     public StorePreviewResponse(Store store, String imageUrl) {
@@ -18,7 +20,8 @@ public StorePreviewResponse(Store store, String imageUrl) {
                 store.getName(),
                 store.getAddressDistrict(),
                 store.getAddressNeighborhood(),
-                store.getCategory().getCategoryName()
+                store.getCategory().getCategoryName(),
+                store.getCheerDescriptions()
         );
     }
 }

src/main/java/eatda/domain/store/Store.java

@@ -1,6 +1,7 @@
 package eatda.domain.store;
 
 import eatda.domain.AuditingEntity;
+import eatda.domain.cheer.Cheer;
 import jakarta.persistence.Column;
 import jakarta.persistence.Embedded;
 import jakarta.persistence.Entity;
@@ -9,7 +10,10 @@
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.OneToMany;
 import jakarta.persistence.Table;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.AccessLevel;
 import lombok.Builder;
 import lombok.Getter;
@@ -54,6 +58,9 @@ public class Store extends AuditingEntity {
     @Embedded
     private Coordinates coordinates;
 
+    @OneToMany(mappedBy = "store")
+    private List<Cheer> cheers = new ArrayList<>();
+
     @Builder
     private Store(String kakaoId,
                   StoreCategory category,
@@ -87,4 +94,10 @@ public String getAddressNeighborhood() {
         }
         return addressParts[2];
     }
+
+    public List<String> getCheerDescriptions() {
+        return cheers.stream()
+                .map(Cheer::getDescription)
+                .toList();
+    }
 }

src/main/java/eatda/repository/cheer/CheerImageRepository.java

@@ -1,13 +1,14 @@
 package eatda.repository.cheer;
 
 import eatda.domain.cheer.CheerImage;
+import eatda.domain.store.Store;
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CheerImageRepository extends JpaRepository<CheerImage, Long> {
 
-    List<CheerImage> findAllByCheer_Store_IdOrderByOrderIndexAsc(Long storeId);
+    List<CheerImage> findAllByCheer_StoreOrderByOrderIndexAsc(Store store);
 
     Optional<CheerImage> findFirstByCheer_Store_IdOrderByCreatedAtDesc(Long storeId);
 }

src/main/java/eatda/repository/store/StoreRepository.java

@@ -7,6 +7,7 @@
 import java.util.List;
 import java.util.Optional;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
 
@@ -20,8 +21,10 @@ default Store getById(Long id) {
 
     Optional<Store> findByKakaoId(String kakaoId);
 
+    @EntityGraph(attributePaths = {"cheers"})
     List<Store> findAllByOrderByCreatedAtDesc(Pageable pageable);
 
+    @EntityGraph(attributePaths = {"cheers"})
     List<Store> findAllByCategoryOrderByCreatedAtDesc(StoreCategory category, Pageable pageable);
 
     @Query("""

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

@@ -41,6 +41,7 @@ public StoreResponse getStore(long storeId) {
     }
 
     // TODO : N+1 문제 해결
+    @Transactional(readOnly = true)
     public StoresResponse getStores(int page, int size, @Nullable String category) {
         return findStores(page, size, category)
                 .stream()
@@ -56,8 +57,10 @@ private List<Store> findStores(int page, int size, @Nullable String category) {
                 StoreCategory.from(category), PageRequest.of(page, size));
     }
 
+    @Transactional(readOnly = true)
     public ImagesResponse getStoreImages(long storeId) {
-        List<String> urls = cheerImageRepository.findAllByCheer_Store_IdOrderByOrderIndexAsc(storeId)
+        Store store = storeRepository.getById(storeId);
+        List<String> urls = cheerImageRepository.findAllByCheer_StoreOrderByOrderIndexAsc(store)
                 .stream()
                 .map(img -> "https://" + cdnBaseUrl + "/" + img.getImageKey())
                 .toList();

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

@@ -1,9 +1,11 @@
 package eatda.controller;
 
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.Mockito.doReturn;
 
 import eatda.DatabaseCleaner;
+import eatda.client.file.FileClient;
 import eatda.client.map.MapClient;
 import eatda.client.map.MapClientStoreSearchResult;
 import eatda.client.oauth.OauthClient;
@@ -85,6 +87,9 @@ public class BaseControllerTest {
     @Autowired
     protected JwtManager jwtManager;
 
+    @MockitoBean
+    private FileClient fileClient;
+
     @MockitoBean
     private OauthClient oauthClient;
 
@@ -119,6 +124,8 @@ final void mockingClient() throws URISyntaxException {
                         "서울 중구 북창동 19-4", null, 37.0d, 128.0d)
         );
         doReturn(searchResults).when(mapClient).searchStores(anyString());
+
+        doReturn(MOCKED_IMAGE_URL).when(fileClient).generateUploadPresignedUrl(anyString(), any());
     }
 
     protected final RequestSpecification given() {

src/test/java/eatda/controller/store/StoreControllerTest.java

@@ -22,7 +22,7 @@ class GetStore {
         void 음식점_정보를_조회한다() {
             Member member = memberGenerator.generate("111");
             Store store = storeGenerator.generate("농민백암순대", "서울 강남구 대치동 896-33");
-            cheerGenerator.generateCommon(member, store, false);
+            cheerGenerator.generateCommon(member, store);
 
             StoreResponse response = given()
                     .pathParam("storeId", store.getId())
@@ -53,9 +53,9 @@ class GetStores {
                     startAt.plusHours(1));
             Store store3 = storeGenerator.generate("114", "서울 강남구 역삼동 678-90", StoreCategory.KOREAN,
                     startAt.plusHours(2));
-            cheerGenerator.generateCommon(member, store1, false);
-            cheerGenerator.generateCommon(member, store2, false);
-            cheerGenerator.generateCommon(member, store3, false);
+            cheerGenerator.generateCommon(member, store1);
+            cheerGenerator.generateCommon(member, store2);
+            cheerGenerator.generateCommon(member, store3);
 
             int page = 0;
             int size = 2;
@@ -85,9 +85,9 @@ class GetStores {
                     startAt.plusHours(1));
             Store store3 = storeGenerator.generate("114", "서울 강남구 역삼동 678-90", StoreCategory.CAFE,
                     startAt.plusHours(2));
-            cheerGenerator.generateCommon(member, store1, false);
-            cheerGenerator.generateCommon(member, store2, false);
-            cheerGenerator.generateCommon(member, store3, false);
+            cheerGenerator.generateCommon(member, store1);
+            cheerGenerator.generateCommon(member, store2);
+            cheerGenerator.generateCommon(member, store3);
 
             int page = 0;
             int size = 2;
@@ -118,7 +118,7 @@ class GetStoreImages {
         void 음식점_이미지들을_조회한다() {
             Member member = memberGenerator.generate("111");
             Store store = storeGenerator.generate("농민백암순대", "서울 강남구 대치동 896-33");
-            Cheer cheer = cheerGenerator.generateCommon(member, store, false);
+            Cheer cheer = cheerGenerator.generateCommon(member, store);
 
             cheerImageGenerator.generate(cheer, "image1.png", 1L);
             cheerImageGenerator.generate(cheer, "image2.png", 2L);

src/test/java/eatda/document/store/StoreDocumentTest.java

@@ -116,7 +116,8 @@ class GetStores {
                         fieldWithPath("stores[].name").type(STRING).description("음식점 이름"),
                         fieldWithPath("stores[].district").type(STRING).description("음식점 주소 (구)"),
                         fieldWithPath("stores[].neighborhood").type(STRING).description("음식점 주소 (동)"),
-                        fieldWithPath("stores[].category").type(STRING).description("음식점 카테고리")
+                        fieldWithPath("stores[].category").type(STRING).description("음식점 카테고리"),
+                        fieldWithPath("stores[].cheerDescriptions").type(ARRAY).description("음식점에 달린 응원 메시지")
                 );
 
         @Test
@@ -125,8 +126,10 @@ class GetStores {
             int size = 2;
             StoreCategory category = StoreCategory.CAFE;
             StoresResponse response = new StoresResponse(List.of(
-                    new StorePreviewResponse(2L, "https://example.image", "농민백암순대", "강남구", "대치동", "한식"),
-                    new StorePreviewResponse(1L, "https://example.image", "석관동떡볶이", "성북구", "석관동", "한식")
+                    new StorePreviewResponse(2L, "https://example.image", "농민백암순대", "강남구", "대치동", "한식",
+                            List.of("응원해요!", "순대가 맛돌이!")),
+                    new StorePreviewResponse(1L, "https://example.image", "석관동떡볶이", "성북구", "석관동", "한식",
+                            List.of("응원해요!", "떡볶이가 맛있게 매워요~", "매운 떡볶이 최고!"))
             ));
             doReturn(response).when(storeService).getStores(page, size, category.getCategoryName());
 

src/test/java/eatda/fixture/CheerGenerator.java

@@ -29,10 +29,6 @@ public Cheer generateCommon(Member member, Store store) {
         return generateCommon(member, store, false, DEFAULT_DESCRIPTION);
     }
 
-    public Cheer generateCommon(Member member, Store store, boolean isAdmin) {
-        return generateCommon(member, store, isAdmin, DEFAULT_DESCRIPTION);
-    }
-
     public Cheer generateCommon(Member member, Store store, LocalDateTime createdAt) {
         Cheer cheer = generateCommon(member, store, false, DEFAULT_DESCRIPTION);
         DomainUtils.setCreatedAt(cheer, createdAt);