From 3e100812326791c84c2c84844e6fbfcc6d5d1882 Mon Sep 17 00:00:00 2001
From: somefood <iamseokjuhong@gmail.com>
Date: Sun, 16 Feb 2025 22:23:59 +0900
Subject: [PATCH 1/9] =?UTF-8?q?8=EB=8B=A8=EA=B3=84=20-=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=20=EA=B4=80=EB=A6=AC=20=EA=B8=B0=EB=8A=A5=20=EC=9E=91?=
 =?UTF-8?q?=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/time/Time.java       | 31 +++++++++
 src/main/java/roomescape/time/TimeDao.java    | 15 ++++
 .../controller/TimeCommandController.java     | 55 +++++++++++++++
 .../time/dto/TimeCreateRequest.java           | 13 ++++
 .../time/dto/TimeCreateResponse.java          | 23 +++++++
 .../roomescape/time/infra/TimeDaoImpl.java    | 69 +++++++++++++++++++
 src/main/resources/schema.sql                 |  7 ++
 src/test/java/roomescape/MissionStepTest.java | 25 +++++++
 8 files changed, 238 insertions(+)
 create mode 100644 src/main/java/roomescape/time/Time.java
 create mode 100644 src/main/java/roomescape/time/TimeDao.java
 create mode 100644 src/main/java/roomescape/time/controller/TimeCommandController.java
 create mode 100644 src/main/java/roomescape/time/dto/TimeCreateRequest.java
 create mode 100644 src/main/java/roomescape/time/dto/TimeCreateResponse.java
 create mode 100644 src/main/java/roomescape/time/infra/TimeDaoImpl.java

