From 23a4c67fe91c5e601c9d02ae9501e7eaed63ef75 Mon Sep 17 00:00:00 2001
From: "Park, Sojeong" <sojeong2101@gmail.com>
Date: Mon, 15 Jul 2024 18:11:20 +0900
Subject: [PATCH 1/8] =?UTF-8?q?Feat:=208-1=EB=8B=A8=EA=B3=84=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=20=EC=B6=94=EA=B0=80=20API=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/ReservationResponseDto.java    |  8 ++--
 src/main/java/roomescape/Time.java            | 27 +++++++++++++
 src/main/java/roomescape/TimeController.java  | 39 +++++++++++++++++++
 src/main/java/roomescape/TimeDAO.java         | 32 +++++++++++++++
 src/main/java/roomescape/TimeResponseDto.java | 25 ++++++++++++
 .../java/roomescape/TimeSaveRequestDto.java   | 13 +++++++
 src/main/resources/schema.sql                 |  7 ++++
 src/test/java/roomescape/MissionStepTest.java | 15 +++++++
 8 files changed, 162 insertions(+), 4 deletions(-)
 create mode 100644 src/main/java/roomescape/Time.java
 create mode 100644 src/main/java/roomescape/TimeController.java
 create mode 100644 src/main/java/roomescape/TimeDAO.java
 create mode 100644 src/main/java/roomescape/TimeResponseDto.java
 create mode 100644 src/main/java/roomescape/TimeSaveRequestDto.java

diff --git a/src/main/java/roomescape/ReservationResponseDto.java b/src/main/java/roomescape/ReservationResponseDto.java
index d2c2d972b..fafb57093 100644
--- a/src/main/java/roomescape/ReservationResponseDto.java
+++ b/src/main/java/roomescape/ReservationResponseDto.java
@@ -2,10 +2,10 @@
 
 public class ReservationResponseDto {
 
-    private final Long id;
-    private final String name;
-    private final String date;
-    private final String time;
+    private Long id;
+    private String name;
+    private String date;
+    private String time;
 
     public ReservationResponseDto(Reservation reservation) {
         this.id = reservation.getId();
diff --git a/src/main/java/roomescape/Time.java b/src/main/java/roomescape/Time.java
new file mode 100644
index 000000000..85dc6c219
--- /dev/null
+++ b/src/main/java/roomescape/Time.java
@@ -0,0 +1,27 @@
+package roomescape;
+
+public class Time {
+
+    private Long id;
+    private String time;
+
+    public Time() {
+    }
+
+    public Time(String time) {
+        this.time = time;
+    }
+
+    public Time(Long id, String time) {
+        this.id = id;
+        this.time = time;
+    }
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public String getTime() {
+        return this.time;
+    }
+}
diff --git a/src/main/java/roomescape/TimeController.java b/src/main/java/roomescape/TimeController.java
new file mode 100644
index 000000000..a889c02dd
--- /dev/null
+++ b/src/main/java/roomescape/TimeController.java
@@ -0,0 +1,39 @@
+package roomescape;
+
+import java.net.URI;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+@Controller
+public class TimeController {
+
+    private final TimeDAO timeDAO;
+
+    public TimeController(TimeDAO timeDAO) {
+        this.timeDAO = timeDAO;
+    }
+
+    @PostMapping("/times")
+    public ResponseEntity<TimeResponseDto> createReservation(@RequestBody TimeSaveRequestDto requestDto) {
+        if (isTimeArgumentEmpty(requestDto)) {
+            throw new IllegalArgumentException("잘못된 요청입니다.");
+        }
+
+        Time time = new Time(requestDto.getTime());
+
+        Long id = timeDAO.insert(time);
+
+        return ResponseEntity.created(URI.create("/times/" + id))
+                .body(new TimeResponseDto(id, time));
+    }
+
+    private boolean isTimeArgumentEmpty(TimeSaveRequestDto requestDto) {
+        return isStringEmpty(requestDto.getTime());
+    }
+
+    private boolean isStringEmpty(String argument) {
+        return argument == null || argument.trim().isEmpty();
+    }
+}
diff --git a/src/main/java/roomescape/TimeDAO.java b/src/main/java/roomescape/TimeDAO.java
new file mode 100644
index 000000000..710c5409f
--- /dev/null
+++ b/src/main/java/roomescape/TimeDAO.java
@@ -0,0 +1,32 @@
+package roomescape;
+
+import java.sql.PreparedStatement;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public class TimeDAO {
+
+    private final JdbcTemplate jdbcTemplate;
+
+    public TimeDAO(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    public Long insert(Time time) {
+        String sql = "INSERT INTO time (time) VALUES ?";
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+
+        jdbcTemplate.update(connect -> {
+            PreparedStatement ps = connect.prepareStatement(
+                    sql,
+                    new String[]{"id"});
+            ps.setString(1, time.getTime());
+            return ps;
+        }, keyHolder);
+
+        return keyHolder.getKey().longValue();
+    }
+}
diff --git a/src/main/java/roomescape/TimeResponseDto.java b/src/main/java/roomescape/TimeResponseDto.java
new file mode 100644
index 000000000..e1b539543
--- /dev/null
+++ b/src/main/java/roomescape/TimeResponseDto.java
@@ -0,0 +1,25 @@
+package roomescape;
+
+public class TimeResponseDto {
+
+    private Long id;
+    private String time;
+
+    public TimeResponseDto(Time time) {
+        this.id = time.getId();
+        this.time = time.getTime();
+    }
+
+    public TimeResponseDto(Long id, Time time) {
+        this.id = id;
+        this.time = time.getTime();
+    }
+
+    public Long getId() {
+        return this.id;
+    }
+
+    public String getTime() {
+        return this.time;
+    }
+}
diff --git a/src/main/java/roomescape/TimeSaveRequestDto.java b/src/main/java/roomescape/TimeSaveRequestDto.java
new file mode 100644
index 000000000..3a41040fe
--- /dev/null
+++ b/src/main/java/roomescape/TimeSaveRequestDto.java
@@ -0,0 +1,13 @@
+package roomescape;
+
+public class TimeSaveRequestDto {
+
+    private String time;
+
+    public TimeSaveRequestDto() {
+    }
+
+    public String getTime() {
+        return this.time;
+    }
+}
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 8d9ab2754..7adcd0fc9 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -6,3 +6,10 @@ CREATE TABLE reservation
     time    VARCHAR(255) NOT NULL,
     PRIMARY KEY (id)
 );
+
+CREATE TABLE time
+(
+    id   BIGINT       NOT NULL AUTO_INCREMENT,
+    time VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id)
+);
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index e4b3ccdb2..7b9f1274d 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -212,4 +212,19 @@ void should_deleteReservationAtDB_when_getMethodReservationsIdURI() {
         Integer countAfterDelete = jdbcTemplate.queryForObject("SELECT count(1) from reservation", Integer.class);
         assertThat(countAfterDelete).isEqualTo(0);
     }
+
+    @Test
+    @DisplayName("시간 추가 API 테스트")
+    void should_createTime_when_postMethodTimesURI() {
+        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");
+    }
 }

