feat: '최신 응원 조회 API'의 검색 조건 추가 서비스 로직 구현

leegwichan · leegwichan · commit 13d5e4735e02 · 2025-08-17T20:16:49.000+09:00
diff --git a/src/main/java/eatda/controller/cheer/CheerController.java b/src/main/java/eatda/controller/cheer/CheerController.java
@@ -1,14 +1,18 @@
 package eatda.controller.cheer;
 
+import eatda.controller.store.SearchDistrict;
 import eatda.controller.web.auth.LoginMember;
 import eatda.domain.ImageDomain;
 import eatda.domain.ImageKey;
+import eatda.domain.cheer.CheerTagName;
+import eatda.domain.store.StoreCategory;
 import eatda.domain.store.StoreSearchResult;
 import eatda.service.cheer.CheerService;
 import eatda.service.image.ImageService;
 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;
@@ -44,8 +48,12 @@ public ResponseEntity<CheerResponse> registerCheer(@RequestPart("request") Cheer
 
     @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/service/cheer/CheerService.java b/src/main/java/eatda/service/cheer/CheerService.java
@@ -4,6 +4,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.ImageKey;
@@ -21,6 +22,8 @@
 import java.util.List;
 import lombok.RequiredArgsConstructor;
 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;
 
@@ -62,8 +65,13 @@ private void validateRegisterCheer(Member member, String storeKakaoId) {
     }
 
     @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/document/cheer/CheerDocumentTest.java b/src/test/java/eatda/document/cheer/CheerDocumentTest.java
@@ -172,7 +172,7 @@ class GetCheers {
                     new CheerPreviewResponse(1L, null, "석관동떡볶이", "성북구", "석관동", "기타", 1L,
                             "너무 매워요! 하지만 맛있어요!", List.of(), 8L, "찬커")
             ));
-            doReturn(responses).when(cheerService).getCheers(page, size);
+            doReturn(responses).when(cheerService).getCheers(any());
 
             var document = document("cheer/get-many", 200)
                     .request(requestDocument)
@@ -191,7 +191,7 @@ class GetCheers {
         void 음식점_검색_실패(BusinessErrorCode errorCode) {
             int page = 0;
             int size = 2;
-            doThrow(new BusinessException(errorCode)).when(cheerService).getCheers(page, size);
+            doThrow(new BusinessException(errorCode)).when(cheerService).getCheers(any());
 
             var document = document("cheer/get-many", errorCode)
                     .request(requestDocument)
diff --git a/src/test/java/eatda/service/cheer/CheerServiceTest.java b/src/test/java/eatda/service/cheer/CheerServiceTest.java
@@ -6,8 +6,10 @@
 
 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.controller.store.SearchDistrict;
 import eatda.domain.ImageKey;
 import eatda.domain.cheer.Cheer;
 import eatda.domain.cheer.CheerTagName;
@@ -180,10 +182,9 @@ 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;
+            CheerSearchParameters parameters = new CheerSearchParameters(0, 2, null, null, null);
 
-            CheersResponse response = cheerService.getCheers(page, size);
+            CheersResponse response = cheerService.getCheers(parameters);
 
             assertAll(
                     () -> assertThat(response.cheers()).hasSize(2),
@@ -201,16 +202,36 @@ 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 = 1;
-            int size = 2;
+            CheerSearchParameters parameters = new CheerSearchParameters(1, 2, null, null, null);
 
-            CheersResponse response = cheerService.getCheers(page, size);
+            CheersResponse response = cheerService.getCheers(parameters);
 
             assertAll(
                     () -> assertThat(response.cheers()).hasSize(1),
                     () -> assertThat(response.cheers().get(0).cheerId()).isEqualTo(cheer1.getId())
             );
         }
+
+        @Test
+        void 요청한_응원을_지역으로_필터링하여_최신순으로_반환한다() {
+            Member member = memberGenerator.generate("123");
+            Store store1 = storeGenerator.generate("123", "서울시 강남구 역삼동 123-45", District.GANGNAM);
+            Store store2 = storeGenerator.generate("456", "서울시 성북구 석관동 123-45", District.SEONGBUK);
+            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));
+            CheerSearchParameters parameters = new CheerSearchParameters(
+                    0, 2, null, null, List.of(SearchDistrict.GANGNAM));
+
+            CheersResponse response = cheerService.getCheers(parameters);
+
+            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
