From 36b9100fe597d522f6c09e329efa4833225d84bf Mon Sep 17 00:00:00 2001 From: dldmsql Date: Sun, 18 Feb 2024 12:10:48 +0900 Subject: [PATCH 1/3] =?UTF-8?q?fix(#97):=20=ED=95=99=EC=83=9D=EC=8B=9D?= =?UTF-8?q?=EB=8B=B9=20=EB=93=B1=EB=A1=9D/=EC=A1=B0=ED=9A=8C=20idx?= =?UTF-8?q?=EB=A1=9C=20=ED=86=B5=EC=9D=BC=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meal/controller/MealController.java | 14 ++++---- .../dto/request/RestaurantRegisterReq.java | 6 ++-- .../server/meal/entity/Restaurant.java | 2 +- .../server/meal/service/MealService.java | 2 +- .../server/meal/service/MealServiceImpl.java | 5 ++- .../meal/service/RestaurantService.java | 2 +- .../meal/service/RestaurantServiceImpl.java | 8 ++--- .../repository/UniversityRepository.java | 2 ++ .../university/service/UniversityService.java | 2 +- .../service/UniversityServiceImpl.java | 6 ++-- .../java/everymeal/server/meal/MealData.java | 16 ++++++++-- .../meal/controller/MealControllerTest.java | 10 ++---- .../meal/service/MealServiceImplTest.java | 32 ++++--------------- 13 files changed, 44 insertions(+), 63 deletions(-) diff --git a/src/main/java/everymeal/server/meal/controller/MealController.java b/src/main/java/everymeal/server/meal/controller/MealController.java index 784a32d..194bf7e 100644 --- a/src/main/java/everymeal/server/meal/controller/MealController.java +++ b/src/main/java/everymeal/server/meal/controller/MealController.java @@ -15,6 +15,7 @@ import java.util.Map; import lombok.RequiredArgsConstructor; 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.RequestMapping; @@ -46,16 +47,13 @@ public ApplicationResponse createRestaurant( * 학생식당 조회 API * ============================================================================================ */ - @GetMapping("/restaurant") + @GetMapping("/restaurant/{universityIdx}") @Operation(summary = "학교별 학생 식당 목록 조회") public ApplicationResponse> getRestaurants( - @Schema(title = "대학 이름", defaultValue = "명지대학교", example = "명지대학교") - @RequestParam(value = "universityName") - String universityName, - @Schema(title = "캠퍼스 이름", defaultValue = "인문캠퍼스", example = "인문캠퍼스") - @RequestParam(value = "campusName") - String campusName) { - return ApplicationResponse.ok(mealService.getRestaurantList(universityName, campusName)); + @Schema(title = "대학 캠퍼스 IDX", defaultValue = "1", example = "1") + @PathVariable(value = "universityIdx") + Long universityIdx) { + return ApplicationResponse.ok(mealService.getRestaurantList(universityIdx)); } /** diff --git a/src/main/java/everymeal/server/meal/controller/dto/request/RestaurantRegisterReq.java b/src/main/java/everymeal/server/meal/controller/dto/request/RestaurantRegisterReq.java index 632116b..af5de4f 100644 --- a/src/main/java/everymeal/server/meal/controller/dto/request/RestaurantRegisterReq.java +++ b/src/main/java/everymeal/server/meal/controller/dto/request/RestaurantRegisterReq.java @@ -8,10 +8,8 @@ import java.time.LocalTime; public record RestaurantRegisterReq( - @Schema(title = "대학 이름", description = "학교 한글명", defaultValue = "명지대학교") @NotBlank - String universityName, - @Schema(title = "캠퍼스 이름", description = "학교 캠퍼스명", defaultValue = "인문캠퍼스") @NotBlank - String campusName, + @Schema(title = "대학 캠퍼스 아이디", description = "대학 캠퍼스 아이디", defaultValue = "1") + Long universityIdx, @Schema( title = "학교 주소", description = "시/구/동 도로명 주소 모두 기입", diff --git a/src/main/java/everymeal/server/meal/entity/Restaurant.java b/src/main/java/everymeal/server/meal/entity/Restaurant.java index 354b5d2..afa4dfc 100644 --- a/src/main/java/everymeal/server/meal/entity/Restaurant.java +++ b/src/main/java/everymeal/server/meal/entity/Restaurant.java @@ -56,7 +56,7 @@ public class Restaurant { @Builder public Restaurant(RestaurantRegisterReq restaurantRegisterReq, University university) { - this.name = restaurantRegisterReq.campusName(); + this.name = restaurantRegisterReq.restaurantName(); this.address = restaurantRegisterReq.address(); this.university = university; this.isDeleted = Boolean.TRUE; diff --git a/src/main/java/everymeal/server/meal/service/MealService.java b/src/main/java/everymeal/server/meal/service/MealService.java index cf78208..5b055aa 100644 --- a/src/main/java/everymeal/server/meal/service/MealService.java +++ b/src/main/java/everymeal/server/meal/service/MealService.java @@ -12,7 +12,7 @@ public interface MealService { Boolean createWeekMeal(WeekMealRegisterReq weekMealRegisterReq); - List getRestaurantList(String universityName, String campusName); + List getRestaurantList(Long universityIdx); Map>> getDayMealListV2( String universityName, String campusName, String offeredAt); diff --git a/src/main/java/everymeal/server/meal/service/MealServiceImpl.java b/src/main/java/everymeal/server/meal/service/MealServiceImpl.java index d069e23..1b858f4 100644 --- a/src/main/java/everymeal/server/meal/service/MealServiceImpl.java +++ b/src/main/java/everymeal/server/meal/service/MealServiceImpl.java @@ -55,11 +55,10 @@ public Boolean createWeekMeal(WeekMealRegisterReq request) { } @Override - public List getRestaurantList(String universityName, String campusName) { + public List getRestaurantList(Long universityIdx) { // 학교와 식당 폐업 여부를 키로 조회 List restaurants = - restaurantServiceImpl.getAllByUniversityAndIsDeletedFalse( - universityName, campusName); + restaurantServiceImpl.getAllByUniversityAndIsDeletedFalse(universityIdx); return RestaurantListGetRes.of(restaurants); } diff --git a/src/main/java/everymeal/server/meal/service/RestaurantService.java b/src/main/java/everymeal/server/meal/service/RestaurantService.java index 232463d..cc35e0e 100644 --- a/src/main/java/everymeal/server/meal/service/RestaurantService.java +++ b/src/main/java/everymeal/server/meal/service/RestaurantService.java @@ -11,5 +11,5 @@ public interface RestaurantService { Boolean createRestaurant(RestaurantRegisterReq restaurantRegisterReq); - List getAllByUniversityAndIsDeletedFalse(String universityName, String campusName); + List getAllByUniversityAndIsDeletedFalse(Long universityIdx); } diff --git a/src/main/java/everymeal/server/meal/service/RestaurantServiceImpl.java b/src/main/java/everymeal/server/meal/service/RestaurantServiceImpl.java index 9776114..0bcce81 100644 --- a/src/main/java/everymeal/server/meal/service/RestaurantServiceImpl.java +++ b/src/main/java/everymeal/server/meal/service/RestaurantServiceImpl.java @@ -32,8 +32,7 @@ public Restaurant getRestaurant(Long restaurantIdx) { public Boolean createRestaurant(RestaurantRegisterReq restaurantRegisterReq) { // 학교 조회 University university = - universityServiceImpl.getUniversity( - restaurantRegisterReq.universityName(), restaurantRegisterReq.campusName()); + universityServiceImpl.getUniversity(restaurantRegisterReq.universityIdx()); // 식당 등록 Restaurant restaurant = Restaurant.builder() @@ -44,10 +43,9 @@ public Boolean createRestaurant(RestaurantRegisterReq restaurantRegisterReq) { } @Override - public List getAllByUniversityAndIsDeletedFalse( - String universityName, String campusName) { + public List getAllByUniversityAndIsDeletedFalse(Long universityIdx) { // 학교 등록 여부 판단 - University university = universityServiceImpl.getUniversity(universityName, campusName); + University university = universityServiceImpl.getUniversity(universityIdx); return restaurantCommServiceImpl.getAllByUniversityAndIsDeletedFalse(university); } diff --git a/src/main/java/everymeal/server/university/repository/UniversityRepository.java b/src/main/java/everymeal/server/university/repository/UniversityRepository.java index c310881..0896ea2 100644 --- a/src/main/java/everymeal/server/university/repository/UniversityRepository.java +++ b/src/main/java/everymeal/server/university/repository/UniversityRepository.java @@ -12,5 +12,7 @@ public interface UniversityRepository extends JpaRepository { List findByNameAndCampusNameAndIsDeletedFalse( String universityName, String campusName); + List findByIdxAndIsDeletedFalse(Long idx); + List findAllByIsDeletedFalse(); } diff --git a/src/main/java/everymeal/server/university/service/UniversityService.java b/src/main/java/everymeal/server/university/service/UniversityService.java index 2971210..46ec7a2 100644 --- a/src/main/java/everymeal/server/university/service/UniversityService.java +++ b/src/main/java/everymeal/server/university/service/UniversityService.java @@ -11,5 +11,5 @@ public interface UniversityService { List getUniversities(); - University getUniversity(String universityName, String campusName); + University getUniversity(Long universityIdx); } diff --git a/src/main/java/everymeal/server/university/service/UniversityServiceImpl.java b/src/main/java/everymeal/server/university/service/UniversityServiceImpl.java index be5e404..abdda46 100644 --- a/src/main/java/everymeal/server/university/service/UniversityServiceImpl.java +++ b/src/main/java/everymeal/server/university/service/UniversityServiceImpl.java @@ -33,10 +33,8 @@ public List getUniversities() { return UniversityListGetRes.of(universities); } - public University getUniversity(String universityName, String campusName) { - return universityRepository - .findByNameAndCampusNameAndIsDeletedFalse(universityName, campusName) - .stream() + public University getUniversity(Long universityIdx) { + return universityRepository.findByIdxAndIsDeletedFalse(universityIdx).stream() .findFirst() .orElseThrow(() -> new ApplicationException(ExceptionList.UNIVERSITY_NOT_FOUND)); } diff --git a/src/test/java/everymeal/server/meal/MealData.java b/src/test/java/everymeal/server/meal/MealData.java index 6ff4aa5..965e85f 100644 --- a/src/test/java/everymeal/server/meal/MealData.java +++ b/src/test/java/everymeal/server/meal/MealData.java @@ -70,8 +70,20 @@ public static MealRegisterReq getMealRegisterReq(int i) { public static RestaurantRegisterReq getRestaurantRegisterReq() { return new RestaurantRegisterReq( - "명지대학교", - "인문캠퍼스", + 1L, + "서울시 서대문구 거북골로 34", + "MCC 식당", + LocalTime.of(8, 0), + LocalTime.of(10, 30), + LocalTime.of(11, 0), + LocalTime.of(14, 30), + LocalTime.of(17, 0), + LocalTime.of(18, 30)); + } + + public static RestaurantRegisterReq getRestaurantRegisterReq(Long universityIdx) { + return new RestaurantRegisterReq( + universityIdx, "서울시 서대문구 거북골로 34", "MCC 식당", LocalTime.of(8, 0), diff --git a/src/test/java/everymeal/server/meal/controller/MealControllerTest.java b/src/test/java/everymeal/server/meal/controller/MealControllerTest.java index 05b0270..0ac44a9 100644 --- a/src/test/java/everymeal/server/meal/controller/MealControllerTest.java +++ b/src/test/java/everymeal/server/meal/controller/MealControllerTest.java @@ -68,14 +68,9 @@ void createRestaurant() throws Exception { @Test void getRestaurants() throws Exception { // given - String universityName = "명지대학교"; - String campusName = "인문캠퍼스"; - // when-then mockMvc.perform( - get("/api/v1/meals/restaurant") - .param("universityName", universityName) - .param("campusName", campusName) + get("/api/v1/meals/restaurant/{universityIdx}", 1) .contentType(MediaType.APPLICATION_JSON)) .andDo(MockMvcResultHandlers.print()) .andExpect(status().isOk()); @@ -120,8 +115,7 @@ void getWeekMeal() throws Exception { private RestaurantRegisterReq getRestaurantRegisterReq() { return new RestaurantRegisterReq( - "명지대학교", - "인문캠퍼스", + 1L, "서울시 서대문구 남가좌동 거북골로 34", "MCC 식당", LocalTime.of(8, 0), diff --git a/src/test/java/everymeal/server/meal/service/MealServiceImplTest.java b/src/test/java/everymeal/server/meal/service/MealServiceImplTest.java index acf74bc..1218d97 100644 --- a/src/test/java/everymeal/server/meal/service/MealServiceImplTest.java +++ b/src/test/java/everymeal/server/meal/service/MealServiceImplTest.java @@ -60,11 +60,10 @@ void tearDown() { @Test void 학생식당_등록() throws Exception { // given - RestaurantRegisterReq req = getRestaurantRegisterReq(); + University university = universityRepository.save(getUniversity()); + RestaurantRegisterReq req = getRestaurantRegisterReq(university.getIdx()); // when - University university = - universityRepository.save(getUniversity(req.universityName(), req.campusName())); Boolean response = restaurantService.createRestaurant(req); // then @@ -76,11 +75,7 @@ void tearDown() { void 주간식단_등록() throws Exception { // given RestaurantRegisterReq restaurantRegisterReq = getRestaurantRegisterReq(); - University university = - universityRepository.save( - getUniversity( - restaurantRegisterReq.universityName(), - restaurantRegisterReq.campusName())); + University university = universityRepository.save(getUniversity()); Restaurant restaurant = restaurantRepository.save(getRestaurant(university, restaurantRegisterReq)); @@ -111,11 +106,7 @@ void tearDown() { void 주간식단_조회() throws Exception { // given RestaurantRegisterReq restaurantRegisterReq = getRestaurantRegisterReq(); - University university = - universityRepository.save( - getUniversity( - restaurantRegisterReq.universityName(), - restaurantRegisterReq.campusName())); + University university = universityRepository.save(getUniversity()); Restaurant restaurant = restaurantRepository.save(getRestaurant(university, restaurantRegisterReq)); @@ -191,12 +182,8 @@ void tearDown() { Restaurant restaurant = restaurantRepository.save(getRestaurant(university, restaurantRegisterReq)); - String universityName = restaurantRegisterReq.universityName(); - String campusName = restaurantRegisterReq.campusName(); - // when - List response = - mealService.getRestaurantList(universityName, campusName); + List response = mealService.getRestaurantList(university.getIdx()); var result = restaurantRepository.findAllByUniversityAndIsDeletedFalse(university); // then assertEquals(response.size(), result.size()); @@ -208,8 +195,7 @@ void createRestaurantWhenUniversityIsNotFound() throws Exception { // given RestaurantRegisterReq invalidReq = new RestaurantRegisterReq( - "서울대학교", - "서울캠퍼스", + 99L, "서울시 관악구 관악로", "유령식당", LocalTime.of(8, 0), @@ -260,11 +246,7 @@ void createRestaurantWhenUniversityIsNotFound() throws Exception { void 등록되어_있는_식단_데이터_덮어쓰기() throws Exception { // given RestaurantRegisterReq restaurantRegisterReq = getRestaurantRegisterReq(); - University university = - universityRepository.save( - getUniversity( - restaurantRegisterReq.universityName(), - restaurantRegisterReq.campusName())); + University university = universityRepository.save(getUniversity()); Restaurant restaurant = restaurantRepository.save(getRestaurant(university, restaurantRegisterReq)); From 6f54b30f3d87a3991b844c5040dba6e09681cb26 Mon Sep 17 00:00:00 2001 From: dldmsql Date: Sun, 18 Feb 2024 12:24:24 +0900 Subject: [PATCH 2/3] =?UTF-8?q?fix(#97):=20=EB=8B=B9=EC=9D=BC/=EC=A3=BC?= =?UTF-8?q?=EA=B0=84=20=ED=95=99=EC=8B=9D=20=EC=A1=B0=ED=9A=8C=20idx?= =?UTF-8?q?=EB=A1=9C=20=ED=86=B5=EC=9D=BC=ED=99=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meal/controller/MealController.java | 24 ++++++++----------- .../server/meal/repository/MealMapper.java | 4 +--- .../meal/service/MealCommServiceImpl.java | 5 ++-- .../server/meal/service/MealService.java | 6 ++--- .../server/meal/service/MealServiceImpl.java | 12 ++++------ .../resources/mybatis/mappers/MealMapper.xml | 4 ++-- .../meal/controller/MealControllerTest.java | 11 ++------- .../meal/service/MealServiceImplTest.java | 8 ++----- 8 files changed, 27 insertions(+), 47 deletions(-) diff --git a/src/main/java/everymeal/server/meal/controller/MealController.java b/src/main/java/everymeal/server/meal/controller/MealController.java index 194bf7e..a2ce725 100644 --- 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 createWeekMeal( return ApplicationResponse.create(mealService.createWeekMeal(weekMealRegisterReq)); } - @GetMapping("/day/v2") + @GetMapping("/day/{universityIdx}") @Operation(summary = "당일 식단 조회") - public ApplicationResponse>>> getDayMealV2( - @RequestParam @Schema(description = "학교 이름", defaultValue = "명지대학교") - String universityName, - @RequestParam @Schema(description = "캠퍼스 이름", defaultValue = "인문캠퍼스") String campusName, + public ApplicationResponse>>> 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>>>> getWeekMealV2( - @RequestParam @Schema(description = "학교 이름", defaultValue = "명지대학교") - String universityName, - @RequestParam @Schema(description = "캠퍼스 이름", defaultValue = "인문캠퍼스") String campusName, + public ApplicationResponse>>>> 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 index b05f245..db24c51 100644 --- 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> findDayList( - @Param("offeredAt") String offeredAt, - @Param("universityName") String universityName, - @Param("campusName") String campusName); + @Param("offeredAt") String offeredAt, @Param("universityIdx") Long universityIdx); List 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 index 463e1ae..7138568 100644 --- 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 mealList) { mealDao.saveAll(mealList); } - public List> getDayList( - String offeredAt, String universityName, String campusName) { - return mealMapper.findDayList(offeredAt, universityName, campusName); + public List> 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 index 5b055aa..b108c75 100644 --- 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 getRestaurantList(Long universityIdx); - Map>> getDayMealListV2( - String universityName, String campusName, String offeredAt); + Map>> getDayMealList( + Long universityIdx, String offeredAt); List>>> 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 index 1b858f4..45aca3c 100644 --- 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 getRestaurantList(Long universityIdx) { } @Override - public Map>> getDayMealListV2( - String universityName, String campusName, String offeredAt) { - var result = mealCommServiceImpl.getDayList(offeredAt, universityName, campusName); + public Map>> getDayMealList( + Long universityIdx, String offeredAt) { + var result = mealCommServiceImpl.getDayList(offeredAt, universityIdx); return Map.of(offeredAt, DayMealGetRes.of(result)); } @Override public List>>> getWeekMealList( - String universityName, String campusName, String offeredAt) { // 현재 날짜와 시간을 가져옵니다. + Long universityIdx, String offeredAt) { // 현재 날짜와 시간을 가져옵니다. LocalDate ldOfferedAt = LocalDate.parse(offeredAt); // 현재 요일을 가져옵니다. @@ -97,9 +97,7 @@ public List>>> getWeekMealList( List>>> result = new ArrayList<>(); for (LocalDate i = monday; i.isBefore(sunday); i = i.plusDays(1)) { Map> 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 index 7049077..13bb18d 100644 --- 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 index 0ac44a9..3645495 100644 --- 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 index 1218d97..2312d37 100644 --- 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); From 12cb46efe7753f6f33ac8fd1f9c50b57f9474ca9 Mon Sep 17 00:00:00 2001 From: dldmsql Date: Sun, 18 Feb 2024 14:51:55 +0900 Subject: [PATCH 3/3] =?UTF-8?q?fix(#97):=20universityIdx=20->=20campusIdx?= =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../meal/controller/MealController.java | 22 +++++++++---------- .../dto/request/RestaurantRegisterReq.java | 2 +- .../meal/service/RestaurantServiceImpl.java | 2 +- .../meal/controller/MealControllerTest.java | 6 ++--- 4 files changed, 15 insertions(+), 17 deletions(-) diff --git a/src/main/java/everymeal/server/meal/controller/MealController.java b/src/main/java/everymeal/server/meal/controller/MealController.java index a2ce725..63fa97d 100644 --- a/src/main/java/everymeal/server/meal/controller/MealController.java +++ b/src/main/java/everymeal/server/meal/controller/MealController.java @@ -47,13 +47,13 @@ public ApplicationResponse createRestaurant( * 학생식당 조회 API * ============================================================================================ */ - @GetMapping("/restaurant/{universityIdx}") + @GetMapping("/restaurant/{campusIdx}") @Operation(summary = "학교별 학생 식당 목록 조회") public ApplicationResponse> getRestaurants( @Schema(title = "대학 캠퍼스 IDX", defaultValue = "1", example = "1") - @PathVariable(value = "universityIdx") - Long universityIdx) { - return ApplicationResponse.ok(mealService.getRestaurantList(universityIdx)); + @PathVariable(value = "campusIdx") + Long campusIdx) { + return ApplicationResponse.ok(mealService.getRestaurantList(campusIdx)); } /** @@ -68,27 +68,25 @@ public ApplicationResponse createWeekMeal( return ApplicationResponse.create(mealService.createWeekMeal(weekMealRegisterReq)); } - @GetMapping("/day/{universityIdx}") + @GetMapping("/day/{campusIdx}") @Operation(summary = "당일 식단 조회") public ApplicationResponse>>> getDayMeal( - @PathVariable @Schema(description = "대학교 캠퍼스 idx", defaultValue = "1") - Long universityIdx, + @PathVariable @Schema(description = "대학교 캠퍼스 idx", defaultValue = "1") Long campusIdx, @RequestParam @Schema(description = "조회하고자 하는 날짜 ( yyyy-MM-dd )", defaultValue = "2023-10-01") String offeredAt) { - return ApplicationResponse.ok(mealService.getDayMealList(universityIdx, offeredAt)); + return ApplicationResponse.ok(mealService.getDayMealList(campusIdx, offeredAt)); } - @GetMapping("/week/{universityIdx}") + @GetMapping("/week/{campusIdx}") @Operation(summary = "주간 식단 조회") public ApplicationResponse>>>> getWeekMeal( - @PathVariable @Schema(description = "대학교 캠퍼스 idx", defaultValue = "1") - Long universityIdx, + @PathVariable @Schema(description = "대학교 캠퍼스 idx", defaultValue = "1") Long campusIdx, @RequestParam @Schema( description = "조회하고자 하는 시작 날짜 ( yyyy-MM-dd )", defaultValue = "2023-10-01") String offeredAt) { - return ApplicationResponse.ok(mealService.getWeekMealList(universityIdx, offeredAt)); + return ApplicationResponse.ok(mealService.getWeekMealList(campusIdx, offeredAt)); } } diff --git a/src/main/java/everymeal/server/meal/controller/dto/request/RestaurantRegisterReq.java b/src/main/java/everymeal/server/meal/controller/dto/request/RestaurantRegisterReq.java index af5de4f..4c5812d 100644 --- a/src/main/java/everymeal/server/meal/controller/dto/request/RestaurantRegisterReq.java +++ b/src/main/java/everymeal/server/meal/controller/dto/request/RestaurantRegisterReq.java @@ -9,7 +9,7 @@ public record RestaurantRegisterReq( @Schema(title = "대학 캠퍼스 아이디", description = "대학 캠퍼스 아이디", defaultValue = "1") - Long universityIdx, + Long campusIdx, @Schema( title = "학교 주소", description = "시/구/동 도로명 주소 모두 기입", diff --git a/src/main/java/everymeal/server/meal/service/RestaurantServiceImpl.java b/src/main/java/everymeal/server/meal/service/RestaurantServiceImpl.java index 0bcce81..89ef835 100644 --- a/src/main/java/everymeal/server/meal/service/RestaurantServiceImpl.java +++ b/src/main/java/everymeal/server/meal/service/RestaurantServiceImpl.java @@ -32,7 +32,7 @@ public Restaurant getRestaurant(Long restaurantIdx) { public Boolean createRestaurant(RestaurantRegisterReq restaurantRegisterReq) { // 학교 조회 University university = - universityServiceImpl.getUniversity(restaurantRegisterReq.universityIdx()); + universityServiceImpl.getUniversity(restaurantRegisterReq.campusIdx()); // 식당 등록 Restaurant restaurant = Restaurant.builder() diff --git a/src/test/java/everymeal/server/meal/controller/MealControllerTest.java b/src/test/java/everymeal/server/meal/controller/MealControllerTest.java index 3645495..d08084d 100644 --- a/src/test/java/everymeal/server/meal/controller/MealControllerTest.java +++ b/src/test/java/everymeal/server/meal/controller/MealControllerTest.java @@ -70,7 +70,7 @@ void getRestaurants() throws Exception { // given // when-then mockMvc.perform( - get("/api/v1/meals/restaurant/{universityIdx}", 1) + get("/api/v1/meals/restaurant/{campusIdx}", 1) .contentType(MediaType.APPLICATION_JSON)) .andDo(MockMvcResultHandlers.print()) .andExpect(status().isOk()); @@ -84,7 +84,7 @@ void getDayMeal() throws Exception { // when-then mockMvc.perform( - get("/api/v1/meals/day/{universityIdx}", 1) + get("/api/v1/meals/day/{campusIdx}", 1) .param("offeredAt", offeredAt) .contentType(MediaType.APPLICATION_JSON)) .andDo(MockMvcResultHandlers.print()) @@ -99,7 +99,7 @@ void getWeekMeal() throws Exception { // when-then mockMvc.perform( - get("/api/v1/meals/week/{universityIdx}", 1) + get("/api/v1/meals/week/{campusIdx}", 1) .param("offeredAt", offeredAt) .contentType(MediaType.APPLICATION_JSON)) .andDo(MockMvcResultHandlers.print())