diff --git a/src/main/java/roomescape/time/Time.java b/src/main/java/roomescape/time/Time.java
new file mode 100644
index 000000000..fca77e337
--- /dev/null
+++ b/src/main/java/roomescape/time/Time.java
@@ -0,0 +1,31 @@
+package roomescape.time;
+
+import java.time.LocalTime;
+
+public class Time {
+
+    private Long id;
+
+    private LocalTime time;
+
+    private Time(Long id, LocalTime time) {
+        this.id = id;
+        this.time = time;
+    }
+
+    public static Time ofNew(LocalTime time) {
+        return new Time(null, time);
+    }
+
+    public static Time ofExist(Long id, LocalTime time) {
+        return new Time(id, time);
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public LocalTime getTime() {
+        return time;
+    }
+}
diff --git a/src/main/java/roomescape/time/TimeDao.java b/src/main/java/roomescape/time/TimeDao.java
new file mode 100644
index 000000000..654ad9972
--- /dev/null
+++ b/src/main/java/roomescape/time/TimeDao.java
@@ -0,0 +1,15 @@
+package roomescape.time;
+
+import java.util.List;
+import java.util.Optional;
+
+public interface TimeDao {
+
+    Optional<Time> findById(Long id);
+
+    List<Time> findAll();
+
+    Time save(Time time);
+
+    void delete(Long id);
+}
diff --git a/src/main/java/roomescape/time/controller/TimeCommandController.java b/src/main/java/roomescape/time/controller/TimeCommandController.java
new file mode 100644
index 000000000..f5afd339b
--- /dev/null
+++ b/src/main/java/roomescape/time/controller/TimeCommandController.java
@@ -0,0 +1,55 @@
+package roomescape.time.controller;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import roomescape.time.Time;
+import roomescape.time.TimeDao;
+import roomescape.time.dto.TimeCreateRequest;
+import roomescape.time.dto.TimeCreateResponse;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.List;
+
+@RestController
+public class TimeCommandController {
+
+    private final TimeDao timeDao;
+
+    public TimeCommandController(TimeDao timeDao) {
+        this.timeDao = timeDao;
+    }
+
+    @GetMapping("/times/{id}")
+    public Time getTime(@PathVariable("id") long id) {
+        return timeDao.findById(id)
+                .orElseThrow();
+    }
+
+    @GetMapping("/times")
+    public List<Time> getTimes() {
+        return timeDao.findAll();
+    }
+
+    @PostMapping("/times")
+    public ResponseEntity<TimeCreateResponse> createTime(@RequestBody TimeCreateRequest request) throws URISyntaxException {
+        Time time = timeDao.save(Time.ofNew(
+                request.getTime()
+        ));
+
+        URI uri = new URI("/times/" + time.getId());
+        return ResponseEntity
+                .created(uri)
+                .body(new TimeCreateResponse(
+                        time.getId(),
+                        time.getTime()
+                ));
+    }
+
+    @DeleteMapping("/times/{id}")
+    public ResponseEntity<Void> deleteTime(@PathVariable("id") long id) {
+        timeDao.delete(id);
+
+        return ResponseEntity.noContent().build();
+    }
+}
diff --git a/src/main/java/roomescape/time/dto/TimeCreateRequest.java b/src/main/java/roomescape/time/dto/TimeCreateRequest.java
new file mode 100644
index 000000000..1471c8974
--- /dev/null
+++ b/src/main/java/roomescape/time/dto/TimeCreateRequest.java
@@ -0,0 +1,13 @@
+package roomescape.time.dto;
+
+import java.time.LocalTime;
+
+public class TimeCreateRequest {
+
+    private LocalTime time;
+
+    public LocalTime getTime() {
+        return time;
+    }
+}
+
diff --git a/src/main/java/roomescape/time/dto/TimeCreateResponse.java b/src/main/java/roomescape/time/dto/TimeCreateResponse.java
new file mode 100644
index 000000000..1ac3c3adc
--- /dev/null
+++ b/src/main/java/roomescape/time/dto/TimeCreateResponse.java
@@ -0,0 +1,23 @@
+package roomescape.time.dto;
+
+import java.time.LocalTime;
+
+public class TimeCreateResponse {
+
+    private Long id;
+
+    private LocalTime time;
+
+    public TimeCreateResponse(Long id, LocalTime time) {
+        this.id = id;
+        this.time = time;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public LocalTime getTime() {
+        return time;
+    }
+}
diff --git a/src/main/java/roomescape/time/infra/TimeDaoImpl.java b/src/main/java/roomescape/time/infra/TimeDaoImpl.java
new file mode 100644
index 000000000..1918974b7
--- /dev/null
+++ b/src/main/java/roomescape/time/infra/TimeDaoImpl.java
@@ -0,0 +1,69 @@
+package roomescape.time.infra;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Repository;
+import roomescape.exception.NotFoundReservationException;
+import roomescape.time.Time;
+import roomescape.time.TimeDao;
+
+import java.sql.PreparedStatement;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+
+@Repository
+public class TimeDaoImpl implements TimeDao {
+
+    public static final RowMapper<Time> TIME_ROW_MAPPER = (rs, rowNum) -> Time.ofExist(
+            rs.getLong("id"),
+            rs.getTime("time").toLocalTime()
+    );
+    private final JdbcTemplate jdbcTemplate;
+
+    public TimeDaoImpl(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    @Override
+    public Optional<Time> findById(Long id) {
+        String sql = "SELECT * FROM reservation_time WHERE id = ?";
+        return Optional.ofNullable(jdbcTemplate.queryForObject(sql, TIME_ROW_MAPPER, id));
+    }
+
+    @Override
+    public List<Time> findAll() {
+        String sql = "SELECT * FROM reservation_time";
+        return jdbcTemplate.query(sql, TIME_ROW_MAPPER);
+    }
+
+    @Override
+    public Time save(Time time) {
+        String sql = "INSERT INTO reservation_time (time) VALUES (?)";
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(sql, new String[]{"id"});
+            ps.setTime(1, java.sql.Time.valueOf(time.getTime()));
+            return ps;
+        }, keyHolder);
+
+        return Time.ofExist(
+                Objects.requireNonNull(keyHolder.getKey()).longValue(),
+                time.getTime()
+        );
+    }
+
+    @Override
+    public void delete(Long id) {
+        String sql = "DELETE FROM reservation_time WHERE id = ?";
+
+        if (findById(id).isEmpty()) {
+            throw new IllegalArgumentException();
+        }
+
+        jdbcTemplate.update(sql, id);
+    }
+}
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index a6c54b18a..072834bd3 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -6,3 +6,10 @@ CREATE TABLE reservation
     time TIME NOT NULL,
     PRIMARY KEY (id)
 );
+
+CREATE TABLE reservation_time
+(
+    id   BIGINT       NOT NULL AUTO_INCREMENT,
+    time time NOT NULL,
+    PRIMARY KEY (id)
+);
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 06183ec0f..344933bd0 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -155,4 +155,29 @@ public class MissionStepTest {
         Integer countAfterDelete = jdbcTemplate.queryForObject("SELECT count(1) from reservation", Integer.class);
         assertThat(countAfterDelete).isEqualTo(0);
     }