From 9139729476fa3b3e040e32e9a5d4654e5a828ec4 Mon Sep 17 00:00:00 2001
From: "Park, Sojeong" <sojeong2101@gmail.com>
Date: Mon, 15 Jul 2024 18:27:56 +0900
Subject: [PATCH 2/8] =?UTF-8?q?Feat:=208-2=EB=8B=A8=EA=B3=84=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=20=EC=A1=B0=ED=9A=8C=20API=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/TimeController.java  | 12 ++++++++++++
 src/main/java/roomescape/TimeDAO.java         | 16 ++++++++++++++++
 src/test/java/roomescape/MissionStepTest.java | 18 ++++++++++++++++++
 3 files changed, 46 insertions(+)

diff --git a/src/main/java/roomescape/TimeController.java b/src/main/java/roomescape/TimeController.java
index a889c02dd..5aaea9711 100644
--- a/src/main/java/roomescape/TimeController.java
+++ b/src/main/java/roomescape/TimeController.java
@@ -1,8 +1,11 @@
 package roomescape;
 
 import java.net.URI;
+import java.util.List;
+import java.util.stream.Collectors;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 
@@ -29,6 +32,15 @@ public ResponseEntity<TimeResponseDto> createReservation(@RequestBody TimeSaveRe
                 .body(new TimeResponseDto(id, time));
     }
 
+    @GetMapping("/times")
+    public ResponseEntity<List<TimeResponseDto>> readAllTimes() {
+        List<TimeResponseDto> timeResponseDtos = timeDAO.findAllTimes()
+                .stream()
+                .map(TimeResponseDto::new)
+                .collect(Collectors.toList());
+        return ResponseEntity.ok().body(timeResponseDtos);
+    }
+
     private boolean isTimeArgumentEmpty(TimeSaveRequestDto requestDto) {
         return isStringEmpty(requestDto.getTime());
     }
diff --git a/src/main/java/roomescape/TimeDAO.java b/src/main/java/roomescape/TimeDAO.java
index 710c5409f..9ddbdab3c 100644
--- a/src/main/java/roomescape/TimeDAO.java
+++ b/src/main/java/roomescape/TimeDAO.java
@@ -1,7 +1,9 @@
 package roomescape;
 
 import java.sql.PreparedStatement;
+import java.util.List;
 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;
@@ -29,4 +31,18 @@ public Long insert(Time time) {
 
         return keyHolder.getKey().longValue();
     }
+
+    public List<Time> findAllTimes() {
+        String sql = "SELECT id, time FROM time";
+
+        return jdbcTemplate.query(sql, actorRowMapper);
+    }
+
+    private final RowMapper<Time> actorRowMapper = (resultSet, rowNum) -> {
+        Time time = new Time(
+                resultSet.getLong("id"),
+                resultSet.getString("time")
+        );
+        return time;
+    };
 }
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 7b9f1274d..8b859fa5e 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -227,4 +227,22 @@ void should_createTime_when_postMethodTimesURI() {
                 .statusCode(201)
                 .header("Location", "/times/1");
     }
+
+    @Test
+    @DisplayName("모든 시간 조회 API 테스트")
+    void should_readAllTimes_when_getMethodTimesURI() {
+        Map<String, String> params = new HashMap<>();
+        params.put("time", "10:00");
+
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(params)
+                .when().post("/times");
+
+        RestAssured.given().log().all()
+                .when().get("/times")
+                .then().log().all()
+                .statusCode(200)
+                .body("size()", is(1));
+    }
 }

From fd5faac60331ed5fa941dc18d24e15e831b752d0 Mon Sep 17 00:00:00 2001
From: "Park, Sojeong" <sojeong2101@gmail.com>
Date: Mon, 15 Jul 2024 18:34:45 +0900
Subject: [PATCH 3/8] =?UTF-8?q?Feat:=208-3=EB=8B=A8=EA=B3=84=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=20=EC=82=AD=EC=A0=9C=20API=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/TimeController.java  |  8 ++++++++
 src/main/java/roomescape/TimeDAO.java         |  5 +++++
 src/test/java/roomescape/MissionStepTest.java | 17 +++++++++++++++++
 3 files changed, 30 insertions(+)

diff --git a/src/main/java/roomescape/TimeController.java b/src/main/java/roomescape/TimeController.java
index 5aaea9711..18e82b70f 100644
--- a/src/main/java/roomescape/TimeController.java
+++ b/src/main/java/roomescape/TimeController.java
@@ -5,7 +5,9 @@
 import java.util.stream.Collectors;
 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;
 
@@ -41,6 +43,12 @@ public ResponseEntity<List<TimeResponseDto>> readAllTimes() {
         return ResponseEntity.ok().body(timeResponseDtos);
     }
 
+    @DeleteMapping("/times/{id}")
+    public ResponseEntity<Void> deleteTime(@PathVariable Long id) {
+        timeDAO.delete(id);
+        return ResponseEntity.noContent().build();
+    }
+
     private boolean isTimeArgumentEmpty(TimeSaveRequestDto requestDto) {
         return isStringEmpty(requestDto.getTime());
     }
diff --git a/src/main/java/roomescape/TimeDAO.java b/src/main/java/roomescape/TimeDAO.java
index 9ddbdab3c..77d54c48c 100644
--- a/src/main/java/roomescape/TimeDAO.java
+++ b/src/main/java/roomescape/TimeDAO.java
@@ -38,6 +38,11 @@ public List<Time> findAllTimes() {
         return jdbcTemplate.query(sql, actorRowMapper);
     }
 
