가장 많이 선택한 메뉴 10위까지 응답, 메뉴를 판매하는 식당 목록 응답 EndPoint 수정

livable-final · Oct 2, 2023 · 0bb8cd9 · 0bb8cd9
1 parent 6fa8214
commit 0bb8cd9
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 12 deletions.
diff --git a/src/main/java/com/livable/server/menu/controller/MenuController.java b/src/main/java/com/livable/server/menu/controller/MenuController.java
@@ -19,9 +19,9 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 @RequiredArgsConstructor
@@ -40,8 +40,8 @@ public ResponseEntity<Success<List<RouletteMenuDTO>>> getRouletteMenus(@LoginAct
         return ApiResponse.success(rouletteMenuDTOs, HttpStatus.OK);
     }
 
-    @GetMapping("/api/menus/buildings/{buildingId}")
-    public ResponseEntity<Success<List<MostSelectedMenuDTO>>> getMostSelectedMenu(@PathVariable("buildingId") Long buildingId, @LoginActor Actor actor) {
+    @GetMapping("/api/menus/choices")
+    public ResponseEntity<Success<List<MostSelectedMenuDTO>>> getMostSelectedMenu(@RequestParam("buildingId") Long buildingId, @LoginActor Actor actor) {
 
         JwtTokenProvider.checkMemberToken(actor);
 

diff --git a/src/main/java/com/livable/server/restaurant/controller/RestaurantController.java b/src/main/java/com/livable/server/restaurant/controller/RestaurantController.java
@@ -9,7 +9,7 @@
 import com.livable.server.restaurant.dto.RestaurantResponse;
 import com.livable.server.restaurant.dto.RestaurantResponse.RestaurantsByMenuDto;
 import com.livable.server.restaurant.service.RestaurantService;
-import lombok.Getter;
+import java.util.List;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
@@ -18,9 +18,6 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.bind.annotation.*;
-
-import java.util.List;
 
 @RequiredArgsConstructor
 @RestController
@@ -60,9 +57,9 @@ public ResponseEntity<ApiResponse.Success<List<RestaurantResponse.listMenuDTO>>>
         return ApiResponse.success(result, HttpStatus.OK);
     }
 
-    @GetMapping("/restaurants/menus/{menuId}")
+    @GetMapping("/restaurants")
     public ResponseEntity<Success<List<RestaurantsByMenuDto>>> getRestaurantsByMenu(
-            @PathVariable("menuId") Long menuId, @LoginActor Actor actor
+            @RequestParam("menuId") Long menuId, @LoginActor Actor actor
             ) {
 
         JwtTokenProvider.checkMemberToken(actor);

diff --git a/src/test/java/com/livable/server/menu/controller/MenuControllerTest.java b/src/test/java/com/livable/server/menu/controller/MenuControllerTest.java
@@ -108,7 +108,7 @@ void getMostSelectedMenusSuccess() throws Exception {
 
 		//when & then
 		mockMvc.perform(
-			  get("/api/menus/buildings/{buildingId}", 1)
+			  get("/api/menus/choices?buildingId=1")
 					.header("Authorization", "Bearer " + token)
 					.contentType(MediaType.APPLICATION_JSON))
 			.andExpect(status().isOk());

diff --git a/src/test/java/com/livable/server/restaurant/controller/RestaurantControllerTest.java b/src/test/java/com/livable/server/restaurant/controller/RestaurantControllerTest.java
@@ -91,7 +91,7 @@ void findRestaurantByMenuSuccess() throws Exception {
             .willReturn(result);
 
         // when & then
-        mockMvc.perform(get("/api/restaurants/menus/{menuId}", 1)
+        mockMvc.perform(get("/api/restaurants?menuId=1")
             .header("Authorization", "Bearer " + token)
         )
             .andExpect(status().isOk())
@@ -112,7 +112,7 @@ void findRestaurantByMenuFailed() throws Exception {
                 new GlobalRuntimeException(RestaurantErrorCode.NOT_FOUND_RESTAURANT_BY_MENU));
 
         // when & then
-        mockMvc.perform(get("/api/restaurants/menus/{menuId}", 1)
+        mockMvc.perform(get("/api/restaurants?menuId=1")
                 .header("Authorization", "Bearer " + token)
             )
             .andExpect(status().isBadRequest())