+
+    @Test
+    void 팔단계() {
+        Map<String, String> params = new HashMap<>();
+        params.put("time", "10:00");
+
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(params)
+                .when().post("/times")
+                .then().log().all()
+                .statusCode(201)
+                .header("Location", "/times/1");
+
+        RestAssured.given().log().all()
+                .when().get("/times")
+                .then().log().all()
+                .statusCode(200)
+                .body("size()", is(1));
+
+        RestAssured.given().log().all()
+                .when().delete("/times/1")
+                .then().log().all()
+                .statusCode(204);
+    }
 }

From 58bbf3ea8fc4b8b301dc46b163ad7df3469b30aa Mon Sep 17 00:00:00 2001
From: somefood <iamseokjuhong@gmail.com>
Date: Sun, 16 Feb 2025 23:05:16 +0900
Subject: [PATCH 2/9] =?UTF-8?q?9=EB=8B=A8=EA=B3=84=20-=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A1=B4=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/reservation/Reservation.java   | 13 +++----
 .../ReservationCommandController.java         | 11 ++++--
 .../controller/ReservationController.java     |  2 +-
 .../dto/ReservationCreateRequest.java         |  6 ++--
 .../reservation/infra/ReservationDaoImpl.java | 35 +++++++++++++++----
 src/main/resources/schema.sql                 | 19 +++++-----
 src/test/java/roomescape/MissionStepTest.java | 15 ++++++++
 7 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/src/main/java/roomescape/reservation/Reservation.java b/src/main/java/roomescape/reservation/Reservation.java
index 4acc267f9..224cb40cd 100644
--- a/src/main/java/roomescape/reservation/Reservation.java
+++ b/src/main/java/roomescape/reservation/Reservation.java
@@ -1,7 +1,8 @@
 package roomescape.reservation;
 
+import roomescape.time.Time;
+
 import java.time.LocalDate;
