diff --git a/src/main/java/com/example/Jinus/controller/DishController.java b/src/main/java/com/example/Jinus/controller/DishController.java index ebf0033..6f2ad85 100644 --- a/src/main/java/com/example/Jinus/controller/DishController.java +++ b/src/main/java/com/example/Jinus/controller/DishController.java @@ -32,10 +32,12 @@ public DishController( this.cafeteriaDietService = cafeteriaDietService; this.campusService = campusService; } + @PostMapping("/api/spring/dish") public String handleRequest(@RequestBody RequestDto requestDto) { String userId = requestDto.getUserRequest().getUser().getId(); // 유저 id String rawDate = requestDto.getAction().getDetailParams().getSys_date().getOrigin(); // 날짜 (오늘, 내일) + System.out.println(rawDate); String campusName = requestDto.getAction().getParams().getSys_campus_name(); // 캠퍼스 이름 (동의어 사용) String cafeteriaName = requestDto.getAction().getParams().getSys_cafeteria_name(); // 식당 이름 (동의어 사용) String rawPeriod = (requestDto.getAction().getDetailParams().getSys_time_period() != null) @@ -50,4 +52,9 @@ public String handleRequest(@RequestBody RequestDto requestDto) { String dishInfo = cafeteriaDietService.processRequest(userId, rawDate, campusName, cafeteriaName, rawPeriod); return dishInfo; } + +// @PostMapping("/api/spring/dish") +// public void handleRequest(@RequestBody String requestDto) { +// System.out.println(requestDto); +// } } diff --git a/src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java b/src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java index 0a785c4..aa5b072 100644 --- a/src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java +++ b/src/main/java/com/example/Jinus/controller/v2/CafeteriaControllerV2.java @@ -19,7 +19,7 @@ import java.util.Map; @RestController -@RequestMapping("/api/v2/spring") +@RequestMapping("/api/spring") public class CafeteriaControllerV2 { private final UserServiceV2 userServiceV2; @@ -36,7 +36,7 @@ public CafeteriaControllerV2( } // 사용자 존재 여부에 따라 응답 - @PostMapping("/cafeteria") + @PostMapping("/cafeteria/v2") public String responseCafeteriaOrCampusListCard(@RequestBody RequestDto requestDto) { // userId로 campusId 찾기 String userId = requestDto.getUserRequest().getUser().getId(); diff --git a/src/main/java/com/example/Jinus/controller/v2/DietControllerV2.java b/src/main/java/com/example/Jinus/controller/v2/DietControllerV2.java index eea29e8..60eebc3 100644 --- a/src/main/java/com/example/Jinus/controller/v2/DietControllerV2.java +++ b/src/main/java/com/example/Jinus/controller/v2/DietControllerV2.java @@ -9,13 +9,18 @@ import org.springframework.web.bind.annotation.RestController; @RestController -@RequestMapping("/api/v2/spring") +@RequestMapping("/api/spring") @RequiredArgsConstructor public class DietControllerV2 { private final DietServiceV2 dietServiceV2; - @PostMapping("/dish") + @PostMapping("/dish/v2") public String handleRequest(@RequestBody RequestDto requestDto) { return dietServiceV2.requestHandler(requestDto); } + +// @PostMapping("/dish") +// public void handleRequest(@RequestBody String requestDto) { +// System.out.println(requestDto); +// } } diff --git a/src/main/java/com/example/Jinus/controller/v2/NoticeControllerV2.java b/src/main/java/com/example/Jinus/controller/v2/NoticeControllerV2.java index 9964f77..251cdba 100644 --- a/src/main/java/com/example/Jinus/controller/v2/NoticeControllerV2.java +++ b/src/main/java/com/example/Jinus/controller/v2/NoticeControllerV2.java @@ -20,7 +20,7 @@ import static java.lang.String.valueOf; @RestController -@RequestMapping("/api/v2/spring") +@RequestMapping("/api/spring") public class NoticeControllerV2 { private final NoticeServiceV2 noticeServiceV2; @@ -39,7 +39,7 @@ public NoticeControllerV2(NoticeServiceV2 noticeServiceV2, } // 학교 공지사항 조회 - @PostMapping("/main-notice") + @PostMapping("/main-notice/v2") public String getMainNotice() { int departmentId = 117; // 학교 공지사항 id String departmentEng = "main"; // 학과 영문명 @@ -47,7 +47,7 @@ public String getMainNotice() { } // 학과 공지사항 조회 - @PostMapping("/department-notice") + @PostMapping("/department-notice/v2") public String responseDepartmentNotice(@RequestBody RequestDto requestDto) { String userId = requestDto.getUserRequest().getUser().getId(); int departmentId = userServiceV2.getUserDepartmentId(userId); diff --git a/src/main/java/com/example/Jinus/service/v2/cafeteria/DietServiceV2.java b/src/main/java/com/example/Jinus/service/v2/cafeteria/DietServiceV2.java index c4d9bae..8ebb0b1 100644 --- a/src/main/java/com/example/Jinus/service/v2/cafeteria/DietServiceV2.java +++ b/src/main/java/com/example/Jinus/service/v2/cafeteria/DietServiceV2.java @@ -32,7 +32,6 @@ public class DietServiceV2 { private final CampusRepositoryV2 campusRepositoryV2; private final CampusServiceV2 campusServiceV2; private final CafeteriaServiceV2 cafeteriaServiceV2; - private final View error; // 식단 데이터 찾기 위해 필요한 파라미터 추출 및 초기화 public String requestHandler(RequestDto requestDto) {