fix(#97): 당일/주간 학식 조회 idx로 통일화

dldmsql · dldmsql · commit 6f54b30f3d87 · 2024-02-18T12:24:24.000+09:00
diff --git a/src/main/java/everymeal/server/meal/controller/MealController.java b/src/main/java/everymeal/server/meal/controller/MealController.java
@@ -68,31 +68,27 @@ public ApplicationResponse<Boolean> createWeekMeal(
         return ApplicationResponse.create(mealService.createWeekMeal(weekMealRegisterReq));
     }
 
-    @GetMapping("/day/v2")
+    @GetMapping("/day/{universityIdx}")
     @Operation(summary = "당일 식단 조회")
-    public ApplicationResponse<Map<String, Map<String, List<DayMealGetRes>>>> getDayMealV2(
-            @RequestParam @Schema(description = "학교 이름", defaultValue = "명지대학교")
-                    String universityName,
-            @RequestParam @Schema(description = "캠퍼스 이름", defaultValue = "인문캠퍼스") String campusName,
+    public ApplicationResponse<Map<String, Map<String, List<DayMealGetRes>>>> getDayMeal(
+            @PathVariable @Schema(description = "대학교 캠퍼스 idx", defaultValue = "1")
+                    Long universityIdx,
             @RequestParam
                     @Schema(description = "조회하고자 하는 날짜 ( yyyy-MM-dd )", defaultValue = "2023-10-01")
                     String offeredAt) {
-        return ApplicationResponse.ok(
-                mealService.getDayMealListV2(universityName, campusName, offeredAt));
+        return ApplicationResponse.ok(mealService.getDayMealList(universityIdx, offeredAt));
     }
 
-    @GetMapping("/week/v2")
+    @GetMapping("/week/{universityIdx}")
     @Operation(summary = "주간 식단 조회")
-    public ApplicationResponse<List<Map<String, Map<String, List<DayMealGetRes>>>>> getWeekMealV2(
-            @RequestParam @Schema(description = "학교 이름", defaultValue = "명지대학교")
-                    String universityName,
-            @RequestParam @Schema(description = "캠퍼스 이름", defaultValue = "인문캠퍼스") String campusName,
+    public ApplicationResponse<List<Map<String, Map<String, List<DayMealGetRes>>>>> getWeekMeal(
+            @PathVariable @Schema(description = "대학교 캠퍼스 idx", defaultValue = "1")
+                    Long universityIdx,
             @RequestParam
                     @Schema(
                             description = "조회하고자 하는 시작 날짜 ( yyyy-MM-dd )",
                             defaultValue = "2023-10-01")
                     String offeredAt) {
-        return ApplicationResponse.ok(
-                mealService.getWeekMealList(universityName, campusName, offeredAt));
+        return ApplicationResponse.ok(mealService.getWeekMealList(universityIdx, offeredAt));
     }
 }
diff --git a/src/main/java/everymeal/server/meal/repository/MealMapper.java b/src/main/java/everymeal/server/meal/repository/MealMapper.java
@@ -12,9 +12,7 @@
 @Repository
 public interface MealMapper {
     List<Map<String, Object>> findDayList(
-            @Param("offeredAt") String offeredAt,
-            @Param("universityName") String universityName,
-            @Param("campusName") String campusName);
+            @Param("offeredAt") String offeredAt, @Param("universityIdx") Long universityIdx);
 
     List<Meal> findAllByOfferedAtOnDateAndMealType(
             @Param("offeredAt") String offeredAt,
diff --git a/src/main/java/everymeal/server/meal/service/MealCommServiceImpl.java b/src/main/java/everymeal/server/meal/service/MealCommServiceImpl.java
@@ -28,8 +28,7 @@ public void saveAll(List<Meal> mealList) {
         mealDao.saveAll(mealList);
     }
 
-    public List<Map<String, Object>> getDayList(
-            String offeredAt, String universityName, String campusName) {
-        return mealMapper.findDayList(offeredAt, universityName, campusName);
+    public List<Map<String, Object>> getDayList(String offeredAt, Long universityIdx) {
+        return mealMapper.findDayList(offeredAt, universityIdx);
     }
 }
diff --git a/src/main/java/everymeal/server/meal/service/MealService.java b/src/main/java/everymeal/server/meal/service/MealService.java
@@ -14,11 +14,11 @@ public interface MealService {
 
     List<RestaurantListGetRes> getRestaurantList(Long universityIdx);
 
-    Map<String, Map<String, List<DayMealGetRes>>> getDayMealListV2(
-            String universityName, String campusName, String offeredAt);
+    Map<String, Map<String, List<DayMealGetRes>>> getDayMealList(
+            Long universityIdx, String offeredAt);
 
     List<Map<String, Map<String, List<DayMealGetRes>>>> getWeekMealList(
-            String universityName, String campusName, String offeredAt);
+            Long universityIdx, String offeredAt);
 
     Boolean createRestaurant(RestaurantRegisterReq restaurantRegisterReq);
 }
diff --git a/src/main/java/everymeal/server/meal/service/MealServiceImpl.java b/src/main/java/everymeal/server/meal/service/MealServiceImpl.java
@@ -63,15 +63,15 @@ public List<RestaurantListGetRes> getRestaurantList(Long universityIdx) {
     }
 
     @Override
-    public Map<String, Map<String, List<DayMealGetRes>>> getDayMealListV2(
-            String universityName, String campusName, String offeredAt) {
-        var result = mealCommServiceImpl.getDayList(offeredAt, universityName, campusName);
+    public Map<String, Map<String, List<DayMealGetRes>>> getDayMealList(
+            Long universityIdx, String offeredAt) {
+        var result = mealCommServiceImpl.getDayList(offeredAt, universityIdx);
         return Map.of(offeredAt, DayMealGetRes.of(result));
     }
 
     @Override
     public List<Map<String, Map<String, List<DayMealGetRes>>>> getWeekMealList(
-            String universityName, String campusName, String offeredAt) { // 현재 날짜와 시간을 가져옵니다.
+            Long universityIdx, String offeredAt) { // 현재 날짜와 시간을 가져옵니다.
         LocalDate ldOfferedAt = LocalDate.parse(offeredAt);
 
         // 현재 요일을 가져옵니다.
@@ -97,9 +97,7 @@ public List<Map<String, Map<String, List<DayMealGetRes>>>> getWeekMealList(
         List<Map<String, Map<String, List<DayMealGetRes>>>> result = new ArrayList<>();
         for (LocalDate i = monday; i.isBefore(sunday); i = i.plusDays(1)) {
             Map<String, List<DayMealGetRes>> row =
-                    DayMealGetRes.of(
-                            mealCommServiceImpl.getDayList(
-                                    i.toString(), universityName, campusName));
+                    DayMealGetRes.of(mealCommServiceImpl.getDayList(i.toString(), universityIdx));
             result.add(Map.of(i.toString(), row));
         }
         return result;
diff --git a/src/main/resources/mybatis/mappers/MealMapper.xml b/src/main/resources/mybatis/mappers/MealMapper.xml
@@ -19,13 +19,13 @@
       r.name AS restaurantName,
       CONCAT(u.name, ' ', u.campus_name) AS universityName,
       r.review_count AS reviewCount,
-      r.grade AS grade
+      ROUND(r.grade,1) AS grade
     FROM restaurant r
            JOIN (SELECT DISTINCT meal_type AS mealType FROM meal) AS meal_types ON 1=1
            LEFT JOIN meal m ON m.restaurant_idx = r.idx AND m.meal_type = meal_types.mealType AND m.offered_at = DATE(#{offeredAt})
       INNER JOIN university u ON r.university_idx = u.idx AND u.is_deleted = false
     WHERE
-      u.name = #{universityName} AND u.campus_name = #{campusName}
+      u.idx = #{universityIdx}
       AND (
         (meal_types.mealType = 'BREAKFAST' AND r.is_open_breakfast = true) OR
         (meal_types.mealType = 'LUNCH' AND r.is_open_lunch = true) OR
diff --git a/src/test/java/everymeal/server/meal/controller/MealControllerTest.java b/src/test/java/everymeal/server/meal/controller/MealControllerTest.java
@@ -80,15 +80,11 @@ void getRestaurants() throws Exception {
     @Test
     void getDayMeal() throws Exception {
         // given
-        String universityName = "명지대학교";
-        String campusName = "인문캠퍼스";
         String offeredAt = "2023-10-01";
 
         // when-then
         mockMvc.perform(
-                        get("/api/v1/meals/day/v2")
-                                .param("universityName", universityName)
-                                .param("campusName", campusName)
+                        get("/api/v1/meals/day/{universityIdx}", 1)
                                 .param("offeredAt", offeredAt)
                                 .contentType(MediaType.APPLICATION_JSON))
                 .andDo(MockMvcResultHandlers.print())
@@ -99,14 +95,11 @@ void getDayMeal() throws Exception {
     @Test
     void getWeekMeal() throws Exception {
         // given
-        String universityName = "명지대학교";
         String offeredAt = "2023-10-01";
 
         // when-then
         mockMvc.perform(
-                        get("/api/v1/meals/week/v2")
-                                .param("universityName", universityName)
-                                .param("campusName", "인문캠퍼스")
+                        get("/api/v1/meals/week/{universityIdx}", 1)
                                 .param("offeredAt", offeredAt)
                                 .contentType(MediaType.APPLICATION_JSON))
                 .andDo(MockMvcResultHandlers.print())
diff --git a/src/test/java/everymeal/server/meal/service/MealServiceImplTest.java b/src/test/java/everymeal/server/meal/service/MealServiceImplTest.java
@@ -147,9 +147,7 @@ void tearDown() {
 
         // when
         String offeredAt = today.plusDays(1).toString().split("T")[0];
-        var response =
-                mealService.getWeekMealList(
-                        university.getName(), university.getCampusName(), offeredAt);
+        var response = mealService.getWeekMealList(university.getIdx(), offeredAt);
 
         // then
         assertEquals(response.size(), 6);
@@ -165,9 +163,7 @@ void tearDown() {
 
         // when
         String offeredAt = LocalDate.now().toString().split("T")[0];
-        var response =
-                mealService.getDayMealListV2(
-                        getUniversity().getName(), getUniversity().getCampusName(), offeredAt);
+        var response = mealService.getDayMealList(getUniversity().getIdx(), offeredAt);
 
         // then
         assertEquals(response.size(), 1);

Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,7 @@ public void saveAll(List<Meal> mealList) {`
`28`	`28`	`mealDao.saveAll(mealList);`
`29`	`29`	`}`
`30`	`30`
`31`		`- public List<Map<String, Object>> getDayList(`
`32`		`- String offeredAt, String universityName, String campusName) {`
`33`		`- return mealMapper.findDayList(offeredAt, universityName, campusName);`
	`31`	`+ public List<Map<String, Object>> getDayList(String offeredAt, Long universityIdx) {`
	`32`	`+ return mealMapper.findDayList(offeredAt, universityIdx);`
`34`	`33`	`}`
`35`	`34`	`}`