+    public void delete(Long id) {
+
+        jdbcTemplate.update("DELETE FROM time WHERE id = ?", id);
+    }
+
     private final RowMapper<Time> actorRowMapper = (resultSet, rowNum) -> {
         Time time = new Time(
                 resultSet.getLong("id"),
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 8b859fa5e..0b60d938d 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -245,4 +245,21 @@ void should_readAllTimes_when_getMethodTimesURI() {
                 .statusCode(200)
                 .body("size()", is(1));
     }
+
+    @Test
+    @DisplayName("시간 삭제 API 테스트")
+    void should_deleteTime_when_getMethodTimesIdURI() {
+        Map<String, String> params = new HashMap<>();
+        params.put("time", "10:00");
+
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(params)
+                .when().post("/times");
+
+        RestAssured.given().log().all()
+                .when().delete("/times/1")
+                .then().log().all()
+                .statusCode(204);
+    }
 }

From 6b5a08b49fc3cc44032ea1db0744e9cb9fc4b925 Mon Sep 17 00:00:00 2001
From: "Park, Sojeong" <sojeong2101@gmail.com>
Date: Wed, 17 Jul 2024 23:12:05 +0900
Subject: [PATCH 4/8] =?UTF-8?q?Feat:=209=EB=8B=A8=EA=B3=84=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=20=ED=85=8C=EC=9D=B4=EB=B8=94=EC=97=90=20=EC=A0=80?=
 =?UTF-8?q?=EC=9E=A5=EB=90=9C=20=EA=B0=92=EC=9C=BC=EB=A1=9C=EB=A7=8C=20?=
 =?UTF-8?q?=EC=98=88=EC=95=BD=20=EC=B6=94=EA=B0=80=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/Reservation.java     |  4 +-
 .../roomescape/ReservationController.java     | 15 +++--
 src/main/java/roomescape/ReservationDAO.java  | 42 +++++++-----
 .../roomescape/ReservationResponseDto.java    | 16 ++---
 .../roomescape/ReservationSaveRequestDto.java | 10 +--
 .../roomescape/RoomescapeApplication.java     |  1 +
 src/main/java/roomescape/TimeController.java  |  7 +-
 src/main/java/roomescape/TimeDAO.java         | 12 +++-
 src/main/java/roomescape/TimeResponseDto.java |  4 +-
 .../java/roomescape/TimeSaveRequestDto.java   |  2 +-
 src/main/resources/schema.sql                 | 17 ++---
 src/test/java/roomescape/MissionStepTest.java | 66 +++++++++++--------
 12 files changed, 116 insertions(+), 80 deletions(-)

diff --git a/src/main/java/roomescape/Reservation.java b/src/main/java/roomescape/Reservation.java
index bdc299546..281e15e66 100644
--- a/src/main/java/roomescape/Reservation.java
+++ b/src/main/java/roomescape/Reservation.java
@@ -12,9 +12,9 @@ public class Reservation {
     private Long id;
     private String name;
     private String date;
-    private String time;
+    private Time time;
 
-    public Reservation(String name, String date, String time) {
+    public Reservation(String name, String date, Time time) {
         this.name = name;
         this.date = date;
         this.time = time;
diff --git a/src/main/java/roomescape/ReservationController.java b/src/main/java/roomescape/ReservationController.java
index 8b4459015..4c2438b04 100644
--- a/src/main/java/roomescape/ReservationController.java
+++ b/src/main/java/roomescape/ReservationController.java
@@ -15,14 +15,16 @@
 public class ReservationController {
 
     private final ReservationDAO reservationDAO;
+    private final TimeDAO timeDAO;
 
-    public ReservationController(ReservationDAO reservationDAO) {
+    public ReservationController(ReservationDAO reservationDAO, TimeDAO timeDAO) {
         this.reservationDAO = reservationDAO;
+        this.timeDAO = timeDAO;
     }
 
     @GetMapping("/reservation")
     public String goReservationPage() {
-        return "reservation";
+        return "new-reservation";
     }
 
     @PostMapping("/reservations")
@@ -31,9 +33,11 @@ public ResponseEntity<ReservationResponseDto> createReservation(@RequestBody Res
             throw new IllegalArgumentException("잘못된 요청입니다.");
         }
 
-        Reservation reservation = new Reservation(requestDto.getName(), requestDto.getDate(), requestDto.getTime());
+        Time time = timeDAO.findById(requestDto.getTime()).get();
 
-        Long id = reservationDAO.insert(reservation);
+        Reservation reservation = new Reservation(requestDto.getName(), requestDto.getDate(), time);
+
+        Long id = reservationDAO.insert(reservation, reservation.getTime().getId());
 
         return ResponseEntity.created(URI.create("/reservations/" + id))
                 .body(new ReservationResponseDto(id, reservation));
@@ -56,8 +60,7 @@ public ResponseEntity<Void> deleteReservation(@PathVariable Long id) {
 
     private boolean isReservationArgumentEmpty(ReservationSaveRequestDto requestDto) {
         return isStringEmpty(requestDto.getName())
-                || isStringEmpty(requestDto.getDate())
-                || isStringEmpty(requestDto.getTime());
+                || isStringEmpty(requestDto.getDate()) || (requestDto.getTime() == null);
     }
 
     private boolean isStringEmpty(String argument) {
diff --git a/src/main/java/roomescape/ReservationDAO.java b/src/main/java/roomescape/ReservationDAO.java
index df1c96785..8416b9441 100644
--- a/src/main/java/roomescape/ReservationDAO.java
+++ b/src/main/java/roomescape/ReservationDAO.java
@@ -17,8 +17,22 @@ public ReservationDAO(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
 
-    public Long insert(Reservation reservation) {
-        String sql = "INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)";
+    private final RowMapper<Reservation> reservationRowMapper = (resultSet, rowNum) -> {
+        Time time = new Time(
+                resultSet.getLong("time_id"),
+                resultSet.getString("time_value")
+        );
+
+        return new Reservation(
+                resultSet.getLong("reservation_id"),
+                resultSet.getString("name"),
+                resultSet.getString("date"),
+                time
+        );
+    };
+
+    public Long insert(Reservation reservation, Long timeId) {
+        String sql = "INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)";
         KeyHolder keyHolder = new GeneratedKeyHolder();
 
         jdbcTemplate.update(connect -> {
@@ -27,19 +41,13 @@ public Long insert(Reservation reservation) {
                     new String[]{"id"});
             ps.setString(1, reservation.getName());
             ps.setString(2, reservation.getDate());
-            ps.setString(3, reservation.getTime());
+            ps.setLong(3, timeId);
             return ps;
         }, keyHolder);
 
         return keyHolder.getKey().longValue();
     }
 
-    public List<Reservation> findAllReservations() {
-        String sql = "SELECT id, name, date, time FROM reservation";
-
-        return jdbcTemplate.query(sql, actorRowMapper);
-    }
-
     public void delete(Long id) {
         if (countReservationById(id) == 0) {
             throw new IllegalArgumentException("해당 예약이 존재하지 않습니다.");
@@ -54,13 +62,11 @@ private int countReservationById(Long id) {
         return rowCount;
     }
 
-    private final RowMapper<Reservation> actorRowMapper = (resultSet, rowNum) -> {
-        Reservation reservation = new Reservation(
-                resultSet.getLong("id"),
-                resultSet.getString("name"),
-                resultSet.getString("date"),
-                resultSet.getString("time")
-        );
-        return reservation;
-    };
+    public List<Reservation> findAllReservations() {
+        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);
+    }
 }
diff --git a/src/main/java/roomescape/ReservationResponseDto.java b/src/main/java/roomescape/ReservationResponseDto.java
index fafb57093..f013cfa52 100644
--- a/src/main/java/roomescape/ReservationResponseDto.java
+++ b/src/main/java/roomescape/ReservationResponseDto.java
@@ -5,35 +5,35 @@ public class ReservationResponseDto {
     private Long id;
     private String name;
     private String date;
-    private String time;
+    private TimeResponseDto time;
 
     public ReservationResponseDto(Reservation reservation) {
         this.id = reservation.getId();
         this.name = reservation.getName();
         this.date = reservation.getDate();
-        this.time = reservation.getTime();
+        this.time = new TimeResponseDto(reservation.getTime());
     }
 
     public ReservationResponseDto(Long id, Reservation reservation) {
         this.id = id;
         this.name = reservation.getName();
         this.date = reservation.getDate();
-        this.time = reservation.getTime();
+        this.time = new TimeResponseDto(reservation.getTime());
     }
 
     public Long getId() {
-        return this.id;
+        return id;
     }
 
     public String getName() {
-        return this.name;
+        return name;
     }
 
     public String getDate() {
-        return this.date;
+        return date;
     }
 
-    public String getTime() {
-        return this.time;
+    public TimeResponseDto getTime() {
+        return time;
     }
 }
diff --git a/src/main/java/roomescape/ReservationSaveRequestDto.java b/src/main/java/roomescape/ReservationSaveRequestDto.java
index cbe13500c..557387f61 100644
--- a/src/main/java/roomescape/ReservationSaveRequestDto.java
+++ b/src/main/java/roomescape/ReservationSaveRequestDto.java
@@ -4,20 +4,20 @@ public class ReservationSaveRequestDto {
 
     private String name;
     private String date;
-    private String time;
+    private Long time;
 
     public ReservationSaveRequestDto() {
     }
 
     public String getName() {
-        return this.name;
+        return name;
     }
 
     public String getDate() {
-        return this.date;
+        return date;
     }
 
-    public String getTime() {
-        return this.time;
+    public Long getTime() {
+        return time;
     }
 }
diff --git a/src/main/java/roomescape/RoomescapeApplication.java b/src/main/java/roomescape/RoomescapeApplication.java
index 2ca0f743f..ce1552f19 100644
--- a/src/main/java/roomescape/RoomescapeApplication.java
+++ b/src/main/java/roomescape/RoomescapeApplication.java
@@ -2,6 +2,7 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
 public class RoomescapeApplication {
diff --git a/src/main/java/roomescape/TimeController.java b/src/main/java/roomescape/TimeController.java
index 18e82b70f..4578b2a72 100644
--- a/src/main/java/roomescape/TimeController.java
+++ b/src/main/java/roomescape/TimeController.java
@@ -20,8 +20,13 @@ public TimeController(TimeDAO timeDAO) {
         this.timeDAO = timeDAO;
     }
 
+    @GetMapping("/time")
+    public String goReservationPage() {
+        return "time";
+    }
+
     @PostMapping("/times")
-    public ResponseEntity<TimeResponseDto> createReservation(@RequestBody TimeSaveRequestDto requestDto) {
+    public ResponseEntity<TimeResponseDto> createTime(@RequestBody TimeSaveRequestDto requestDto) {
         if (isTimeArgumentEmpty(requestDto)) {
             throw new IllegalArgumentException("잘못된 요청입니다.");
         }
diff --git a/src/main/java/roomescape/TimeDAO.java b/src/main/java/roomescape/TimeDAO.java
index 77d54c48c..69e274b83 100644
--- a/src/main/java/roomescape/TimeDAO.java
+++ b/src/main/java/roomescape/TimeDAO.java
@@ -2,6 +2,8 @@
 
 import java.sql.PreparedStatement;
 import java.util.List;
+import java.util.Optional;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
@@ -35,7 +37,13 @@ public Long insert(Time time) {
     public List<Time> findAllTimes() {
         String sql = "SELECT id, time FROM time";
 
-        return jdbcTemplate.query(sql, actorRowMapper);
+        return jdbcTemplate.query(sql, timeRowMapper);
+    }
+
+    public Optional<Time> findById(Long time) {
+        String sql = "SELECT * FROM time WHERE id = ?";
+
+        return Optional.of(jdbcTemplate.queryForObject(sql, timeRowMapper, time));
     }
 
     public void delete(Long id) {
@@ -43,7 +51,7 @@ public void delete(Long id) {
         jdbcTemplate.update("DELETE FROM time WHERE id = ?", id);
     }
 
-    private final RowMapper<Time> actorRowMapper = (resultSet, rowNum) -> {
+    private final RowMapper<Time> timeRowMapper = (resultSet, rowNum) -> {
         Time time = new Time(
                 resultSet.getLong("id"),
                 resultSet.getString("time")
diff --git a/src/main/java/roomescape/TimeResponseDto.java b/src/main/java/roomescape/TimeResponseDto.java
index e1b539543..9242d2955 100644
--- a/src/main/java/roomescape/TimeResponseDto.java
+++ b/src/main/java/roomescape/TimeResponseDto.java
@@ -16,10 +16,10 @@ public TimeResponseDto(Long id, Time time) {
     }
 
     public Long getId() {
-        return this.id;
+        return id;
     }
 
     public String getTime() {
-        return this.time;
+        return time;
     }
 }
diff --git a/src/main/java/roomescape/TimeSaveRequestDto.java b/src/main/java/roomescape/TimeSaveRequestDto.java
index 3a41040fe..0eebcebad 100644
--- a/src/main/java/roomescape/TimeSaveRequestDto.java
+++ b/src/main/java/roomescape/TimeSaveRequestDto.java
@@ -8,6 +8,6 @@ public TimeSaveRequestDto() {
     }
 
     public String getTime() {
-        return this.time;
+        return time;
     }
 }
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 7adcd0fc9..ca4b0ee4c 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -1,15 +1,16 @@
-CREATE TABLE reservation
+CREATE TABLE time
 (
-    id      BIGINT       NOT NULL AUTO_INCREMENT,
-    name    VARCHAR(255) NOT NULL,
-    date    VARCHAR(255) NOT NULL,
-    time    VARCHAR(255) NOT NULL,
+    id   BIGINT       NOT NULL AUTO_INCREMENT,
+    time VARCHAR(255) NOT NULL,
     PRIMARY KEY (id)
 );
 
-CREATE TABLE time
+CREATE TABLE reservation
 (
     id   BIGINT       NOT NULL AUTO_INCREMENT,
-    time VARCHAR(255) NOT NULL,
-    PRIMARY KEY (id)
+    name VARCHAR(255) NOT NULL,
+    date VARCHAR(255) NOT NULL,
+    time_id BIGINT,
+    PRIMARY KEY (id),
+    FOREIGN KEY (time_id) REFERENCES time(id)
 );
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 0b60d938d..3da51e75b 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -10,6 +10,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,10 +56,12 @@ void should_readAllReservations_when_getMethodReservationsURI() {
     @Test
     @DisplayName("예약 추가 API 테스트")
     void should_createReservation_when_postMethodReservationsURI() {
-        Map<String, String> params = new HashMap<>();
+        jdbcTemplate.update("INSERT INTO time (time) VALUES (?)","10:00");
+
+        Map<String, Object> 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)
@@ -83,15 +86,10 @@ void should_createReservation_when_postMethodReservationsURI() {
     @Test
     @DisplayName("예약 취소 API 테스트")
     void should_deleteReservation_when_getMethodReservationsIdURI() {
-        Map<String, String> params = new HashMap<>();
-        params.put("name", "브라운");
-        params.put("date", "2023-08-05");
-        params.put("time", "15:40");
+        jdbcTemplate.update("INSERT INTO time (time) VALUES (?)","10:00");
 
-        RestAssured.given().log().all()
-                .contentType(ContentType.JSON)
-                .body(params)
-                .when().post("/reservations");
+        jdbcTemplate.update("INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)",
+                "브라운", "2023-08-05", 1);
 
         RestAssured.given().log().all()
                 .when().delete("/reservations/1")
@@ -108,10 +106,10 @@ void should_deleteReservation_when_getMethodReservationsIdURI() {
     @Test
     @DisplayName("예약 추가 시 필요한 인자값이 비어있는 경우 예외 처리 테스트")
     void should_occurIllegalArgumentException_when_createReservationArgumentIsNull() {
-        Map<String, String> params = new HashMap<>();
+        Map<String, Object> params = new HashMap<>();
         params.put("name", "브라운");
         params.put("date", "");
-        params.put("time", "");
+        params.put("time", 1);
 
         RestAssured.given().log().all()
                 .contentType(ContentType.JSON)
@@ -154,8 +152,10 @@ void should_settingDB_when_runApplication() {
     @Test
     @DisplayName("전체 예약 데이터 조회 테스트")
     void should_readAllReservationsAtDB_when_getMethodReservationsURI() {
-        jdbcTemplate.update("INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)",
-                "브라운", "2023-08-05", "15:40");
+        jdbcTemplate.update("INSERT INTO time (time) VALUES (?)","10:00");
+
+        jdbcTemplate.update("INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)",
+                "브라운", "2023-08-05", 1);
 
         List<Reservation> reservations = RestAssured.given().log().all()
                 .when().get("/reservations")
@@ -171,10 +171,13 @@ void should_readAllReservationsAtDB_when_getMethodReservationsURI() {
     @Test
     @DisplayName("데이터 추가 테스트")
     void should_createReservationAtDB_when_postMethodReservationsURI() {
-        Map<String, String> params = new HashMap<>();
+        jdbcTemplate.update("INSERT INTO time (time) VALUES (?)","10:00");
+
+        Map<String, Object> params = new HashMap<>();
         params.put("name", "브라운");
         params.put("date", "2023-08-05");
-        params.put("time", "10:00");
+        params.put("time", 1);
+
 
         RestAssured.given().log().all()
                 .contentType(ContentType.JSON)
@@ -191,18 +194,10 @@ void should_createReservationAtDB_when_postMethodReservationsURI() {
     @Test
     @DisplayName("데이터 삭제 테스트")
     void should_deleteReservationAtDB_when_getMethodReservationsIdURI() {
-        Map<String, String> params = new HashMap<>();
-        params.put("name", "브라운");
-        params.put("date", "2023-08-05");
-        params.put("time", "10:00");
+        jdbcTemplate.update("INSERT INTO time (time) VALUES (?)","10:00");
 
-        RestAssured.given().log().all()
-                .contentType(ContentType.JSON)
-                .body(params)
-                .when().post("/reservations")
-                .then().log().all()
-                .statusCode(201)
-                .header("Location", "/reservations/1");
+        jdbcTemplate.update("INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)",
+                "브라운", "2023-08-05", 1);
 
         RestAssured.given().log().all()
                 .when().delete("/reservations/1")
@@ -262,4 +257,21 @@ void should_deleteTime_when_getMethodTimesIdURI() {
                 .then().log().all()
                 .statusCode(204);
     }
+
+    @Test
+    @DisplayName("기존 예약 추가 API 스펙에 맞춰서 예약 추가 요청 시 에러 발생 테스트")
+    void should_occurIllegalArgumentException_when_createReservationWithTimeArgumentOfStringType() {
+        Map<String, String> reservation = new HashMap<>();
+        reservation.put("name", "브라운");
+        reservation.put("date", "2023-08-05");
+        reservation.put("time", "10:00");
+
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(reservation)
+                .when().post("/reservations")
+                .then().log().all()
+                .statusCode(400);
+    }
+
 }

From 63af66a8ee92eca406d03c9b0e760750ca0d8a02 Mon Sep 17 00:00:00 2001
From: "Park, Sojeong" <sojeong2101@gmail.com>
Date: Thu, 18 Jul 2024 00:12:33 +0900
Subject: [PATCH 5/8] =?UTF-8?q?Refactor:=2010=EB=8B=A8=EA=B3=84=20?=
 =?UTF-8?q?=EB=A0=88=EC=9D=B4=EC=96=B4=EB=93=9C=20=EC=95=84=ED=82=A4?=
 =?UTF-8?q?=ED=85=8D=EC=B2=98=20=ED=8C=A8=ED=84=B4=20=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/ReservationController.java     | 69 -------------------
 .../roomescape/RoomescapeApplication.java     |  1 -
 src/main/java/roomescape/TimeController.java  | 64 -----------------
 .../controller/ReservationController.java     | 49 +++++++++++++
 .../roomescape/controller/TimeController.java | 50 ++++++++++++++
 .../roomescape/{ => domain}/Reservation.java  |  2 +-
 .../java/roomescape/{ => domain}/Time.java    |  6 +-
 .../{ => dto}/ReservationResponseDto.java     |  4 +-
 .../{ => dto}/ReservationSaveRequestDto.java  |  2 +-
 .../roomescape/{ => dto}/TimeResponseDto.java |  4 +-
 .../{ => dto}/TimeSaveRequestDto.java         |  2 +-
 .../GlobalExceptionHandler.java               |  2 +-
 .../{ => repository}/ReservationDAO.java      |  4 +-
 .../roomescape/{ => repository}/TimeDAO.java  |  4 +-
 .../service/ReservationService.java           | 56 +++++++++++++++
 .../java/roomescape/service/TimeService.java  | 49 +++++++++++++
 src/test/java/roomescape/MissionStepTest.java | 20 +++++-
 17 files changed, 241 insertions(+), 147 deletions(-)
 delete mode 100644 src/main/java/roomescape/ReservationController.java
 delete mode 100644 src/main/java/roomescape/TimeController.java
 create mode 100644 src/main/java/roomescape/controller/ReservationController.java
 create mode 100644 src/main/java/roomescape/controller/TimeController.java
 rename src/main/java/roomescape/{ => domain}/Reservation.java (93%)
 rename src/main/java/roomescape/{ => domain}/Time.java (82%)
 rename src/main/java/roomescape/{ => dto}/ReservationResponseDto.java (93%)
 rename src/main/java/roomescape/{ => dto}/ReservationSaveRequestDto.java (93%)
 rename src/main/java/roomescape/{ => dto}/TimeResponseDto.java (88%)
 rename src/main/java/roomescape/{ => dto}/TimeSaveRequestDto.java (87%)
 rename src/main/java/roomescape/{ => exception}/GlobalExceptionHandler.java (93%)
 rename src/main/java/roomescape/{ => repository}/ReservationDAO.java (95%)
 rename src/main/java/roomescape/{ => repository}/TimeDAO.java (95%)
 create mode 100644 src/main/java/roomescape/service/ReservationService.java
 create mode 100644 src/main/java/roomescape/service/TimeService.java

diff --git a/src/main/java/roomescape/ReservationController.java b/src/main/java/roomescape/ReservationController.java
deleted file mode 100644
index 4c2438b04..000000000
--- a/src/main/java/roomescape/ReservationController.java
+++ /dev/null
@@ -1,69 +0,0 @@
-package roomescape;
-
-import java.net.URI;
-import java.util.List;
-import java.util.stream.Collectors;
-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;
-
-@Controller
-public class ReservationController {
-
-    private final ReservationDAO reservationDAO;
-    private final TimeDAO timeDAO;
-
-    public ReservationController(ReservationDAO reservationDAO, TimeDAO timeDAO) {
-        this.reservationDAO = reservationDAO;
-        this.timeDAO = timeDAO;
-    }
-
-    @GetMapping("/reservation")
-    public String goReservationPage() {
-        return "new-reservation";
-    }
-
-    @PostMapping("/reservations")
-    public ResponseEntity<ReservationResponseDto> createReservation(@RequestBody ReservationSaveRequestDto requestDto) {
-        if (isReservationArgumentEmpty(requestDto)) {
-            throw new IllegalArgumentException("잘못된 요청입니다.");
-        }
-
-        Time time = timeDAO.findById(requestDto.getTime()).get();
-
-        Reservation reservation = new Reservation(requestDto.getName(), requestDto.getDate(), time);
-
-        Long id = reservationDAO.insert(reservation, reservation.getTime().getId());
-
-        return ResponseEntity.created(URI.create("/reservations/" + id))
-                .body(new ReservationResponseDto(id, reservation));
-    }
-
-    @GetMapping("/reservations")
-    public ResponseEntity<List<ReservationResponseDto>> readAllReservations() {
-        List<ReservationResponseDto> reservationResponseDtos = reservationDAO.findAllReservations()
-                .stream()
-                .map(ReservationResponseDto::new)
-                .collect(Collectors.toList());
-        return ResponseEntity.ok().body(reservationResponseDtos);
-    }
-
-    @DeleteMapping("/reservations/{id}")
-    public ResponseEntity<Void> deleteReservation(@PathVariable Long id) {
-        reservationDAO.delete(id);
-        return ResponseEntity.noContent().build();
-    }
-
-    private boolean isReservationArgumentEmpty(ReservationSaveRequestDto requestDto) {
-        return isStringEmpty(requestDto.getName())
-                || isStringEmpty(requestDto.getDate()) || (requestDto.getTime() == null);
-    }
-
-    private boolean isStringEmpty(String argument) {
-        return argument == null || argument.trim().isEmpty();
-    }
-}
diff --git a/src/main/java/roomescape/RoomescapeApplication.java b/src/main/java/roomescape/RoomescapeApplication.java
index ce1552f19..2ca0f743f 100644
--- a/src/main/java/roomescape/RoomescapeApplication.java
+++ b/src/main/java/roomescape/RoomescapeApplication.java
@@ -2,7 +2,6 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
 
 @SpringBootApplication
 public class RoomescapeApplication {
diff --git a/src/main/java/roomescape/TimeController.java b/src/main/java/roomescape/TimeController.java
deleted file mode 100644
index 4578b2a72..000000000
--- a/src/main/java/roomescape/TimeController.java
+++ /dev/null
@@ -1,64 +0,0 @@
-package roomescape;
-
-import java.net.URI;
-import java.util.List;
-import java.util.stream.Collectors;
-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;
-
-@Controller
-public class TimeController {
-
-    private final TimeDAO timeDAO;
-
-    public TimeController(TimeDAO timeDAO) {
-        this.timeDAO = timeDAO;
-    }
-
-    @GetMapping("/time")
-    public String goReservationPage() {
-        return "time";
-    }
-
-    @PostMapping("/times")
-    public ResponseEntity<TimeResponseDto> createTime(@RequestBody TimeSaveRequestDto requestDto) {
-        if (isTimeArgumentEmpty(requestDto)) {
-            throw new IllegalArgumentException("잘못된 요청입니다.");
-        }
-
-        Time time = new Time(requestDto.getTime());
-
-        Long id = timeDAO.insert(time);
-
-        return ResponseEntity.created(URI.create("/times/" + id))
-                .body(new TimeResponseDto(id, time));
-    }
-
-    @GetMapping("/times")
-    public ResponseEntity<List<TimeResponseDto>> readAllTimes() {
-        List<TimeResponseDto> timeResponseDtos = timeDAO.findAllTimes()
-                .stream()
-                .map(TimeResponseDto::new)
-                .collect(Collectors.toList());
-        return ResponseEntity.ok().body(timeResponseDtos);
-    }
-
-    @DeleteMapping("/times/{id}")
-    public ResponseEntity<Void> deleteTime(@PathVariable Long id) {
-        timeDAO.delete(id);
-        return ResponseEntity.noContent().build();
-    }
-
-    private boolean isTimeArgumentEmpty(TimeSaveRequestDto requestDto) {
-        return isStringEmpty(requestDto.getTime());
-    }
-
-    private boolean isStringEmpty(String argument) {
-        return argument == null || argument.trim().isEmpty();
-    }
-}
diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
new file mode 100644
index 000000000..2712c12d4
--- /dev/null
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -0,0 +1,49 @@
+package roomescape.controller;
+
+import java.net.URI;
+import java.util.List;
+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 roomescape.dto.ReservationResponseDto;
+import roomescape.dto.ReservationSaveRequestDto;
+import roomescape.service.ReservationService;
+
+@Controller
+public class ReservationController {
+
+    private final ReservationService reservationService;
+
+    public ReservationController(ReservationService reservationService) {
+        this.reservationService = reservationService;
+    }
+
+    @GetMapping("/reservation")
+    public String goReservationPage() {
+        return "new-reservation";
+    }
+
+    @PostMapping("/reservations")
+    public ResponseEntity<ReservationResponseDto> createReservation(@RequestBody ReservationSaveRequestDto requestDto) {
+        ReservationResponseDto reservationResponseDto = reservationService.createReservation(requestDto);
+        return ResponseEntity.created(URI.create("/reservations/" + reservationResponseDto.getId()))
+                .body(reservationResponseDto);
+    }
+
+    @GetMapping("/reservations")
+    public ResponseEntity<List<ReservationResponseDto>> readAllReservations() {
+
+        return ResponseEntity.ok().body(reservationService.getAllReservations());
+    }
+
+    @DeleteMapping("/reservations/{id}")
+    public ResponseEntity<Void> deleteReservation(@PathVariable Long id) {
+        reservationService.deleteReservation(id);
+
+        return ResponseEntity.noContent().build();
+    }
+}
diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
new file mode 100644
index 000000000..a6cb94b88
--- /dev/null
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -0,0 +1,50 @@
+package roomescape.controller;
+
+import java.net.URI;
+import java.util.List;
+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 roomescape.dto.TimeResponseDto;
+import roomescape.dto.TimeSaveRequestDto;
+import roomescape.service.TimeService;
+
+@Controller
+public class TimeController {
+
+    private final TimeService timeService;
+
+    public TimeController(TimeService timeService) {
+        this.timeService = timeService;
+    }
+
+    @GetMapping("/time")
+    public String goReservationPage() {
+        return "time";
+    }
+
+    @PostMapping("/times")
+    public ResponseEntity<TimeResponseDto> createTime(@RequestBody TimeSaveRequestDto requestDto) {
+        TimeResponseDto timeResponseDto = timeService.createTime(requestDto);
+
+        return ResponseEntity.created(URI.create("/times/" + timeResponseDto.getId()))
+                .body(timeResponseDto);
+    }
+
+    @GetMapping("/times")
+    public ResponseEntity<List<TimeResponseDto>> readAllTimes() {
+
+        return ResponseEntity.ok().body(timeService.readAllTimes());
+    }
+
+    @DeleteMapping("/times/{id}")
+    public ResponseEntity<Void> deleteTime(@PathVariable Long id) {
+        timeService.deleteTime(id);
+
+        return ResponseEntity.noContent().build();
+    }
+}
diff --git a/src/main/java/roomescape/Reservation.java b/src/main/java/roomescape/domain/Reservation.java
similarity index 93%
rename from src/main/java/roomescape/Reservation.java
rename to src/main/java/roomescape/domain/Reservation.java
index 281e15e66..d8a6a3182 100644
--- a/src/main/java/roomescape/Reservation.java
+++ b/src/main/java/roomescape/domain/Reservation.java
@@ -1,4 +1,4 @@
-package roomescape;
+package roomescape.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Getter;
diff --git a/src/main/java/roomescape/Time.java b/src/main/java/roomescape/domain/Time.java
similarity index 82%
rename from src/main/java/roomescape/Time.java
rename to src/main/java/roomescape/domain/Time.java
index 85dc6c219..2d4dfd321 100644
--- a/src/main/java/roomescape/Time.java
+++ b/src/main/java/roomescape/domain/Time.java
@@ -1,4 +1,4 @@
-package roomescape;
+package roomescape.domain;
 
 public class Time {
 
@@ -18,10 +18,10 @@ public Time(Long id, String time) {
     }
 
     public Long getId() {
-        return this.id;
+        return id;
     }
 
     public String getTime() {
-        return this.time;
+        return time;
     }
 }
diff --git a/src/main/java/roomescape/ReservationResponseDto.java b/src/main/java/roomescape/dto/ReservationResponseDto.java
similarity index 93%
rename from src/main/java/roomescape/ReservationResponseDto.java
rename to src/main/java/roomescape/dto/ReservationResponseDto.java
index f013cfa52..a25be6429 100644
--- a/src/main/java/roomescape/ReservationResponseDto.java
+++ b/src/main/java/roomescape/dto/ReservationResponseDto.java
@@ -1,4 +1,6 @@
-package roomescape;
+package roomescape.dto;
+
+import roomescape.domain.Reservation;
 
 public class ReservationResponseDto {
 
diff --git a/src/main/java/roomescape/ReservationSaveRequestDto.java b/src/main/java/roomescape/dto/ReservationSaveRequestDto.java
similarity index 93%
rename from src/main/java/roomescape/ReservationSaveRequestDto.java
rename to src/main/java/roomescape/dto/ReservationSaveRequestDto.java
index 557387f61..5b00b8a51 100644
--- a/src/main/java/roomescape/ReservationSaveRequestDto.java
+++ b/src/main/java/roomescape/dto/ReservationSaveRequestDto.java
@@ -1,4 +1,4 @@
-package roomescape;
+package roomescape.dto;
 
 public class ReservationSaveRequestDto {
 
diff --git a/src/main/java/roomescape/TimeResponseDto.java b/src/main/java/roomescape/dto/TimeResponseDto.java
similarity index 88%
rename from src/main/java/roomescape/TimeResponseDto.java
rename to src/main/java/roomescape/dto/TimeResponseDto.java
index 9242d2955..2c39f770a 100644
--- a/src/main/java/roomescape/TimeResponseDto.java
+++ b/src/main/java/roomescape/dto/TimeResponseDto.java
@@ -1,4 +1,6 @@
-package roomescape;
+package roomescape.dto;
+
+import roomescape.domain.Time;
 
 public class TimeResponseDto {
 
diff --git a/src/main/java/roomescape/TimeSaveRequestDto.java b/src/main/java/roomescape/dto/TimeSaveRequestDto.java
similarity index 87%
rename from src/main/java/roomescape/TimeSaveRequestDto.java
rename to src/main/java/roomescape/dto/TimeSaveRequestDto.java
index 0eebcebad..ca020a0c1 100644
--- a/src/main/java/roomescape/TimeSaveRequestDto.java
+++ b/src/main/java/roomescape/dto/TimeSaveRequestDto.java
@@ -1,4 +1,4 @@
-package roomescape;
+package roomescape.dto;
 
 public class TimeSaveRequestDto {
 
diff --git a/src/main/java/roomescape/GlobalExceptionHandler.java b/src/main/java/roomescape/exception/GlobalExceptionHandler.java
similarity index 93%
rename from src/main/java/roomescape/GlobalExceptionHandler.java
rename to src/main/java/roomescape/exception/GlobalExceptionHandler.java
index 65c32809b..3455358c7 100644
--- a/src/main/java/roomescape/GlobalExceptionHandler.java
+++ b/src/main/java/roomescape/exception/GlobalExceptionHandler.java
@@ -1,4 +1,4 @@
-package roomescape;
+package roomescape.exception;
 
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ControllerAdvice;
diff --git a/src/main/java/roomescape/ReservationDAO.java b/src/main/java/roomescape/repository/ReservationDAO.java
similarity index 95%
rename from src/main/java/roomescape/ReservationDAO.java
rename to src/main/java/roomescape/repository/ReservationDAO.java
index 8416b9441..2500f197c 100644
--- a/src/main/java/roomescape/ReservationDAO.java
+++ b/src/main/java/roomescape/repository/ReservationDAO.java
@@ -1,4 +1,4 @@
-package roomescape;
+package roomescape.repository;
 
 import java.sql.PreparedStatement;
 import java.util.List;
@@ -7,6 +7,8 @@
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Repository;
+import roomescape.domain.Reservation;
+import roomescape.domain.Time;
 
 @Repository
 public class ReservationDAO {
diff --git a/src/main/java/roomescape/TimeDAO.java b/src/main/java/roomescape/repository/TimeDAO.java
similarity index 95%
rename from src/main/java/roomescape/TimeDAO.java
rename to src/main/java/roomescape/repository/TimeDAO.java
index 69e274b83..b26085143 100644
--- a/src/main/java/roomescape/TimeDAO.java
+++ b/src/main/java/roomescape/repository/TimeDAO.java
@@ -1,14 +1,14 @@
-package roomescape;
+package roomescape.repository;
 
 import java.sql.PreparedStatement;
 import java.util.List;
 import java.util.Optional;
-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.domain.Time;
 
 @Repository
 public class TimeDAO {
diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
new file mode 100644
index 000000000..192424512
--- /dev/null
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -0,0 +1,56 @@
+package roomescape.service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.stereotype.Service;
+import roomescape.domain.Reservation;
+import roomescape.dto.ReservationResponseDto;
+import roomescape.dto.ReservationSaveRequestDto;
+import roomescape.repository.ReservationDAO;
+import roomescape.repository.TimeDAO;
+
+@Service
+public class ReservationService {
+
+    private final ReservationDAO reservationDAO;
+    private final TimeDAO timeDAO;
+
+    public ReservationService(ReservationDAO reservationDAO, TimeDAO timeDAO) {
+        this.reservationDAO = reservationDAO;
+        this.timeDAO = timeDAO;
+    }
+
+    public ReservationResponseDto createReservation(ReservationSaveRequestDto requestDto) {
+        if (isReservationArgumentEmpty(requestDto)) {
+            throw new IllegalArgumentException("잘못된 요청입니다.");
+        }
+
+        Reservation reservation = new Reservation(
+                requestDto.getName(),
+                requestDto.getDate(),
+                timeDAO.findById(requestDto.getTime()).get());
+        Long id = reservationDAO.insert(reservation, reservation.getTime().getId());
+
+        return new ReservationResponseDto(id, reservation);
+    }
+
+    public List<ReservationResponseDto> getAllReservations() {
+        return reservationDAO.findAllReservations()
+                .stream()
+                .map(ReservationResponseDto::new)
+                .collect(Collectors.toList());
+    }
+
+    public void deleteReservation(Long id) {
+        reservationDAO.delete(id);
+    }
+
+    private boolean isReservationArgumentEmpty(ReservationSaveRequestDto requestDto) {
+        return isStringEmpty(requestDto.getName())
+                || isStringEmpty(requestDto.getDate()) || (requestDto.getTime() == null);
+    }
+
+    private boolean isStringEmpty(String argument) {
+        return argument == null || argument.trim().isEmpty();
+    }
+}
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
new file mode 100644
index 000000000..9f77c3bec
--- /dev/null
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -0,0 +1,49 @@
+package roomescape.service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+import org.springframework.stereotype.Service;
+import roomescape.domain.Time;
+import roomescape.dto.TimeResponseDto;
+import roomescape.dto.TimeSaveRequestDto;
+import roomescape.repository.TimeDAO;
+
+@Service
+public class TimeService {
+
+    private final TimeDAO timeDAO;
+
+    public TimeService(TimeDAO timeDAO) {
+        this.timeDAO = timeDAO;
+    }
+
+    public TimeResponseDto createTime(TimeSaveRequestDto requestDto) {
+        if (isTimeArgumentEmpty(requestDto)) {
+            throw new IllegalArgumentException("잘못된 요청입니다.");
+        }
+
+        Time time = new Time(requestDto.getTime());
+        Long id = timeDAO.insert(time);
+
+        return new TimeResponseDto(id, time);
+    }
+
+    public List<TimeResponseDto> readAllTimes() {
+        return timeDAO.findAllTimes()
+                .stream()
+                .map(TimeResponseDto::new)
+                .collect(Collectors.toList());
+    }
+
+    public void deleteTime(Long id) {
+        timeDAO.delete(id);
+    }
+
+    private boolean isTimeArgumentEmpty(TimeSaveRequestDto requestDto) {
+        return isStringEmpty(requestDto.getTime());
+    }
+
+    private boolean isStringEmpty(String argument) {
+        return argument == null || argument.trim().isEmpty();
+    }
+}
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 3da51e75b..cdc026d5b 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -5,18 +5,20 @@
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
+import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.DirtiesContext;
+import roomescape.controller.ReservationController;
+import roomescape.domain.Reservation;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
@@ -24,6 +26,8 @@ public class MissionStepTest {
 
     @Autowired
     private JdbcTemplate jdbcTemplate;
+    @Autowired
+    private ReservationController reservationController;
 
     @Test
     @DisplayName("홈 화면 구현 테스트")
@@ -274,4 +278,18 @@ void should_occurIllegalArgumentException_when_createReservationWithTimeArgument
                 .statusCode(400);
     }
 
+    @Test
+    @DisplayName("컨트롤러에서 데이터베이스 관련 로직 분리 확인")
+    void should_success_when_hasNotJdbcTemplateInController() {
+        boolean isJdbcTemplateInjected = false;
+
+        for (Field field : reservationController.getClass().getDeclaredFields()) {
+            if (field.getType().equals(JdbcTemplate.class)) {
+                isJdbcTemplateInjected = true;
+                break;
+            }
+        }
+
+        assertThat(isJdbcTemplateInjected).isFalse();
+    }
 }

From 7ab452dcd9e6422cbfb64be667134ca4bb4e32be Mon Sep 17 00:00:00 2001
From: "Park, Sojeong" <sojeong2101@gmail.com>
Date: Tue, 23 Jul 2024 18:45:34 +0900
Subject: [PATCH 6/8] =?UTF-8?q?Refactor:=20TimeDAO=EC=9D=98=20insert=20?=
 =?UTF-8?q?=EB=A9=94=EC=86=8C=EB=93=9C=20=EB=B0=98=ED=99=98=20=ED=83=80?=
 =?UTF-8?q?=EC=9E=85=EC=9D=84=20Long=EC=97=90=EC=84=9C=20Time=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/repository/TimeDAO.java  | 4 ++--
 src/main/java/roomescape/service/TimeService.java | 5 +----
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/main/java/roomescape/repository/TimeDAO.java b/src/main/java/roomescape/repository/TimeDAO.java
index b26085143..5be6ecc49 100644
--- a/src/main/java/roomescape/repository/TimeDAO.java
+++ b/src/main/java/roomescape/repository/TimeDAO.java
@@ -19,7 +19,7 @@ public TimeDAO(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
 
-    public Long insert(Time time) {
+    public Time insert(Time time) {
         String sql = "INSERT INTO time (time) VALUES ?";
         KeyHolder keyHolder = new GeneratedKeyHolder();
 
@@ -31,7 +31,7 @@ public Long insert(Time time) {
             return ps;
         }, keyHolder);
 
-        return keyHolder.getKey().longValue();
+        return findById(keyHolder.getKey().longValue()).get();
     }
 
     public List<Time> findAllTimes() {
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
index 9f77c3bec..721e33ccf 100644
--- a/src/main/java/roomescape/service/TimeService.java
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -22,10 +22,7 @@ public TimeResponseDto createTime(TimeSaveRequestDto requestDto) {
             throw new IllegalArgumentException("잘못된 요청입니다.");
         }
 
-        Time time = new Time(requestDto.getTime());
-        Long id = timeDAO.insert(time);
-
-        return new TimeResponseDto(id, time);
+        return new TimeResponseDto(timeDAO.insert(new Time(requestDto.getTime())));
     }
 
     public List<TimeResponseDto> readAllTimes() {

From ea58a57b6bc75b36cf971d6d27677f3ff78f6c4b Mon Sep 17 00:00:00 2001
From: "Park, Sojeong" <sojeong2101@gmail.com>
Date: Tue, 23 Jul 2024 19:13:19 +0900
Subject: [PATCH 7/8] =?UTF-8?q?Refactor:=20TimeService=EC=99=80=20Reservat?=
 =?UTF-8?q?ionService=EC=9D=98=20collect(Collectors.toList())=EB=A5=BC=20t?=
 =?UTF-8?q?oList()=EB=A1=9C=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/service/ReservationService.java | 2 +-
 src/main/java/roomescape/service/TimeService.java        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
index 192424512..3514af37e 100644
--- a/src/main/java/roomescape/service/ReservationService.java
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -38,7 +38,7 @@ public List<ReservationResponseDto> getAllReservations() {
         return reservationDAO.findAllReservations()
                 .stream()
                 .map(ReservationResponseDto::new)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public void deleteReservation(Long id) {
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
index 721e33ccf..aa10fd1bc 100644
--- a/src/main/java/roomescape/service/TimeService.java
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -29,7 +29,7 @@ public List<TimeResponseDto> readAllTimes() {
         return timeDAO.findAllTimes()
                 .stream()
                 .map(TimeResponseDto::new)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     public void deleteTime(Long id) {

From f6949a38802d03d4feb13d4e9b713979aef12318 Mon Sep 17 00:00:00 2001
From: "Park, Sojeong" <sojeong2101@gmail.com>
Date: Wed, 24 Jul 2024 12:53:51 +0900
Subject: [PATCH 8/8] =?UTF-8?q?Refactor:=20TimeDAO=EC=9D=98=20insert()=20?=
 =?UTF-8?q?=EB=A9=94=EC=86=8C=EB=93=9C=20Time=20=EA=B0=9D=EC=B2=B4=20?=
 =?UTF-8?q?=EB=B0=98=ED=99=98=20=EB=B0=A9=EB=B2=95=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/repository/TimeDAO.java         | 3 ++-
 src/main/java/roomescape/service/ReservationService.java | 1 -
 src/main/java/roomescape/service/TimeService.java        | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/roomescape/repository/TimeDAO.java b/src/main/java/roomescape/repository/TimeDAO.java
index 5be6ecc49..0da586195 100644
--- a/src/main/java/roomescape/repository/TimeDAO.java
+++ b/src/main/java/roomescape/repository/TimeDAO.java
@@ -31,7 +31,8 @@ public Time insert(Time time) {
             return ps;
         }, keyHolder);
 
-        return findById(keyHolder.getKey().longValue()).get();
+        Long id = keyHolder.getKey().longValue();
+        return new Time(id, time.getTime());
     }
 
     public List<Time> findAllTimes() {
diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
index 3514af37e..70c79ee84 100644
--- a/src/main/java/roomescape/service/ReservationService.java
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -1,7 +1,6 @@
 package roomescape.service;
 
 import java.util.List;
-import java.util.stream.Collectors;
 import org.springframework.stereotype.Service;
 import roomescape.domain.Reservation;
 import roomescape.dto.ReservationResponseDto;
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
index aa10fd1bc..afcd00c25 100644
--- a/src/main/java/roomescape/service/TimeService.java
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -1,7 +1,6 @@
 package roomescape.service;
 
 import java.util.List;
-import java.util.stream.Collectors;
 import org.springframework.stereotype.Service;
 import roomescape.domain.Time;
 import roomescape.dto.TimeResponseDto;