Merge pull request #180 from YAPP-Github/feat/PRODUCT-261

leegwichan · web-flow · commit 903ceb67d3fc · 2025-08-19T12:41:14.000+09:00
[Feat] '최신 응원 조회 API'에 검색 조건 추가
diff --git a/src/main/java/eatda/controller/cheer/CheerController.java b/src/main/java/eatda/controller/cheer/CheerController.java
@@ -1,12 +1,16 @@
 package eatda.controller.cheer;
 
+import eatda.controller.store.SearchDistrict;
 import eatda.controller.web.auth.LoginMember;
 import eatda.domain.ImageDomain;
+import eatda.domain.cheer.CheerTagName;
+import eatda.domain.store.StoreCategory;
 import eatda.domain.store.StoreSearchResult;
 import eatda.service.cheer.CheerService;
 import eatda.service.store.StoreSearchService;
 import jakarta.validation.constraints.Max;
 import jakarta.validation.constraints.Min;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -38,8 +42,12 @@ public ResponseEntity<CheerResponse> registerCheer(@RequestBody CheerRegisterReq
 
     @GetMapping("/api/cheer")
     public ResponseEntity<CheersResponse> getCheers(@RequestParam(defaultValue = "0") @Min(0) int page,
-                                                    @RequestParam(defaultValue = "5") @Min(1) @Max(50) int size) {
-        CheersResponse response = cheerService.getCheers(page, size);
+                                                    @RequestParam(defaultValue = "5") @Min(1) @Max(50) int size,
+                                                    @RequestParam(required = false) StoreCategory category,
+                                                    @RequestParam(required = false) List<CheerTagName> tag,
+                                                    @RequestParam(required = false) List<SearchDistrict> location) {
+        CheerSearchParameters searchParameters = new CheerSearchParameters(page, size, category, tag, location);
+        CheersResponse response = cheerService.getCheers(searchParameters);
         return ResponseEntity.ok(response);
     }
 
diff --git a/src/main/java/eatda/controller/cheer/CheerSearchParameters.java b/src/main/java/eatda/controller/cheer/CheerSearchParameters.java
@@ -0,0 +1,50 @@
+package eatda.controller.cheer;
+
+import eatda.controller.store.SearchDistrict;
+import eatda.domain.cheer.CheerTagName;
+import eatda.domain.store.District;
+import eatda.domain.store.StoreCategory;
+import java.util.Collections;
+import java.util.List;
+import lombok.Getter;
+import org.springframework.lang.Nullable;
+
+public class CheerSearchParameters {
+
+    @Getter
+    private final int page;
+    @Getter
+    private final int size;
+    @Nullable
+    private final StoreCategory category;
+    private final List<CheerTagName> tag;
+    private final List<SearchDistrict> location;
+
+    public CheerSearchParameters(int page,
+                                 int size,
+                                 @Nullable StoreCategory category,
+                                 @Nullable List<CheerTagName> tag,
+                                 @Nullable List<SearchDistrict> location) {
+        this.page = page;
+        this.size = size;
+        this.category = category;
+        this.tag = tag != null ? tag : Collections.emptyList();
+        this.location = location != null ? location : Collections.emptyList();
+    }
+
+    @Nullable
+    public StoreCategory getCategory() {
+        return category;
+    }
+
+    public List<CheerTagName> getCheerTagNames() {
+        return tag;
+    }
+
+    public List<District> getDistricts() {
+        return location.stream()
+                .flatMap(district -> district.getDistricts().stream())
+                .distinct()
+                .toList();
+    }
+}
diff --git a/src/main/java/eatda/controller/store/SearchDistrict.java b/src/main/java/eatda/controller/store/SearchDistrict.java
@@ -0,0 +1,34 @@
+package eatda.controller.store;
+
+import eatda.domain.store.District;
+import java.util.List;
+import lombok.Getter;
+
+@Getter
+public enum SearchDistrict {
+
+    GANGNAM("강남/역삼/선릉", List.of(District.GANGNAM)),
+    KONDAE("건대/성수/서울숲/왕십리", List.of(District.SEONGDONG, District.GWANGJIN)),
+    GEUMHO("금호/옥수/신당", List.of(District.JUNG)),
+    HAPJEONG("합정/망원/홍대", List.of(District.MAPO)),
+    SINCHON("신촌/이대", List.of(District.SEODAEMUN)),
+    MYEONGDONG("명동/을지로/충무로", List.of(District.DONGDAEMUN, District.SEONGBUK)),
+    SEOCHON("서촌/북촌/삼청", List.of(District.JONGNO)),
+    DAECHI("대치/논현/서초", List.of(District.SEOCHO)),
+    YONGSAN("용산/이태원/한남", List.of(District.YONGSAN, District.DONGJAK)),
+    GEUMCHEON("금천/도봉/노원", List.of(District.GEUMCHEON, District.DOBONG, District.NOWON)),
+    YEONGDEUNGPO("영등포/여의도", List.of(District.YEONGDEUNGPO)),
+    JAMSIL("잠실/송파", List.of(District.SONGPA)),
+    JONGRO("종로/광화문", List.of(District.JONGNO)),
+    MAGOK("마곡/목동/강서", List.of(District.GANGSEO, District.YANGCHEON)),
+    GURO("구로/서울대입구", List.of(District.GURO, District.GWANAK)),
+    ;
+
+    private String displayName;
+    private List<District> districts;
+
+    SearchDistrict(String displayName, List<District> districts) {
+        this.displayName = displayName;
+        this.districts = districts;
+    }
+}
diff --git a/src/main/java/eatda/repository/cheer/CheerRepository.java b/src/main/java/eatda/repository/cheer/CheerRepository.java
@@ -1,20 +1,54 @@
 package eatda.repository.cheer;
 
 import eatda.domain.cheer.Cheer;
+import eatda.domain.cheer.CheerTagName;
 import eatda.domain.member.Member;
+import eatda.domain.store.District;
 import eatda.domain.store.Store;
+import eatda.domain.store.StoreCategory;
+import jakarta.persistence.criteria.JoinType;
 import java.util.List;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.jpa.domain.Specification;
 import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.lang.Nullable;
 
 public interface CheerRepository extends JpaRepository<Cheer, Long> {
 
-    @EntityGraph(attributePaths = {"store", "member", "cheerTags.values", "images"})
-    List<Cheer> findAllByOrderByCreatedAtDesc(Pageable pageable);
+    @EntityGraph(attributePaths = {"member", "cheerTags.values"})
+    List<Cheer> findAllByStoreOrderByCreatedAtDesc(Store store, PageRequest pageRequest);
 
-    List<Cheer> findAllByStoreOrderByCreatedAtDesc(Store store, PageRequest of);
+    default List<Cheer> findAllByConditions(@Nullable StoreCategory category,
+                                            List<CheerTagName> cheerTagNames,
+                                            List<District> districts, Pageable pageable) {
+        Specification<Cheer> spec = createSpecification(category, cheerTagNames, districts);
+        return findAll(spec, pageable);
+    }
+
+    private Specification<Cheer> createSpecification(@Nullable StoreCategory category,
+                                                     List<CheerTagName> cheerTagNames,
+                                                     List<District> districts) {
+        Specification<Cheer> spec = Specification.allOf();
+        if (category != null) {
+            spec = spec.and((root, query, cb) -> cb.equal(root.get("store").get("category"), category));
+        }
+        if (!cheerTagNames.isEmpty()) {
+            spec = spec.and(((root, query, cb) -> {
+                query.distinct(true);
+                return root.join("cheerTags").join("values", JoinType.LEFT)
+                        .get("name").in(cheerTagNames);
+            }));
+        }
+        if (!districts.isEmpty()) {
+            spec = spec.and((root, query, cb) -> root.get("store").get("district").in(districts));
+        }
+        return spec;
+    }
+
+    @EntityGraph(attributePaths = {"store", "member", "cheerTags.values"})
+    List<Cheer> findAll(Specification<Cheer> specification, Pageable pageable);
 
     int countByMember(Member member);
 
diff --git a/src/main/java/eatda/repository/store/StoreRepository.java b/src/main/java/eatda/repository/store/StoreRepository.java
@@ -53,7 +53,7 @@ private Specification<Store> createSpecification(@Nullable StoreCategory categor
         }
         if (!cheerTagNames.isEmpty()) {
             spec = spec.and(((root, query, cb) ->
-                    root.join("cheers").get("cheerTags").get("values").get("name").in(cheerTagNames)));
+                    root.join("cheers").join("cheerTags").join("values").get("name").in(cheerTagNames)));
         }
         if (!districts.isEmpty()) {
             spec = spec.and((root, query, cb) -> root.get("district").in(districts));
diff --git a/src/main/java/eatda/service/cheer/CheerService.java b/src/main/java/eatda/service/cheer/CheerService.java
@@ -6,6 +6,7 @@
 import eatda.controller.cheer.CheerPreviewResponse;
 import eatda.controller.cheer.CheerRegisterRequest;
 import eatda.controller.cheer.CheerResponse;
+import eatda.controller.cheer.CheerSearchParameters;
 import eatda.controller.cheer.CheersInStoreResponse;
 import eatda.controller.cheer.CheersResponse;
 import eatda.domain.ImageDomain;
@@ -25,6 +26,8 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Sort;
+import org.springframework.data.domain.Sort.Direction;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -111,8 +114,13 @@ private void saveCheerImages(Cheer cheer,
     }
 
     @Transactional(readOnly = true)
-    public CheersResponse getCheers(int page, int size) {
-        List<Cheer> cheers = cheerRepository.findAllByOrderByCreatedAtDesc(PageRequest.of(page, size));
+    public CheersResponse getCheers(CheerSearchParameters parameters) {
+        List<Cheer> cheers = cheerRepository.findAllByConditions(
+                parameters.getCategory(),
+                parameters.getCheerTagNames(),
+                parameters.getDistricts(),
+                PageRequest.of(parameters.getPage(), parameters.getSize(), Sort.by(Direction.DESC, "createdAt"))
+        );
         return toCheersResponse(cheers);
     }
 
diff --git a/src/test/java/eatda/controller/BaseControllerTest.java b/src/test/java/eatda/controller/BaseControllerTest.java
@@ -16,6 +16,7 @@
 import eatda.fixture.CheerGenerator;
 import eatda.fixture.CheerImageGenerator;
 import eatda.fixture.CheerTagGenerator;
+import eatda.fixture.CheerTagGenerator;
 import eatda.fixture.MemberGenerator;
 import eatda.fixture.StoreGenerator;
 import eatda.fixture.StoryGenerator;
diff --git a/src/test/java/eatda/controller/cheer/CheerControllerTest.java b/src/test/java/eatda/controller/cheer/CheerControllerTest.java
@@ -4,11 +4,13 @@
 import static org.junit.jupiter.api.Assertions.assertAll;
 
 import eatda.controller.BaseControllerTest;
+import eatda.controller.store.SearchDistrict;
 import eatda.domain.cheer.Cheer;
 import eatda.domain.cheer.CheerTagName;
 import eatda.domain.member.Member;
 import eatda.domain.store.District;
 import eatda.domain.store.Store;
+import eatda.domain.store.StoreCategory;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +26,8 @@ class RegisterCheer {
         @Test
         void 응원을_등록한다() {
             Store store = storeGenerator.generate("123", "서울시 노원구 월계3동 123-45", District.NOWON);
-            CheerRegisterRequest request = new CheerRegisterRequest(store.getKakaoId(), store.getName(), "맛있어요!", new ArrayList<>(), List.of(CheerTagName.INSTAGRAMMABLE, CheerTagName.CLEAN_RESTROOM));
+            CheerRegisterRequest request = new CheerRegisterRequest(store.getKakaoId(), store.getName(), "맛있어요!",
+                    new ArrayList<>(), List.of(CheerTagName.INSTAGRAMMABLE, CheerTagName.CLEAN_RESTROOM));
 
             CheerResponse response = given()
                     .header(HttpHeaders.AUTHORIZATION, accessToken())
@@ -46,7 +49,8 @@ class RegisterCheer {
         @Test
         void 이미지가_비어있을_경우에도_응원을_등록한다() {
             Store store = storeGenerator.generate("123", "서울시 노원구 월계3동 123-45", District.NOWON);
-            CheerRegisterRequest request = new CheerRegisterRequest(store.getKakaoId(), store.getName(), "맛있어요!", new ArrayList<>(), List.of(CheerTagName.INSTAGRAMMABLE, CheerTagName.CLEAN_RESTROOM));
+            CheerRegisterRequest request = new CheerRegisterRequest(store.getKakaoId(), store.getName(), "맛있어요!",
+                    new ArrayList<>(), List.of(CheerTagName.INSTAGRAMMABLE, CheerTagName.CLEAN_RESTROOM));
 
             CheerResponse response = given()
                     .header(HttpHeaders.AUTHORIZATION, accessToken())
@@ -78,13 +82,11 @@ class GetCheers {
             Cheer cheer1 = cheerGenerator.generateAdmin(member, store1, startAt);
             Cheer cheer2 = cheerGenerator.generateAdmin(member, store1, startAt.plusHours(1));
             Cheer cheer3 = cheerGenerator.generateAdmin(member, store2, startAt.plusHours(2));
-            int page = 0;
-            int size = 2;
 
             CheersResponse response = given()
                     .when()
-                    .queryParam("page", page)
-                    .queryParam("size", size)
+                    .queryParam("page", 0)
+                    .queryParam("size", 2)
                     .get("/api/cheer")
                     .then()
                     .statusCode(200)
@@ -101,6 +103,41 @@ class GetCheers {
             );
         }
 
+        @Test
+        void 필터링을_통해_응원을_조회한다() {
+            Member member = memberGenerator.generateRegisteredMember("nickname", "ac@kakao.com", "123", "01011111111");
+            Store store1 = storeGenerator.generate("111", "서울시 노원구 월계3동 123-45", District.NOWON,
+                    StoreCategory.KOREAN);
+            Store store2 = storeGenerator.generate("222", "서울시 노원구 월계3동 123-46", District.NOWON,
+                    StoreCategory.KOREAN);
+            LocalDateTime startAt = LocalDateTime.of(2025, 7, 26, 1, 0, 0);
+            Cheer cheer1 = cheerGenerator.generateAdmin(member, store1, startAt);
+            Cheer cheer2 = cheerGenerator.generateAdmin(member, store1, startAt.plusHours(1));
+            Cheer cheer3 = cheerGenerator.generateAdmin(member, store2, startAt.plusHours(2));
+            cheerTagGenerator.generate(cheer1, List.of(CheerTagName.INSTAGRAMMABLE, CheerTagName.CLEAN_RESTROOM));
+            cheerTagGenerator.generate(cheer2, List.of(CheerTagName.INSTAGRAMMABLE));
+            cheerTagGenerator.generate(cheer3, List.of(CheerTagName.CLEAN_RESTROOM));
+
+            CheersResponse response = given()
+                    .when()
+                    .queryParam("page", 0)
+                    .queryParam("size", 2)
+                    .queryParam("category", StoreCategory.KOREAN)
+                    .queryParam("tag", CheerTagName.INSTAGRAMMABLE)
+                    .queryParam("location", SearchDistrict.GEUMCHEON, SearchDistrict.MYEONGDONG)
+                    .get("/api/cheer")
+                    .then()
+                    .statusCode(200)
+                    .extract().as(CheersResponse.class);
+
+            CheerPreviewResponse firstResponse = response.cheers().get(0);
+            assertAll(
+                    () -> assertThat(response.cheers()).hasSize(2),
+                    () -> assertThat(response.cheers().get(0).cheerId()).isEqualTo(cheer2.getId()),
+                    () -> assertThat(response.cheers().get(1).cheerId()).isEqualTo(cheer1.getId())
+            );
+        }
+
         @Nested
         class GetCheersByStoreId {
 
diff --git a/src/test/java/eatda/document/cheer/CheerDocumentTest.java b/src/test/java/eatda/document/cheer/CheerDocumentTest.java
diff --git a/src/test/java/eatda/repository/cheer/CheerRepositoryTest.java b/src/test/java/eatda/repository/cheer/CheerRepositoryTest.java
diff --git a/src/test/java/eatda/service/cheer/CheerServiceTest.java b/src/test/java/eatda/service/cheer/CheerServiceTest.java

Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ private Specification<Store> createSpecification(@Nullable StoreCategory categor`
`53`	`53`	`}`
`54`	`54`	`if (!cheerTagNames.isEmpty()) {`
`55`	`55`	`spec = spec.and(((root, query, cb) ->`
`56`		`- root.join("cheers").get("cheerTags").get("values").get("name").in(cheerTagNames)));`
	`56`	`+ root.join("cheers").join("cheerTags").join("values").get("name").in(cheerTagNames)));`
`57`	`57`	`}`
`58`	`58`	`if (!districts.isEmpty()) {`
`59`	`59`	`spec = spec.and((root, query, cb) -> root.get("district").in(districts));`