-import java.time.LocalTime;
 import java.util.Objects;
 
 public class Reservation {
@@ -12,20 +13,20 @@ public class Reservation {
     
     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) {
         this.id = id;
         this.name = Objects.requireNonNull(name, "이름은 필수입니다.");
         this.date = Objects.requireNonNull(date, "예약 날짜는 필수 입니다.");
         this.time = Objects.requireNonNull(time, "예약 시간은 필수입니다.");
     }
 
-    public static Reservation ofNew(String name, LocalDate date, LocalTime time) {
+    public static Reservation ofNew(String name, LocalDate date, Time time) {
         return new Reservation(null, name, date, time);
     }
     
-    public static Reservation ofExist(Long id, String name, LocalDate date, LocalTime time) {
+    public static Reservation ofExist(Long id, String name, LocalDate date, Time time) {
         return new Reservation(id, name, date, time);
     }
 
@@ -41,7 +42,7 @@ public LocalDate getDate() {
         return date;
     }
 
-    public LocalTime getTime() {
+    public Time getTime() {
         return time;
     }
 }
diff --git a/src/main/java/roomescape/reservation/controller/ReservationCommandController.java b/src/main/java/roomescape/reservation/controller/ReservationCommandController.java
index 007df038f..00266be51 100644
--- a/src/main/java/roomescape/reservation/controller/ReservationCommandController.java
+++ b/src/main/java/roomescape/reservation/controller/ReservationCommandController.java
@@ -6,6 +6,8 @@
 import roomescape.reservation.ReservationDao;
 import roomescape.reservation.dto.ReservationCreateRequest;
 import roomescape.reservation.dto.ReservationCreateResponse;
+import roomescape.time.Time;
+import roomescape.time.TimeDao;
 
 import java.net.URI;
 import java.net.URISyntaxException;
@@ -15,9 +17,11 @@
 public class ReservationCommandController {
 
     private final ReservationDao reservationDao;
+    private final TimeDao timeDao;
 
-    public ReservationCommandController(ReservationDao reservationDao) {
+    public ReservationCommandController(ReservationDao reservationDao, TimeDao timeDao) {
         this.reservationDao = reservationDao;
+        this.timeDao = timeDao;
     }
 
     @GetMapping("/reservations")
@@ -28,10 +32,13 @@ public ResponseEntity<List<Reservation>> getReservationList() {
 
     @PostMapping("/reservations")
     public ResponseEntity<ReservationCreateResponse> createReservation(@RequestBody ReservationCreateRequest request) throws URISyntaxException {
+        Time time = timeDao.findById(request.getTime())
+                .orElseThrow();
+
         Long id = reservationDao.save(Reservation.ofNew(
                 request.getName(),
                 request.getDate(),
-                request.getTime()
+                time
         ));
 
         URI uri = new URI("/reservations/" + id);
diff --git a/src/main/java/roomescape/reservation/controller/ReservationController.java b/src/main/java/roomescape/reservation/controller/ReservationController.java
index 4b8f2d386..468d10dc3 100644
--- a/src/main/java/roomescape/reservation/controller/ReservationController.java
+++ b/src/main/java/roomescape/reservation/controller/ReservationController.java
@@ -8,6 +8,6 @@ public class ReservationController {
 
     @GetMapping("/reservation")
     public String getReservationPage() {
-        return "reservation";
+        return "new-reservation";
     }
 }
diff --git a/src/main/java/roomescape/reservation/dto/ReservationCreateRequest.java b/src/main/java/roomescape/reservation/dto/ReservationCreateRequest.java
index ae0becbf2..0e863e680 100644
--- a/src/main/java/roomescape/reservation/dto/ReservationCreateRequest.java
+++ b/src/main/java/roomescape/reservation/dto/ReservationCreateRequest.java
@@ -1,7 +1,6 @@
 package roomescape.reservation.dto;
 
 import java.time.LocalDate;
-import java.time.LocalTime;
 
 public class ReservationCreateRequest {
     
@@ -9,7 +8,7 @@ public class ReservationCreateRequest {
     
     private LocalDate date;
     
-    private LocalTime time;
+    private Long time;
 
     public String getName() {
         return name;
@@ -19,8 +18,7 @@ public LocalDate getDate() {
         return date;
     }
 
-    public LocalTime getTime() {
+    public Long getTime() {
         return time;
     }
-
 }
diff --git a/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java b/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java
index 926825c85..7b93f3cb8 100644
--- a/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java
+++ b/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java
@@ -9,10 +9,10 @@
 import roomescape.exception.NotFoundReservationException;
 import roomescape.reservation.Reservation;
 import roomescape.reservation.ReservationDao;
+import roomescape.time.Time;
 
 import java.sql.Date;
 import java.sql.PreparedStatement;
-import java.sql.Time;
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
@@ -24,7 +24,10 @@ public class ReservationDaoImpl implements ReservationDao {
             rs.getLong("id"),
             rs.getString("name"),
             rs.getDate("date").toLocalDate(),
-            rs.getTime("time").toLocalTime()
+            Time.ofExist(
+                    rs.getLong("time_id"),
+                    rs.getTime("time_value").toLocalTime()
+            )
     );
 
     private final JdbcTemplate jdbcTemplate;
@@ -35,13 +38,24 @@ public ReservationDaoImpl(JdbcTemplate jdbcTemplate) {
 
     @Override
     public Optional<Reservation> findById(Long id) {
-        String sql = "SELECT * FROM reservation WHERE id = ?";
+        String sql = "SELECT " +
+                "r.id as reservation_id," +
+                "r.name," +
+                "r.date," +
+                "t.id as time_id," +
+                "t.time as time_value " +
+                "FROM reservation r " +
+                "INNER JOIN reservation_time t ON r.time_id = t.id " +
+                "WHERE r.id = ?";
         try {
             Reservation reservation = jdbcTemplate.queryForObject(sql, (rs, rowNum) -> Reservation.ofExist(
                     rs.getLong("id"),
                     rs.getString("name"),
                     rs.getDate("date").toLocalDate(),
-                    rs.getTime("time").toLocalTime()
+                    Time.ofExist(
+                            rs.getLong("time_id"),
+                            rs.getTime("time_value").toLocalTime()
+                    )
             ), id);
             return Optional.ofNullable(reservation);
         } catch (EmptyResultDataAccessException e) {
@@ -52,20 +66,27 @@ public Optional<Reservation> findById(Long id) {
 
     @Override
     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 r " +
+                "INNER JOIN reservation_time t ON r.time_id = r.id";
         return jdbcTemplate.query(sql, ALL_RESERVATION_ROW_MAPPER);
     }
 
     @Override
     public Long 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, new String[]{"id"});
             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);
 
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 072834bd3..febbb3e42 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -1,15 +1,16 @@
-CREATE TABLE reservation
+CREATE TABLE reservation_time
 (
-    id   BIGINT       NOT NULL AUTO_INCREMENT,
-    name VARCHAR(255) NOT NULL,
-    date DATE NOT NULL,
-    time TIME NOT NULL,
+    id   BIGINT NOT NULL AUTO_INCREMENT,
+    time time   NOT NULL,
     PRIMARY KEY (id)
 );
 
-CREATE TABLE reservation_time
+CREATE TABLE reservation
 (
-    id   BIGINT       NOT NULL AUTO_INCREMENT,
-    time time NOT NULL,
-    PRIMARY KEY (id)
+    id      BIGINT       NOT NULL AUTO_INCREMENT,
+    name    VARCHAR(255) NOT NULL,
+    date    DATE         NOT NULL,
+    time_id BIGINT,
+    PRIMARY KEY (id),
+    FOREIGN KEY (time_id) REFERENCES reservation_time (id)
 );
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 344933bd0..1dbb66621 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -180,4 +180,19 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(204);
     }
+
+    @Test
+    void 구단계() {
+        Map<String, String> reservation = new HashMap<>();
+        reservation.put("name", "브라운");
+        reservation.put("date", "2025-02-16");
+        reservation.put("time", "10:00");
+
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(reservation)
+                .when().post("/reservations")
+                .then().log().all()
+                .statusCode(400);
+    }
 }

From 4583056cf8f0dd90cbf8dd62f8eca844c2569f5e Mon Sep 17 00:00:00 2001
From: somefood <iamseokjuhong@gmail.com>
Date: Sun, 16 Feb 2025 23:13:57 +0900
Subject: [PATCH 3/9] =?UTF-8?q?10=EB=8B=A8=EA=B3=84=20-=20=EA=B3=84?=
 =?UTF-8?q?=EC=B8=B5=ED=99=94=20=EB=A6=AC=ED=8C=A9=ED=84=B0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/roomescape/MissionStepTest.java | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 1dbb66621..24c85b866 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -8,7 +8,9 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.DirtiesContext;
 import roomescape.reservation.Reservation;
+import roomescape.reservation.controller.ReservationController;
 
+import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -22,6 +24,9 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 public class MissionStepTest {
 
+    @Autowired
+    private ReservationController reservationController;
+
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
@@ -195,4 +200,18 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(400);
     }
+
+    @Test
+    void 십단계() {
+        boolean isJdbcTemplateInjected = false;
+
+        for (Field field: reservationController.getClass().getDeclaredFields()) {
+            if (field.getType().equals(JdbcTemplate.class)) {
+                isJdbcTemplateInjected = true;
+                break;
+            }
+        }
+
+        assertThat(isJdbcTemplateInjected).isFalse();
+    }
 }

From 60889401f7aba70a79f979d7cb4a9118296db3a1 Mon Sep 17 00:00:00 2001
From: somefood <iamseokjuhong@gmail.com>
Date: Sun, 16 Feb 2025 23:16:48 +0900
Subject: [PATCH 4/9] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20=EC=82=AC=ED=95=AD=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/roomescape/MissionStepTest.java | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 24c85b866..9867c2c00 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -9,10 +9,13 @@
 import org.springframework.test.annotation.DirtiesContext;
 import roomescape.reservation.Reservation;
 import roomescape.reservation.controller.ReservationController;
+import roomescape.time.Time;
+import roomescape.time.TimeDao;
 
 import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.SQLException;
+import java.time.LocalTime;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -27,6 +30,9 @@ public class MissionStepTest {
     @Autowired
     private ReservationController reservationController;
 
+    @Autowired
+    private TimeDao timeDao;
+
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
@@ -54,10 +60,12 @@ public class MissionStepTest {
     
     @Test
     void 삼단계() {
+        timeDao.save(Time.ofNew(LocalTime.of(12, 0)));
+
         Map<String, String> params = new HashMap<>();
         params.put("name", "브라운");
         params.put("date", "2023-08-05");
-        params.put("time", "15:40");
+        params.put("time", "1");
         
         RestAssured.given().log().all()
                 .contentType(ContentType.JSON)
@@ -121,7 +129,8 @@ public class MissionStepTest {
 
     @Test
     void 육단계() {
-        jdbcTemplate.update("INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)", "브라운", "2023-08-05", "15:40");
+        timeDao.save(Time.ofNew(LocalTime.of(12, 0)));
+        jdbcTemplate.update("INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)", "브라운", "2023-08-05", 1L);
 
         List<Reservation> reservations = RestAssured.given().log().all()
                 .when().get("/reservations")
@@ -136,10 +145,11 @@ public class MissionStepTest {
 
     @Test
     void 칠단계() {
+        timeDao.save(Time.ofNew(LocalTime.of(12, 0)));
         Map<String, String> params = new HashMap<>();
         params.put("name", "브라운");
         params.put("date", "2025-02-02");
-        params.put("time", "10:00");
+        params.put("time", "1");
 
         RestAssured.given().log().all()
                 .contentType(ContentType.JSON)

From 3d4516fcf03f9284f12272b1b34a7c04fbd270d7 Mon Sep 17 00:00:00 2001
From: Seokju Hong <iamseokjuhong@gmail.com>
Date: Mon, 17 Feb 2025 17:27:36 +0900
Subject: [PATCH 5/9] =?UTF-8?q?ROWMAPPER=20=EA=B3=B5=ED=86=B5=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/infra/ReservationDaoImpl.java      | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java b/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java
index 7b93f3cb8..060c82e25 100644
--- a/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java
+++ b/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java
@@ -20,7 +20,7 @@
 @Repository
 public class ReservationDaoImpl implements ReservationDao {
 
-    private static final RowMapper<Reservation> ALL_RESERVATION_ROW_MAPPER = (rs, rowNum) -> Reservation.ofExist(
+    private static final RowMapper<Reservation> RESERVATION_ROW_MAPPER = (rs, rowNum) -> Reservation.ofExist(
             rs.getLong("id"),
             rs.getString("name"),
             rs.getDate("date").toLocalDate(),
@@ -48,15 +48,7 @@ public Optional<Reservation> findById(Long id) {
                 "INNER JOIN reservation_time t ON r.time_id = t.id " +
                 "WHERE r.id = ?";
         try {
-            Reservation reservation = jdbcTemplate.queryForObject(sql, (rs, rowNum) -> Reservation.ofExist(
-                    rs.getLong("id"),
-                    rs.getString("name"),
-                    rs.getDate("date").toLocalDate(),
-                    Time.ofExist(
-                            rs.getLong("time_id"),
-                            rs.getTime("time_value").toLocalTime()
-                    )
-            ), id);
+            Reservation reservation = jdbcTemplate.queryForObject(sql, RESERVATION_ROW_MAPPER, id);
             return Optional.ofNullable(reservation);
         } catch (EmptyResultDataAccessException e) {
             return Optional.empty();
@@ -74,7 +66,7 @@ public List<Reservation> findAll() {
                 "t.time AS time_value " +
                 "FROM reservation r " +
                 "INNER JOIN reservation_time t ON r.time_id = r.id";
-        return jdbcTemplate.query(sql, ALL_RESERVATION_ROW_MAPPER);
+        return jdbcTemplate.query(sql, RESERVATION_ROW_MAPPER);
     }
 
     @Override

From dc9ccee3833e674e458ed3a582c4843a8b89dff9 Mon Sep 17 00:00:00 2001
From: somefood <iamseokjuhong@gmail.com>
Date: Sun, 23 Feb 2025 17:58:02 +0900
Subject: [PATCH 6/9] =?UTF-8?q?=EC=BF=BC=EB=A6=AC=20String=20=EB=A9=80?=
 =?UTF-8?q?=ED=8B=B0=EB=9D=BC=EC=9D=B8=EC=9C=BC=EB=A1=9C=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/infra/ReservationDaoImpl.java | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java b/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java
index 060c82e25..52a51215e 100644
--- a/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java
+++ b/src/main/java/roomescape/reservation/infra/ReservationDaoImpl.java
@@ -38,15 +38,17 @@ public ReservationDaoImpl(JdbcTemplate jdbcTemplate) {
 
     @Override
     public Optional<Reservation> findById(Long id) {
-        String sql = "SELECT " +
-                "r.id as reservation_id," +
-                "r.name," +
-                "r.date," +
-                "t.id as time_id," +
-                "t.time as time_value " +
-                "FROM reservation r " +
-                "INNER JOIN reservation_time t ON r.time_id = t.id " +
-                "WHERE r.id = ?";
+        String sql = """
+                SELECT
+                    r.id as reservation_id,
+                    r.name,
+                    r.date,
+                    t.id as time_id,
+                    t.time as time_value
+                FROM reservation r
+                INNER JOIN reservation_time t ON r.time_id = t.id
+                WHERE r.id = ?
+                """;
         try {
             Reservation reservation = jdbcTemplate.queryForObject(sql, RESERVATION_ROW_MAPPER, id);
             return Optional.ofNullable(reservation);
@@ -58,14 +60,16 @@ public Optional<Reservation> findById(Long id) {
 
     @Override
     public List<Reservation> findAll() {
-        String sql = "SELECT " +
-                "r.id AS reservation_id," +
-                "r.name," +
-                "r.date," +
-                "t.id AS time_id," +
-                "t.time AS time_value " +
-                "FROM reservation r " +
-                "INNER JOIN reservation_time t ON r.time_id = r.id";
+        String sql = """
+                SELECT
+                    r.id AS reservation_id,
+                    r.name,
+                    r.date,
+                    t.id AS time_id,
+                    t.time AS time_value
+                FROM reservation r
+                INNER JOIN reservation_time t ON r.time_id = r.id
+                """;
         return jdbcTemplate.query(sql, RESERVATION_ROW_MAPPER);
     }
 

From 0d5a4b678d66462e4ccfe7e3a7b0d8a56625e1c5 Mon Sep 17 00:00:00 2001
From: somefood <iamseokjuhong@gmail.com>
Date: Sun, 23 Feb 2025 18:09:42 +0900
Subject: [PATCH 7/9] =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=97=B0=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/time/controller/TimeController.java  | 13 +++++++++++++
 1 file changed, 13 insertions(+)
 create mode 100644 src/main/java/roomescape/time/controller/TimeController.java

diff --git a/src/main/java/roomescape/time/controller/TimeController.java b/src/main/java/roomescape/time/controller/TimeController.java
new file mode 100644
index 000000000..6a28cd6ee
--- /dev/null
+++ b/src/main/java/roomescape/time/controller/TimeController.java
@@ -0,0 +1,13 @@
+package roomescape.time.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class TimeController {
+
+    @GetMapping("/time")
+    public String getTimePage() {
+        return "time";
+    }
+}

From d5630c09c66b90bcbae00773e6ffde2ed7b3fc60 Mon Sep 17 00:00:00 2001
From: somefood <iamseokjuhong@gmail.com>
Date: Sun, 23 Feb 2025 19:26:28 +0900
Subject: [PATCH 8/9] =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EB=93=B1=EB=A1=9D=20?=
 =?UTF-8?q?=EC=8B=9C=20=EC=A4=91=EB=B3=B5=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/time/TimeDao.java     |  2 ++
 .../time/controller/TimeCommandController.java | 15 ++++++++++++---
 .../exception/TimeAlreadyExistException.java   |  4 ++++
 .../time/exception/TimeExceptionHandler.java   | 14 ++++++++++++++
 .../roomescape/time/infra/TimeDaoImpl.java     | 18 ++++++++++++++++--
 5 files changed, 48 insertions(+), 5 deletions(-)
 create mode 100644 src/main/java/roomescape/time/exception/TimeAlreadyExistException.java
 create mode 100644 src/main/java/roomescape/time/exception/TimeExceptionHandler.java

diff --git a/src/main/java/roomescape/time/TimeDao.java b/src/main/java/roomescape/time/TimeDao.java
index 654ad9972..1adc744cd 100644
--- a/src/main/java/roomescape/time/TimeDao.java
+++ b/src/main/java/roomescape/time/TimeDao.java
@@ -7,6 +7,8 @@ public interface TimeDao {
 
     Optional<Time> findById(Long id);
 
+    Optional<Time> findByTime(Time time);
+
     List<Time> findAll();
 
     Time save(Time time);
diff --git a/src/main/java/roomescape/time/controller/TimeCommandController.java b/src/main/java/roomescape/time/controller/TimeCommandController.java
index f5afd339b..bdbcc8249 100644
--- a/src/main/java/roomescape/time/controller/TimeCommandController.java
+++ b/src/main/java/roomescape/time/controller/TimeCommandController.java
@@ -6,10 +6,13 @@
 import roomescape.time.TimeDao;
 import roomescape.time.dto.TimeCreateRequest;
 import roomescape.time.dto.TimeCreateResponse;
+import roomescape.time.exception.TimeAlreadyExistException;
+import roomescape.time.exception.TimeNotFoundException;
 
 import java.net.URI;
 import java.net.URISyntaxException;
 import java.util.List;
+import java.util.Optional;
 
 @RestController
 public class TimeCommandController {
@@ -33,9 +36,15 @@ public List<Time> getTimes() {
 
     @PostMapping("/times")
     public ResponseEntity<TimeCreateResponse> createTime(@RequestBody TimeCreateRequest request) throws URISyntaxException {
-        Time time = timeDao.save(Time.ofNew(
-                request.getTime()
-        ));
+
+        Time newTime = Time.ofNew(request.getTime());
+
+        Optional<Time> optionalTime = timeDao.findByTime(newTime);
+        if (optionalTime.isPresent()) {
+            throw new TimeAlreadyExistException();
+        }
+
+        Time time = timeDao.save(newTime);
 
         URI uri = new URI("/times/" + time.getId());
         return ResponseEntity
diff --git a/src/main/java/roomescape/time/exception/TimeAlreadyExistException.java b/src/main/java/roomescape/time/exception/TimeAlreadyExistException.java
new file mode 100644
index 000000000..3b01e6322
--- /dev/null
+++ b/src/main/java/roomescape/time/exception/TimeAlreadyExistException.java
@@ -0,0 +1,4 @@
+package roomescape.time.exception;
+
+public class TimeAlreadyExistException extends RuntimeException {
+}
diff --git a/src/main/java/roomescape/time/exception/TimeExceptionHandler.java b/src/main/java/roomescape/time/exception/TimeExceptionHandler.java
new file mode 100644
index 000000000..ca54de953
--- /dev/null
+++ b/src/main/java/roomescape/time/exception/TimeExceptionHandler.java
@@ -0,0 +1,14 @@
+package roomescape.time.exception;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+@ControllerAdvice
+public class TimeExceptionHandler {
+
+    @ExceptionHandler(TimeAlreadyExistException.class)
+    public ResponseEntity<Void> handleException(TimeAlreadyExistException e) {
+        return ResponseEntity.badRequest().build();
+    }
+}
diff --git a/src/main/java/roomescape/time/infra/TimeDaoImpl.java b/src/main/java/roomescape/time/infra/TimeDaoImpl.java
index 1918974b7..870842719 100644
--- a/src/main/java/roomescape/time/infra/TimeDaoImpl.java
+++ b/src/main/java/roomescape/time/infra/TimeDaoImpl.java
@@ -1,11 +1,11 @@
 package roomescape.time.infra;
 
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
-import roomescape.exception.NotFoundReservationException;
 import roomescape.time.Time;
 import roomescape.time.TimeDao;
 
@@ -30,7 +30,21 @@ public TimeDaoImpl(JdbcTemplate jdbcTemplate) {
     @Override
     public Optional<Time> findById(Long id) {
         String sql = "SELECT * FROM reservation_time WHERE id = ?";
-        return Optional.ofNullable(jdbcTemplate.queryForObject(sql, TIME_ROW_MAPPER, id));
+        try {
+            return Optional.ofNullable(jdbcTemplate.queryForObject(sql, TIME_ROW_MAPPER, id));
+        } catch (EmptyResultDataAccessException e) {
+            return Optional.empty();
+        }
+    }
+
+    @Override
+    public Optional<Time> findByTime(Time time) {
+        String sql = "SELECT * FROM reservation_time WHERE time = ?";
+        try {
+            return Optional.ofNullable(jdbcTemplate.queryForObject(sql, TIME_ROW_MAPPER, time.getTime()));
+        } catch (EmptyResultDataAccessException e) {
+            return Optional.empty();
+        }
     }
 
     @Override

From ed1aec8e291ff6d50516de1a6724ff8c96c4f791 Mon Sep 17 00:00:00 2001
From: somefood <iamseokjuhong@gmail.com>
Date: Sun, 23 Feb 2025 19:27:59 +0900
Subject: [PATCH 9/9] =?UTF-8?q?=EC=8B=9C=EA=B0=84=20=EB=93=B1=EB=A1=9D=20?=
 =?UTF-8?q?=EC=8B=9C=20=EC=A4=91=EB=B3=B5=EC=9D=B8=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=EC=98=88=EC=99=B8=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/time/controller/TimeCommandController.java     | 2 +-
 .../java/roomescape/time/exception/TimeNotFoundException.java | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/roomescape/time/exception/TimeNotFoundException.java

diff --git a/src/main/java/roomescape/time/controller/TimeCommandController.java b/src/main/java/roomescape/time/controller/TimeCommandController.java
index bdbcc8249..10134f518 100644
--- a/src/main/java/roomescape/time/controller/TimeCommandController.java
+++ b/src/main/java/roomescape/time/controller/TimeCommandController.java
@@ -26,7 +26,7 @@ public TimeCommandController(TimeDao timeDao) {
     @GetMapping("/times/{id}")
     public Time getTime(@PathVariable("id") long id) {
         return timeDao.findById(id)
-                .orElseThrow();
+                .orElseThrow(TimeNotFoundException::new);
     }
 
     @GetMapping("/times")
diff --git a/src/main/java/roomescape/time/exception/TimeNotFoundException.java b/src/main/java/roomescape/time/exception/TimeNotFoundException.java
new file mode 100644
index 000000000..8bd010c2e
--- /dev/null
+++ b/src/main/java/roomescape/time/exception/TimeNotFoundException.java
@@ -0,0 +1,4 @@
+package roomescape.time.exception;
+
+public class TimeNotFoundException extends RuntimeException {
+}