From 34604fb9ca35a3b356f3b8a0f65e77c690bca306 Mon Sep 17 00:00:00 2001 From: dldmsql Date: Tue, 3 Oct 2023 23:31:12 +0900 Subject: [PATCH] =?UTF-8?q?test:=20=EC=98=A4=EB=A5=98=20=EC=BC=80=EC=9D=B4?= =?UTF-8?q?=EC=8A=A4=EC=97=90=20=EB=8C=80=ED=95=B4=20=ED=85=8C=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EC=9E=91=EC=84=B1(#28)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit POST 요청에 대해 NOT_FOUND, INVALID_REQUEST 케이스의 테스트 코드를 작성 --- .../meal/controller/MealControllerTest.java | 24 +-- .../meal/service/MealServiceImplTest.java | 204 +++++++++++++----- 2 files changed, 154 insertions(+), 74 deletions(-) diff --git a/src/test/java/everymeal/server/meal/controller/MealControllerTest.java b/src/test/java/everymeal/server/meal/controller/MealControllerTest.java index fb1be7e..f3e4a8f 100644 --- a/src/test/java/everymeal/server/meal/controller/MealControllerTest.java +++ b/src/test/java/everymeal/server/meal/controller/MealControllerTest.java @@ -25,19 +25,18 @@ class MealControllerTest extends ControllerTestSupport { @Test void createWeekMeal() throws Exception { // given - WeekMealRegisterReq req = new WeekMealRegisterReq(); - req.setRestaurantIdx(1L); // 식당 PK List list = new ArrayList<>(); // 식사 데이터 for (int i = 0; i < 7; i++) { - MealRegisterReq mealReq = new MealRegisterReq(); - mealReq.setMealStatus(MealStatus.OPEN.name()); - mealReq.setMenu("갈비탕, 깍두기, 흰쌀밥"); - mealReq.setMealType(MealType.BREAKFAST.name()); - mealReq.setPrice(10000.0); - mealReq.setOfferedAt(LocalDate.now()); + MealRegisterReq mealReq = + new MealRegisterReq( + "갈비탕, 깍두기, 흰쌀밥", + MealType.BREAKFAST.name(), + MealStatus.OPEN.name(), + LocalDate.now(), + 10000.0); list.add(mealReq); } - req.setRegisterReqList(list); + WeekMealRegisterReq req = new WeekMealRegisterReq(list, 1L); // when-then mockMvc.perform( @@ -120,11 +119,6 @@ void getWeekMeal() throws Exception { } private RestaurantRegisterReq getRestaurantRegisterReq() { - RestaurantRegisterReq req = new RestaurantRegisterReq(); - req.setRestaurantName("MCC 식당"); - req.setAddress("서울시 서대문구 남가좌동 거북골로 34"); - req.setUniversityName("명지대학교"); - req.setCampusName("인문캠퍼스"); - return req; + return new RestaurantRegisterReq("명지대학교", "인문캠퍼스", "서울시 서대문구 남가좌동 거북골로 34", "MCC 식당"); } } diff --git a/src/test/java/everymeal/server/meal/service/MealServiceImplTest.java b/src/test/java/everymeal/server/meal/service/MealServiceImplTest.java index 00580aa..58d84cc 100644 --- a/src/test/java/everymeal/server/meal/service/MealServiceImplTest.java +++ b/src/test/java/everymeal/server/meal/service/MealServiceImplTest.java @@ -1,15 +1,19 @@ package everymeal.server.meal.service; import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.junit.jupiter.api.Assertions.assertTrue; import everymeal.server.global.IntegrationTestSupport; +import everymeal.server.global.exception.ApplicationException; +import everymeal.server.global.exception.ExceptionList; import everymeal.server.meal.controller.dto.request.MealRegisterReq; import everymeal.server.meal.controller.dto.request.RestaurantRegisterReq; import everymeal.server.meal.controller.dto.request.WeekMealRegisterReq; import everymeal.server.meal.controller.dto.response.DayMealListGetRes; import everymeal.server.meal.controller.dto.response.RestaurantListGetRes; import everymeal.server.meal.controller.dto.response.WeekMealListGetRes; +import everymeal.server.meal.entity.Meal; import everymeal.server.meal.entity.MealStatus; import everymeal.server.meal.entity.MealType; import everymeal.server.meal.entity.Restaurant; @@ -52,21 +56,20 @@ void createRestaurant() throws Exception { // when University university = - universityRepository.save( - getUniversity(req.getUniversityName(), req.getCampusName())); + universityRepository.save(getUniversity(req.universityName(), req.campusName())); Boolean response = mealService.createRestaurant(req); // then - Restaurant restaurants = restaurantRepository.findByName(req.getRestaurantName()).get(); + Restaurant restaurants = restaurantRepository.findByName(req.restaurantName()).get(); assertEquals(response, true); - assertEquals(restaurants.getAddress(), req.getAddress()); + assertEquals(restaurants.getAddress(), req.address()); } private Restaurant getRestaurant(University university, String address, String name) { return Restaurant.builder().university(university).address(address).name(name).build(); } - @DisplayName("주간 식단을 등록합니다.") + @DisplayName("주간 식단을 등록") @Test void createWeekMeal() throws Exception { // given @@ -74,29 +77,28 @@ void createWeekMeal() throws Exception { University university = universityRepository.save( getUniversity( - restaurantRegisterReq.getUniversityName(), - restaurantRegisterReq.getCampusName())); + restaurantRegisterReq.universityName(), + restaurantRegisterReq.campusName())); Restaurant restaurant = restaurantRepository.save( getRestaurant( university, - restaurantRegisterReq.getAddress(), - restaurantRegisterReq.getRestaurantName())); + restaurantRegisterReq.address(), + restaurantRegisterReq.restaurantName())); - WeekMealRegisterReq req = new WeekMealRegisterReq(); - req.setRestaurantIdx(restaurant.getIdx()); List list = new ArrayList<>(); LocalDate today = LocalDate.now(); for (int i = 0; i < 7; i++) { - MealRegisterReq mealReq = new MealRegisterReq(); - mealReq.setMealStatus(MealStatus.OPEN.name()); - mealReq.setMenu("갈비탕, 깍두기, 흰쌀밥"); - mealReq.setMealType(MealType.BREAKFAST.name()); - mealReq.setPrice(10000.0); - mealReq.setOfferedAt(today.plusDays(i)); + MealRegisterReq mealReq = + new MealRegisterReq( + "갈비탕, 깍두기, 흰쌀밥", + MealType.BREAKFAST.name(), + MealStatus.OPEN.name(), + today.plusDays(i), + 10000.0); list.add(mealReq); } - req.setRegisterReqList(list); + WeekMealRegisterReq req = new WeekMealRegisterReq(list, restaurant.getIdx()); // when Boolean response = mealService.createWeekMeal(req); @@ -113,29 +115,28 @@ void getWeekMealList() throws Exception { University university = universityRepository.save( getUniversity( - restaurantRegisterReq.getUniversityName(), - restaurantRegisterReq.getCampusName())); + restaurantRegisterReq.universityName(), + restaurantRegisterReq.campusName())); Restaurant restaurant = restaurantRepository.save( getRestaurant( university, - restaurantRegisterReq.getAddress(), - restaurantRegisterReq.getRestaurantName())); + restaurantRegisterReq.address(), + restaurantRegisterReq.restaurantName())); - WeekMealRegisterReq req = new WeekMealRegisterReq(); - req.setRestaurantIdx(restaurant.getIdx()); List list = new ArrayList<>(); LocalDate today = LocalDate.now(); for (int i = 0; i < 7; i++) { - MealRegisterReq mealReq = new MealRegisterReq(); - mealReq.setMealStatus(MealStatus.OPEN.name()); - mealReq.setMenu("갈비탕, 깍두기, 흰쌀밥"); - mealReq.setMealType(MealType.BREAKFAST.name()); - mealReq.setPrice(10000.0); - mealReq.setOfferedAt(today.plusDays(i)); + MealRegisterReq mealReq = + new MealRegisterReq( + "갈비탕, 깍두기, 흰쌀밥", + MealType.BREAKFAST.name(), + MealStatus.OPEN.name(), + today.plusDays(i), + 10000.0); list.add(mealReq); } - req.setRegisterReqList(list); + WeekMealRegisterReq req = new WeekMealRegisterReq(list, restaurant.getIdx()); mealService.createWeekMeal(req); // when @@ -143,7 +144,7 @@ void getWeekMealList() throws Exception { mealService.getWeekMealList(restaurant.getIdx(), today.toString()); // then - assertEquals(response.size(), req.getRegisterReqList().size()); + assertEquals(response.size(), req.registerReqList().size()); } @DisplayName("하루 식단 조회") @@ -154,28 +155,26 @@ void getDayMealList() throws Exception { University university = universityRepository.save( getUniversity( - restaurantRegisterReq.getUniversityName(), - restaurantRegisterReq.getCampusName())); + restaurantRegisterReq.universityName(), + restaurantRegisterReq.campusName())); Restaurant restaurant = restaurantRepository.save( getRestaurant( university, - restaurantRegisterReq.getAddress(), - restaurantRegisterReq.getRestaurantName())); - - WeekMealRegisterReq req = new WeekMealRegisterReq(); - req.setRestaurantIdx(restaurant.getIdx()); + restaurantRegisterReq.address(), + restaurantRegisterReq.restaurantName())); List list = new ArrayList<>(); for (int i = 0; i < 7; i++) { - MealRegisterReq mealReq = new MealRegisterReq(); - mealReq.setMealStatus(MealStatus.OPEN.name()); - mealReq.setMenu("갈비탕, 깍두기, 흰쌀밥"); - mealReq.setMealType(MealType.BREAKFAST.name()); - mealReq.setPrice(10000.0); - mealReq.setOfferedAt(LocalDate.now()); + MealRegisterReq mealReq = + new MealRegisterReq( + "갈비탕, 깍두기, 흰쌀밥", + MealType.BREAKFAST.name(), + MealStatus.OPEN.name(), + LocalDate.now(), + 10000.0); list.add(mealReq); } - req.setRegisterReqList(list); + WeekMealRegisterReq req = new WeekMealRegisterReq(list, restaurant.getIdx()); mealService.createWeekMeal(req); // when @@ -183,7 +182,7 @@ void getDayMealList() throws Exception { mealService.getDayMealList(restaurant.getIdx(), LocalDate.now().toString()); // then - assertEquals(response.size(), req.getRegisterReqList().size()); + assertEquals(response.size(), req.registerReqList().size()); } @DisplayName("학교별 학생 식당 조회") @@ -194,17 +193,17 @@ void getRestaurantList() throws Exception { University university = universityRepository.save( getUniversity( - restaurantRegisterReq.getUniversityName(), - restaurantRegisterReq.getCampusName())); + restaurantRegisterReq.universityName(), + restaurantRegisterReq.campusName())); Restaurant restaurant = restaurantRepository.save( getRestaurant( university, - restaurantRegisterReq.getAddress(), - restaurantRegisterReq.getRestaurantName())); + restaurantRegisterReq.address(), + restaurantRegisterReq.restaurantName())); - String universityName = restaurantRegisterReq.getUniversityName(); - String campusName = restaurantRegisterReq.getCampusName(); + String universityName = restaurantRegisterReq.universityName(); + String campusName = restaurantRegisterReq.campusName(); // when List response = @@ -214,13 +213,100 @@ void getRestaurantList() throws Exception { assertEquals(response.get(0).getRestaurantIdx(), restaurant.getIdx()); } + @Test + @DisplayName("학생 식당 등록 시, 존재하지 않는 학교일 경우") + void createRestaurantWhenUniversityIsNotFound() throws Exception { + // given + RestaurantRegisterReq invalidReq = + new RestaurantRegisterReq("서울대학교", "서울캠퍼스", "서울시 관악구 관악로", "유령식당"); + // when-then + ApplicationException applicationException = + assertThrows( + ApplicationException.class, () -> mealService.createRestaurant(invalidReq)); + + assertEquals( + applicationException.getErrorCode(), ExceptionList.UNIVERSITY_NOT_FOUND.getCODE()); + } + + @Test + @DisplayName("주간 식단 등록 시, 존재하지 않는 식당일 경우") + void createWeekMealWhenRestaurantIsNotFound() throws Exception { + // given + List list = new ArrayList<>(); + LocalDate today = LocalDate.now(); + for (int i = 0; i < 7; i++) { + MealRegisterReq mealReq = + new MealRegisterReq( + "갈비탕, 깍두기, 흰쌀밥", + MealType.BREAKFAST.name(), + MealStatus.OPEN.name(), + today.plusDays(i), + 10000.0); + list.add(mealReq); + } + WeekMealRegisterReq invalidReq = new WeekMealRegisterReq(list, 9999L); + + // when-then + ApplicationException applicationException = + assertThrows( + ApplicationException.class, () -> mealService.createWeekMeal(invalidReq)); + assertEquals( + applicationException.getErrorCode(), ExceptionList.RESTAURANT_NOT_FOUND.getCODE()); + } + + @Test + @DisplayName("등록되어 있는 식단 데이터 보다 과거의 날짜로 식단을 등록하려는 경 - 덮어쓰기") + void createWeekMealBeforeLastMealOfferedAt() throws Exception { + // given + RestaurantRegisterReq restaurantRegisterReq = getRestaurantRegisterReq(); + University university = + universityRepository.save( + getUniversity( + restaurantRegisterReq.universityName(), + restaurantRegisterReq.campusName())); + Restaurant restaurant = + restaurantRepository.save( + getRestaurant( + university, + restaurantRegisterReq.address(), + restaurantRegisterReq.restaurantName())); + + Meal meal = + mealRepository.save( + Meal.builder() + .menu("떡볶이, 어묵탕, 튀김") + .mealType(MealType.LUNCH) + .mealStatus(MealStatus.OPEN) + .offeredAt(LocalDate.now()) + .price(5000.0) + .restaurant(restaurant) + .build()); + + List list = new ArrayList<>(); + LocalDate today = LocalDate.now(); + for (int i = 0; i < 7; i++) { + MealRegisterReq mealReq = + new MealRegisterReq( + "갈비탕, 깍두기, 흰쌀밥", + MealType.BREAKFAST.name(), + MealStatus.OPEN.name(), + today.minusDays(i), + 10000.0); + list.add(mealReq); + } + WeekMealRegisterReq invalidReq = new WeekMealRegisterReq(list, restaurant.getIdx()); + + ApplicationException applicationException = + assertThrows( + ApplicationException.class, () -> mealService.createWeekMeal(invalidReq)); + + assertEquals( + applicationException.getErrorCode(), + ExceptionList.INVALID_MEAL_OFFEREDAT_REQUEST.getCODE()); + } + private RestaurantRegisterReq getRestaurantRegisterReq() { - RestaurantRegisterReq req = new RestaurantRegisterReq(); - req.setRestaurantName("MCC 식당"); - req.setAddress("서울시 서대문구 남가좌동 거북골로 34"); - req.setUniversityName("명지대학교"); - req.setCampusName("인문캠퍼스"); - return req; + return new RestaurantRegisterReq("명지대학교", "인문캠퍼스", "서울시 서대문구 남가좌동 거북골로 34", "MCC 식당"); } private University getUniversity(String universityName, String campusName) {