고생하셨습니다.

🎉 PR 머지 완료! 🎉

Author: jsoonworld

src/main/java/roomescape/controller/PageController.java

@@ -0,0 +1,23 @@
+package roomescape.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class PageController {
+
+    @GetMapping("/")
+    public String home() {
+        return "home";
+    }
+
+    @GetMapping("/reservation")
+    public String reservationPage() {
+        return "new-reservation";
+    }
+
+    @GetMapping("/time")
+    public String timePage() {
+        return "time";
+    }
+}

src/main/java/roomescape/controller/RoomescapeController.java renamed to src/main/java/roomescape/controller/ReservationController.java

@@ -1,59 +1,67 @@
 package roomescape.controller;
 
 import org.springframework.http.ResponseEntity;
-import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
 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.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import roomescape.dto.ReservationRequest;
 import roomescape.dto.ReservationResponse;
+import roomescape.dto.TimeRequest;
+import roomescape.dto.TimeResponse;
 import roomescape.service.ReservationService;
 
 import java.net.URI;
 import java.util.List;
 
-@Controller
-public class RoomescapeController {
+@RestController
+public class ReservationController {
 
     private final ReservationService reservationService;
 
-    public RoomescapeController(ReservationService reservationService) {
+    public ReservationController(ReservationService reservationService) {
         this.reservationService = reservationService;
     }
 
-    @GetMapping("/")
-    public String home() {
-        return "home";
-    }
-
-    @GetMapping("/reservation")
-    public String reservationPage() {
-        return "reservation";
-    }
-
     @GetMapping("/reservations")
-    @ResponseBody
     public ResponseEntity<List<ReservationResponse>> getReservations() {
-        List<ReservationResponse> reservations = reservationService.findAll();
+        List<ReservationResponse> reservations = reservationService.findAllReservations();
         return ResponseEntity.ok(reservations);
     }
 
     @PostMapping("/reservations")
-    @ResponseBody
     public ResponseEntity<ReservationResponse> createReservation(@RequestBody ReservationRequest request) {
-        ReservationResponse reservation = reservationService.create(request);
+        ReservationResponse reservation = reservationService.createReservation(request);
         return ResponseEntity
                 .created(URI.create("/reservations/" + reservation.id()))
                 .body(reservation);
     }
 
     @DeleteMapping("/reservations/{id}")
-    @ResponseBody
     public ResponseEntity<Void> deleteReservation(@PathVariable Long id) {
-        reservationService.delete(id);
+        reservationService.deleteReservation(id);
+        return ResponseEntity.noContent().build();
+    }
+
+    @PostMapping("/times")
+    public ResponseEntity<TimeResponse> createTime(@RequestBody TimeRequest request) {
+        TimeResponse time = reservationService.createTime(request);
+        return ResponseEntity
+                .created(URI.create("/times/" + time.id()))
+                .body(time);
+    }
+
+    @GetMapping("/times")
+    public ResponseEntity<List<TimeResponse>> getTimes() {
+        List<TimeResponse> times = reservationService.findAllTimes();
+        return ResponseEntity.ok(times);
+    }
+
+    @DeleteMapping("/times/{id}")
+    public ResponseEntity<Void> deleteTime(@PathVariable Long id) {
+        reservationService.deleteTime(id);
         return ResponseEntity.noContent().build();
     }
 }

src/main/java/roomescape/domain/InMemoryReservationRepository.java

@@ -1,68 +1,60 @@
 package roomescape.domain;
 
+import roomescape.exception.ReservationException;
+
 import java.time.LocalDate;
-import java.time.LocalTime;
 
 public class Reservation {
     private final Long id;
     private final String name;
     private final LocalDate date;
-    private final LocalTime time;
+    private final Time time;
 
-    private Reservation(Long id, String name, LocalDate date, LocalTime time) {
+    private Reservation(Long id, String name, LocalDate date, Time time) {
         validate(name, date, time);
         this.id = id;
         this.name = name;
         this.date = date;
         this.time = time;
     }
 
-    public static Reservation of(Long id, String name, LocalDate date, LocalTime time) {
-        return new Reservation(id, name, date, time);
-    }
-
-    public static Reservation create(String name, LocalDate date, LocalTime time) {
+    public static Reservation create(String name, LocalDate date, Time time) {
         return new Reservation(null, name, date, time);
     }
 
-    public Long getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public LocalDate getDate() {
-        return date;
-    }
-
-    public LocalTime getTime() {
-        return time;
+    public static Reservation of(Long id, String name, LocalDate date, Time time) {
+        return new Reservation(id, name, date, time);
     }
 
-    private void validate(String name, LocalDate date, LocalTime time) {
+    private void validate(String name, LocalDate date, Time time) {
         validateName(name);
         validateDate(date);
         validateTime(time);
     }
 
     private void validateName(String name) {
         if (name == null || name.isBlank()) {
-            throw new IllegalArgumentException("[ERROR] 이름은 필수 입력 항목입니다.");
+            throw new ReservationException("[ERROR] 예약자 이름을 입력해주세요.");
         }
     }
 
     private void validateDate(LocalDate date) {
         if (date == null) {
-            throw new IllegalArgumentException("[ERROR] 날짜는 필수 입력 항목입니다.");
+            throw new ReservationException("[ERROR] 예약 날짜를 선택해주세요.");
+        }
+        if (date.isBefore(LocalDate.now())) {
+            throw new ReservationException("[ERROR] 지난 날짜로는 예약할 수 없습니다. 오늘 혹은 이후 날짜를 선택해주세요.");
         }
     }
 
-    private void validateTime(LocalTime time) {
+    private void validateTime(Time time) {
         if (time == null) {
-            throw new IllegalArgumentException("[ERROR] 시간은 필수 입력 항목입니다.");
+            throw new ReservationException("[ERROR] 예약 시간을 선택해주세요.");
         }
     }
-}
 
+    public Long getId() { return id; }
+    public String getName() { return name; }
+    public LocalDate getDate() { return date; }
+    public Time getTime() { return time; }
+}

src/main/java/roomescape/domain/Reservation.java

@@ -9,38 +9,51 @@
 import java.sql.Date;
 import java.sql.PreparedStatement;
 import java.sql.Statement;
-import java.sql.Time;
+import java.time.LocalDate;
 import java.util.List;
 
 @Repository
-public class JdbcTemplateReservationRepository {
+public class ReservationRepository {
 
     private final JdbcTemplate jdbcTemplate;
-    private final RowMapper<Reservation> reservationRowMapper = (rs, rowNum) -> Reservation.of(
-            rs.getLong("id"),
-            rs.getString("name"),
-            rs.getDate("date").toLocalDate(),
-            rs.getTime("time").toLocalTime()
-    );
-
-    public JdbcTemplateReservationRepository(JdbcTemplate jdbcTemplate) {
+
+    private final RowMapper<Reservation> reservationRowMapper = (rs, rowNum) -> {
+        Time time = Time.of(
+                rs.getLong("time_id"),
+                rs.getTime("time_value").toLocalTime()
+        );
+        return Reservation.of(
+                rs.getLong("reservation_id"),
+                rs.getString("name"),
+                rs.getDate("date").toLocalDate(),
+                time
+        );
+    };
+
+    public ReservationRepository(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
 
+    public boolean existsByDateAndTimeId(LocalDate date, Long timeId) {
+        String sql = "SELECT EXISTS(SELECT 1 FROM reservation WHERE date = ? AND time_id = ?)";
+        return jdbcTemplate.queryForObject(sql, Boolean.class, date, timeId);
+    }
+
     public List<Reservation> findAll() {
-        String sql = "SELECT * FROM reservation";
+        String sql = "SELECT r.id as reservation_id, r.name, r.date, t.id as time_id, t.time as time_value " +
+                "FROM reservation as r inner join time as t on r.time_id = t.id";
         return jdbcTemplate.query(sql, reservationRowMapper);
     }
 
     public Reservation save(Reservation reservation) {
-        String sql = "INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)";
+        String sql = "INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)";
         KeyHolder keyHolder = new GeneratedKeyHolder();
 
         jdbcTemplate.update(connection -> {
             PreparedStatement ps = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
             ps.setString(1, reservation.getName());
             ps.setDate(2, Date.valueOf(reservation.getDate()));
-            ps.setTime(3, Time.valueOf(reservation.getTime()));
+            ps.setLong(3, reservation.getTime().getId());
             return ps;
         }, keyHolder);
 

src/main/java/roomescape/domain/JdbcTemplateReservationRepository.java renamed to src/main/java/roomescape/domain/ReservationRepository.java

@@ -0,0 +1,32 @@
+package roomescape.domain;
+
+import java.time.LocalTime;
+
+public class Time {
+    private final Long id;
+    private final LocalTime time;
+
+    private Time(Long id, LocalTime time) {
+        validate(time);
+        this.id = id;
+        this.time = time;
+    }
+
+    public static Time create(LocalTime time) {
+        return new Time(null, time);
+    }
+
+    public static Time of(Long id, LocalTime time) {
+        return new Time(id, time);
+    }
+
+    private void validate(LocalTime time) {
+        if (time == null) {
+            throw new IllegalArgumentException("[ERROR] 시간 정보는 비어있을 수 없습니다.");
+        }
+    }
+
+    public Long getId() { return id; }
+
+    public LocalTime getTime() { return time; }
+}