Merge pull request #172 from YAPP-Github/feat/PRODUCT-257

[Feat] 응원 API 응답에 태그 정보 추가

Author: leegwichan

src/main/java/eatda/controller/cheer/CheerInStoreResponse.java

@@ -1,20 +1,24 @@
 package eatda.controller.cheer;
 
 import eatda.domain.cheer.Cheer;
+import eatda.domain.cheer.CheerTagName;
+import java.util.List;
 
 public record CheerInStoreResponse(
         long id,
         long memberId,
         String memberNickname,
-        String description
+        String description,
+        List<CheerTagName> tags
 ) {
 
     public CheerInStoreResponse(Cheer cheer) {
         this(
                 cheer.getId(),
                 cheer.getMember().getId(),
                 cheer.getMember().getNickname(),
-                cheer.getDescription()
+                cheer.getDescription(),
+                cheer.getCheerTagNames()
         );
     }
 }

src/main/java/eatda/controller/cheer/CheerPreviewResponse.java

@@ -1,6 +1,8 @@
 package eatda.controller.cheer;
 
 import eatda.domain.cheer.Cheer;
+import eatda.domain.cheer.CheerTagName;
+import java.util.List;
 
 public record CheerPreviewResponse(
         long storeId,
@@ -11,6 +13,7 @@ public record CheerPreviewResponse(
         String storeCategory,
         long cheerId,
         String cheerDescription,
+        List<CheerTagName> tags,
         long memberId,
         String memberNickname
 ) {
@@ -25,6 +28,7 @@ public CheerPreviewResponse(Cheer cheer, String imageUrl) {
                 cheer.getStore().getCategory().getCategoryName(),
                 cheer.getId(),
                 cheer.getDescription(),
+                cheer.getCheerTagNames(),
                 cheer.getMember().getId(),
                 cheer.getMember().getNickname()
         );

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

@@ -13,11 +13,11 @@
 
 public interface CheerRepository extends JpaRepository<Cheer, Long> {
 
-    @EntityGraph(attributePaths = {"store", "member"})
+    @EntityGraph(attributePaths = {"store", "member", "cheerTags.values"})
     List<Cheer> findAllByOrderByCreatedAtDesc(Pageable pageable);
 
-    @EntityGraph(attributePaths = {"member"})
-    List<Cheer> findAllByStoreOrderByCreatedAtDesc(Store store, Pageable pageable);
+    @EntityGraph(attributePaths = {"member", "cheerTags.values"})
+    List<Cheer> findAllByStoreIdOrderByCreatedAtDesc(Long storeId, Pageable pageable);
 
     @Query("""
             SELECT c.imageKey FROM Cheer c

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

@@ -75,12 +75,11 @@ private CheersResponse toCheersResponse(List<Cheer> cheers) {
 
     @Transactional(readOnly = true)
     public CheersInStoreResponse getCheersByStoreId(Long storeId, int page, int size) {
-        Store store = storeRepository.getById(storeId);
-        List<Cheer> cheers = cheerRepository.findAllByStoreOrderByCreatedAtDesc(store, PageRequest.of(page, size));
+        List<Cheer> cheers = cheerRepository.findAllByStoreIdOrderByCreatedAtDesc(storeId, PageRequest.of(page, size));
 
         List<CheerInStoreResponse> cheersResponse = cheers.stream()
                 .map(CheerInStoreResponse::new)
-                .toList(); // TODO N+1 문제 해결
+                .toList();
         return new CheersInStoreResponse(cheersResponse);
     }
 }

src/test/java/eatda/controller/cheer/CheerControllerTest.java

@@ -100,7 +100,8 @@ class GetCheers {
                     () -> assertThat(firstResponse.storeId()).isEqualTo(store2.getId()),
                     () -> assertThat(firstResponse.storeDistrict()).isEqualTo("성북구"),
                     () -> assertThat(firstResponse.storeNeighborhood()).isEqualTo("석관동"),
-                    () -> assertThat(firstResponse.cheerId()).isEqualTo(cheer3.getId())
+                    () -> assertThat(firstResponse.cheerId()).isEqualTo(cheer3.getId()),
+                    () -> assertThat(firstResponse.tags()).isEmpty()
             );
         }
 

src/test/java/eatda/document/cheer/CheerDocumentTest.java

@@ -157,6 +157,7 @@ class GetCheers {
                         fieldWithPath("cheers[].storeCategory").type(STRING).description("가게 카테고리"),
                         fieldWithPath("cheers[].cheerId").type(NUMBER).description("응원 ID"),
                         fieldWithPath("cheers[].cheerDescription").type(STRING).description("응원 내용"),
+                        fieldWithPath("cheers[].tags").type(ARRAY).description("응원 태그 목록"),
                         fieldWithPath("cheers[].memberId").type(NUMBER).description("응원 작성자 회원 ID"),
                         fieldWithPath("cheers[].memberNickname").type(STRING).description("응원 작성자 닉네임")
                 );
@@ -167,9 +168,9 @@ class GetCheers {
             int size = 2;
             CheersResponse responses = new CheersResponse(List.of(
                     new CheerPreviewResponse(2L, "https://example.image", "농민백암순대 본점", "강남구", "선릉구", "한식", 2L,
-                            "너무 맛있어요!", 5L, "커찬"),
+                            "너무 맛있어요!", List.of(CheerTagName.INSTAGRAMMABLE, CheerTagName.CLEAN_RESTROOM), 5L, "커찬"),
                     new CheerPreviewResponse(1L, null, "석관동떡볶이", "성북구", "석관동", "기타", 1L,
-                            "너무 매워요! 하지만 맛있어요!", 8L, "찬커")
+                            "너무 매워요! 하지만 맛있어요!", List.of(), 8L, "찬커")
             ));
             doReturn(responses).when(cheerService).getCheers(page, size);
 
@@ -225,7 +226,8 @@ class GetCheersByStoreId {
                         fieldWithPath("cheers[].id").type(NUMBER).description("응원 ID"),
                         fieldWithPath("cheers[].memberId").type(NUMBER).description("응원 작성자 회원 ID"),
                         fieldWithPath("cheers[].memberNickname").type(STRING).description("응원 작성자 닉네임"),
-                        fieldWithPath("cheers[].description").type(STRING).description("응원 내용")
+                        fieldWithPath("cheers[].description").type(STRING).description("응원 내용"),
+                        fieldWithPath("cheers[].tags").type(ARRAY).description("응원 태그 목록")
                 );
 
         @Test
@@ -234,8 +236,9 @@ class GetCheersByStoreId {
             int page = 0;
             int size = 2;
             CheersInStoreResponse responses = new CheersInStoreResponse(List.of(
-                    new CheerInStoreResponse(20L, 5L, "커찬", "너무 맛있어요!"),
-                    new CheerInStoreResponse(10L, 3L, "찬커", "너무 매워요! 하지만 맛있어요!")
+                    new CheerInStoreResponse(20L, 5L, "커찬", "너무 맛있어요!",
+                            List.of(CheerTagName.INSTAGRAMMABLE, CheerTagName.CLEAN_RESTROOM, CheerTagName.ENERGETIC)),
+                    new CheerInStoreResponse(10L, 3L, "찬커", "너무 매워요! 하지만 맛있어요!", List.of())
             ));
             doReturn(responses).when(cheerService).getCheersByStoreId(storeId, page, size);