feat: 상점 혜택 상세보기 필드 추가 (#1123)

* feat: 혜택 카테고리별 상점 조회시 혜택 상세보기 추가 * test: 테스트 필드 추가 * fix: 피드백 반영
BCSDLab · Dec 7, 2024 · d874940 · d874940
1 parent f3fecd8
commit d874940
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 22 deletions.
diff --git a/src/main/java/in/koreatech/koin/admin/benefit/controller/AdminBenefitApi.java b/src/main/java/in/koreatech/koin/admin/benefit/controller/AdminBenefitApi.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
-import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoryResponse;
+import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoriesResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminBenefitShopsResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryRequest;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryResponse;
@@ -44,7 +44,7 @@ public interface AdminBenefitApi {
     )
     @Operation(summary = "상점 혜택 카테고리를 모두 조회한다.")
     @GetMapping("/categories")
-    ResponseEntity<AdminBenefitCategoryResponse> getBenefitCategories(
+    ResponseEntity<AdminBenefitCategoriesResponse> getBenefitCategories(
         @Auth(permit = {ADMIN}) Integer adminId
     );
 

diff --git a/src/main/java/in/koreatech/koin/admin/benefit/controller/AdminBenefitController.java b/src/main/java/in/koreatech/koin/admin/benefit/controller/AdminBenefitController.java
@@ -14,7 +14,7 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoryResponse;
+import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoriesResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminBenefitShopsResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryRequest;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryResponse;
@@ -36,10 +36,10 @@ public class AdminBenefitController implements AdminBenefitApi {
     private final AdminBenefitService adminBenefitService;
 
     @GetMapping("/categories")
-    public ResponseEntity<AdminBenefitCategoryResponse> getBenefitCategories(
+    public ResponseEntity<AdminBenefitCategoriesResponse> getBenefitCategories(
         @Auth(permit = {ADMIN}) Integer adminId
     ) {
-        AdminBenefitCategoryResponse response = adminBenefitService.getBenefitCategories();
+        AdminBenefitCategoriesResponse response = adminBenefitService.getBenefitCategories();
         return ResponseEntity.ok(response);
     }
 

diff --git a/...fit/dto/AdminBenefitCategoryResponse.java → ...t/dto/AdminBenefitCategoriesResponse.java b/...fit/dto/AdminBenefitCategoryResponse.java → ...t/dto/AdminBenefitCategoriesResponse.java
@@ -9,13 +9,13 @@
 import io.swagger.v3.oas.annotations.media.Schema;
 
 @JsonNaming(SnakeCaseStrategy.class)
-public record AdminBenefitCategoryResponse(
+public record AdminBenefitCategoriesResponse(
     @Schema(description = "혜택 카테고리 리스트")
     List<InnerBenefitResponse> benefits
 ) {
 
-    public static AdminBenefitCategoryResponse from(List<BenefitCategory> benefitCategories) {
-        return new AdminBenefitCategoryResponse(
+    public static AdminBenefitCategoriesResponse from(List<BenefitCategory> benefitCategories) {
+        return new AdminBenefitCategoriesResponse(
             benefitCategories.stream().map(InnerBenefitResponse::from).toList()
         );
     }

diff --git a/src/main/java/in/koreatech/koin/admin/benefit/service/AdminBenefitService.java b/src/main/java/in/koreatech/koin/admin/benefit/service/AdminBenefitService.java
@@ -7,7 +7,7 @@
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoryResponse;
+import in.koreatech.koin.admin.benefit.dto.AdminBenefitCategoriesResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminBenefitShopsResponse;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryRequest;
 import in.koreatech.koin.admin.benefit.dto.AdminCreateBenefitCategoryResponse;
@@ -36,9 +36,9 @@ public class AdminBenefitService {
     private final AdminBenefitCategoryMapRepository adminBenefitCategoryMapRepository;
     private final AdminShopRepository adminShopRepository;
 
-    public AdminBenefitCategoryResponse getBenefitCategories() {
+    public AdminBenefitCategoriesResponse getBenefitCategories() {
         List<BenefitCategory> categories = adminBenefitCategoryRepository.findAllByOrderByTitleAsc();
-        return AdminBenefitCategoryResponse.from(categories);
+        return AdminBenefitCategoriesResponse.from(categories);
     }
 
     @Transactional

diff --git a/src/main/java/in/koreatech/koin/domain/benefit/dto/BenefitShopsResponse.java b/src/main/java/in/koreatech/koin/domain/benefit/dto/BenefitShopsResponse.java
@@ -7,6 +7,7 @@
 import java.time.LocalTime;
 import java.util.Comparator;
 import java.util.List;
+import java.util.Map;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.databind.annotation.JsonNaming;
@@ -67,7 +68,10 @@ public record InnerShopResponse(
         double averageRate,
 
         @Schema(example = "10", description = "리뷰 개수", requiredMode = REQUIRED)
-        long reviewCount
+        long reviewCount,
+
+        @Schema(example = "콜라 서비스", description = "혜택 설명", requiredMode = NOT_REQUIRED)
+        String benefitDetail
     ) {
 
         public static Comparator<InnerShopResponse> getComparator() {
@@ -80,7 +84,8 @@ public static Comparator<InnerShopResponse> getComparator() {
         public static InnerShopResponse from(
             Shop shop,
             boolean isEvent,
-            boolean isOpen
+            boolean isOpen,
+            String benefitDetail
         ) {
             return new InnerShopResponse(
                 shop.getShopCategories().stream().map(shopCategoryMap ->
@@ -102,7 +107,8 @@ public static InnerShopResponse from(
                     .orElse(0.0) * 10) / 10.0,
                 shop.getReviews().stream()
                     .filter(review -> !review.isDeleted())
-                    .count()
+                    .count(),
+                benefitDetail
             );
         }
 

diff --git a/src/main/java/in/koreatech/koin/domain/benefit/repository/BenefitCategoryMapRepository.java b/src/main/java/in/koreatech/koin/domain/benefit/repository/BenefitCategoryMapRepository.java
@@ -9,7 +9,7 @@
 
 public interface BenefitCategoryMapRepository extends Repository<BenefitCategoryMap, Integer> {
 
-    List<BenefitCategoryMap> findAllByBenefitCategoryId(Integer benefitCategoryId);
+    List<BenefitCategoryMap> findByBenefitCategoryId(Integer benefitCategoryId);
 
     @Query("""
             SELECT bcm FROM BenefitCategoryMap bcm

diff --git a/src/main/java/in/koreatech/koin/domain/benefit/service/ShopBenefitService.java b/src/main/java/in/koreatech/koin/domain/benefit/service/ShopBenefitService.java
@@ -35,18 +35,24 @@ public BenefitCategoryResponse getBenefitCategories() {
     }
 
     public BenefitShopsResponse getBenefitShops(Integer benefitId) {
-        List<BenefitCategoryMap> benefitCategoryMaps = benefitCategoryMapRepository
-            .findAllByBenefitCategoryId(benefitId);
+        List<BenefitCategoryMap> benefitCategoryMaps = benefitCategoryMapRepository.findByBenefitCategoryId(benefitId);
         LocalDateTime now = LocalDateTime.now(clock);
+
         List<InnerShopResponse> innerShopResponses = benefitCategoryMaps.stream()
             .map(benefitCategoryMap -> {
                 Shop shop = benefitCategoryMap.getShop();
+                String benefitDetail = benefitCategoryMap.getDetail();
                 boolean isDurationEvent = eventArticleRepository.isDurationEvent(shop.getId(), now.toLocalDate());
-                return InnerShopResponse.from(shop, isDurationEvent, shop.isOpen(now));
+                return InnerShopResponse.from(
+                    shop,
+                    isDurationEvent,
+                    shop.isOpen(now),
+                    benefitDetail
+                );
             })
             .sorted(InnerShopResponse.getComparator())
             .toList();
-        BenefitShopsResponse shopsResponse = BenefitShopsResponse.from(innerShopResponses);
-        return shopsResponse;
+
+        return BenefitShopsResponse.from(innerShopResponses);
     }
 }
diff --git a/src/test/java/in/koreatech/koin/acceptance/BenefitApiTest.java b/src/test/java/in/koreatech/koin/acceptance/BenefitApiTest.java
@@ -95,7 +95,7 @@ void setup() {
 
         성빈_학생 = userFixture.성빈_학생();
 
-        benefitCategoryMapFixture.혜택_추가(김밥천국, 배달비_무료);
+        benefitCategoryMapFixture.설명이_포함된_혜택_추가(김밥천국, 배달비_무료, "무료");
         benefitCategoryMapFixture.혜택_추가(마슬랜, 배달비_무료);
         benefitCategoryMapFixture.혜택_추가(영업중인_티바, 배달비_무료);
         benefitCategoryMapFixture.혜택_추가(영업중이_아닌_신전_떡볶이, 배달비_무료);
@@ -183,7 +183,8 @@ void setup() {
                           "is_event": false,
                           "is_open": true,
                           "average_rate": 5.0,
-                          "review_count": 1
+                          "review_count": 1,
+                          "benefit_detail": "무료"
                         },
                         {
                           "category_ids": [],