Merge branch 'feature/store-get-detail' of github.com:everymeals/Ever…

…yMeal_Server into feature/store-get-detail
everymeals · Nov 22, 2023 · a67ea40 · a67ea40
2 parents f5df662 + e00f999
commit a67ea40
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/src/main/java/everymeal/server/store/controller/StoreController.java b/src/main/java/everymeal/server/store/controller/StoreController.java
@@ -65,11 +65,18 @@ public ApplicationResponse<Page<StoreGetRes>> getStores(
                                 SORT_RECENT
                             })
                     String order,
-            @RequestParam(value = "group")
+            @RequestParam(value = "group", required = false, defaultValue = "all")
                     @Schema(
                             title = "그룹",
                             description = "그룹",
-                            allowableValues = {"etc", "recommend", "restaurant", "cafe", "bar"})
+                            allowableValues = {
+                                "all",
+                                "etc",
+                                "recommend",
+                                "restaurant",
+                                "cafe",
+                                "bar"
+                            })
                     String group,
             @Parameter(hidden = true) @AuthUser AuthenticatedUser authenticatedUser,
             @RequestParam(value = "grade", required = false)

diff --git a/src/main/java/everymeal/server/store/entity/Store.java b/src/main/java/everymeal/server/store/entity/Store.java
@@ -34,8 +34,11 @@ public class Store extends BaseEntity {
 
     private String name;
     private String address;
+    // 카카오에서 제공하는 카테고리
     private String categoryGroup;
+    // 조회할때 쓰인 음식점, 카페에 대한 카테고리
     private String category;
+    // 조회 기반에 따라 세분화된 카테고리
     private String categoryDetail;
     private String kakaoId;
     private String phone;

diff --git a/src/main/resources/mybatis/mappers/StoreMapper.xml b/src/main/resources/mybatis/mappers/StoreMapper.xml
@@ -40,7 +40,9 @@
         WHEN #{group} = 'restaurant' THEN s.category_detail IN ('한식', '중식', '일식', '양식')
         WHEN #{group} = 'cafe' THEN s.category_detail IN ('카페', '디저트')
         WHEN #{group} = 'bar' THEN s.category_detail = '술집'
-        ELSE s.category_detail IN ('기타', '패스트푸드', '분식')
+        WHEN #{group} = 'etc' THEN s.category_detail IN ('기타', '패스트푸드', '분식')
+        WHEN #{group} = 'all' THEN 1=1
+        ELSE s.category_detail IN ('한식', '중식', '일식', '양식', '카페', '디저트', '술집', '기타', '패스트푸드', '분식')
         END
       )
       AND (
@@ -106,7 +108,8 @@
         WHEN #{group} = 'restaurant' THEN s.category_detail IN ('한식', '중식', '일식', '양식')
         WHEN #{group} = 'cafe' THEN s.category_detail IN ('카페', '디저트')
         WHEN #{group} = 'bar' THEN s.category_detail = '술집'
-        ELSE s.category_detail IN ('기타', '패스트푸드', '분식')
+        WHEN #{group} = 'all' THEN 1=1
+        ELSE s.category_detail IN ('한식', '중식', '일식', '양식', '카페', '디저트', '술집', '기타', '패스트푸드', '분식')
         END
       )
       AND (