diff --git a/src/main/java/roomescape/controller/CustomerController.java b/src/main/java/roomescape/controller/CustomerController.java index 22d34a19b..d721b0478 100644 --- a/src/main/java/roomescape/controller/CustomerController.java +++ b/src/main/java/roomescape/controller/CustomerController.java @@ -25,7 +25,7 @@ public ResponseEntity save(@RequestBody Customer customer) { return ResponseEntity.ok().build(); } - @GetMapping("/customers") // -> customers 라는 파일(경로)을 만든 적이 없는데 코드가 돌아가긴 함.. + @GetMapping("/customers") public ResponseEntity> list() { String sql = "select id, first_name, last_name from customers"; List customers = jdbcTemplate.query( diff --git a/src/main/java/roomescape/controller/HomeController.java b/src/main/java/roomescape/controller/HomeController.java index 7bd5528df..eb38d161d 100644 --- a/src/main/java/roomescape/controller/HomeController.java +++ b/src/main/java/roomescape/controller/HomeController.java @@ -10,4 +10,9 @@ public class HomeController { public String home() { return "home"; } + + @GetMapping("/time") + public String time() { + return "time"; + } } diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java index 355e5facb..0eee60bfc 100644 --- a/src/main/java/roomescape/controller/ReservationController.java +++ b/src/main/java/roomescape/controller/ReservationController.java @@ -4,16 +4,16 @@ import org.springframework.http.ResponseEntity; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import roomescape.model.Reservation; -import roomescape.model.ReservationRequest; -import roomescape.model.ReservationService; +import roomescape.model.reservation.Reservation; +import roomescape.model.reservation.ReservationDTO; +import roomescape.model.reservation.ReservationService; import java.util.List; @Controller public class ReservationController { - private ReservationService reservationService; + private final ReservationService reservationService; public ReservationController(ReservationService reservationService) { this.reservationService = reservationService; @@ -21,7 +21,7 @@ public ReservationController(ReservationService reservationService) { @GetMapping("/reservation") public String reservationPage() { - return "reservation"; + return "new-reservation"; } @GetMapping("/reservations") @@ -31,9 +31,9 @@ public List getReservations() { } @PostMapping("/reservations") - public ResponseEntity addReservation(@RequestBody ReservationRequest reservationRequest) { - Reservation reservation = reservationService.addReservation(reservationRequest); - return ResponseEntity.status(HttpStatus.CREATED) // status: 201 + public ResponseEntity addReservation(@RequestBody ReservationDTO reservationDTO) { + Reservation reservation = reservationService.addReservation(reservationDTO); + return ResponseEntity.status(HttpStatus.CREATED) .header("Location", "/reservations/" + reservation.getId()) .body(reservation); } diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java new file mode 100644 index 000000000..efe13e68d --- /dev/null +++ b/src/main/java/roomescape/controller/TimeController.java @@ -0,0 +1,41 @@ +package roomescape.controller; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; +import roomescape.model.time.Time; +import roomescape.model.time.TimeDTO; +import roomescape.model.time.TimeService; + +import java.util.List; + +@RestController +@RequestMapping("/times") +public class TimeController { + + private final TimeService timeService; + + public TimeController(TimeService timeService) { + this.timeService = timeService; + } + + @GetMapping + @ResponseBody + public List