From e85c1f7d552135c7a53833a9a633a6e473b30bc5 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Mon, 25 Nov 2024 20:55:05 +0900
Subject: [PATCH 01/34] =?UTF-8?q?refactor(MissionStepTest):=20[8=EB=8B=A8?=
 =?UTF-8?q?=EA=B3=84]=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 2e07a41ec..e3ac7a35b 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -157,4 +157,29 @@ public class MissionStepTest {
         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 d9debfd66439d884f7547f16d9e29211445d5bd2 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Mon, 25 Nov 2024 20:55:52 +0900
Subject: [PATCH 02/34] =?UTF-8?q?feat(schema.sql):=20[8=EB=8B=A8=EA=B3=84]?=
 =?UTF-8?q?=20time=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EB=B2=A0=EC=9D=B4?=
 =?UTF-8?q?=EC=8A=A4=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/schema.sql | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index f78ddcf8c..029290021 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -3,5 +3,12 @@ CREATE TABLE RESERVATION
     id   BIGINT PRIMARY KEY AUTO_INCREMENT,
     name VARCHAR(50) NOT NULL,
     date VARCHAR(10) NOT NULL, -- yyyy-mm-dd -> 10 글자
-    time VARCHAR(5)  NOT NULL -- hh-mm -> 5 글자
+    time VARCHAR(5)  NOT NULL  -- hh-mm -> 5 글자
 );
+
+CREATE TABLE time
+(
+    id   BIGINT       NOT NULL AUTO_INCREMENT,
+    time VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id)
+);
\ No newline at end of file

From 9a1ea5be6a5f9e1a9290fff4ee0418a5b7ebd7bb Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Mon, 25 Nov 2024 22:00:27 +0900
Subject: [PATCH 03/34] =?UTF-8?q?feat(Time):=20[8=EB=8B=A8=EA=B3=84]=20tim?=
 =?UTF-8?q?e=20=EA=B0=9D=EC=B2=B4=20=ED=81=B4=EB=9E=98=EC=8A=A4=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/model/Time.java | 27 ++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 src/main/java/roomescape/model/Time.java

diff --git a/src/main/java/roomescape/model/Time.java b/src/main/java/roomescape/model/Time.java
new file mode 100644
index 000000000..ed0aafce9
--- /dev/null
+++ b/src/main/java/roomescape/model/Time.java
@@ -0,0 +1,27 @@
+package roomescape.model;
+
+public class Time {
+
+    private Long id;
+    private String time;
+
+    public Time(String time) {
+        this.time = time;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}

From 8f20448f0a4b9ca3a766e76d2f0c4c7229ecff6a Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 02:02:53 +0900
Subject: [PATCH 04/34] =?UTF-8?q?refactor(Reservation=20package):=20[8?=
 =?UTF-8?q?=EB=8B=A8=EA=B3=84]=20=EC=98=88=EC=95=BD=20=EA=B4=80=EB=A0=A8?=
 =?UTF-8?q?=20=EB=8F=84=EB=A9=94=EC=9D=B8=EB=93=A4=EC=9D=84=20=EC=98=88?=
 =?UTF-8?q?=EC=95=BD=20=ED=8C=A8=ED=82=A4=EC=A7=80=EB=A1=9C=20=EC=9D=B4?=
 =?UTF-8?q?=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/roomescape/controller/ReservationController.java   | 6 +++---
 .../roomescape/model/{ => reservation}/Reservation.java     | 2 +-
 .../model/{ => reservation}/ReservationRepository.java      | 2 +-
 .../model/{ => reservation}/ReservationRequest.java         | 2 +-
 .../model/{ => reservation}/ReservationService.java         | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)
 rename src/main/java/roomescape/model/{ => reservation}/Reservation.java (93%)
 rename src/main/java/roomescape/model/{ => reservation}/ReservationRepository.java (96%)
 rename src/main/java/roomescape/model/{ => reservation}/ReservationRequest.java (92%)
 rename src/main/java/roomescape/model/{ => reservation}/ReservationService.java (98%)

diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
index 355e5facb..5e3b8faa5 100644
--- a/src/main/java/roomescape/controller/ReservationController.java
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -4,9 +4,9 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import roomescape.model.Reservation;
-import roomescape.model.ReservationRequest;
-import roomescape.model.ReservationService;
+import roomescape.model.reservation.Reservation;
+import roomescape.model.reservation.ReservationRequest;
+import roomescape.model.reservation.ReservationService;
 
 import java.util.List;
 
diff --git a/src/main/java/roomescape/model/Reservation.java b/src/main/java/roomescape/model/reservation/Reservation.java
similarity index 93%
rename from src/main/java/roomescape/model/Reservation.java
rename to src/main/java/roomescape/model/reservation/Reservation.java
index 3f4630d99..5f1b4de77 100644
--- a/src/main/java/roomescape/model/Reservation.java
+++ b/src/main/java/roomescape/model/reservation/Reservation.java
@@ -1,4 +1,4 @@
-package roomescape.model;
+package roomescape.model.reservation;
 
 public class Reservation {
 
diff --git a/src/main/java/roomescape/model/ReservationRepository.java b/src/main/java/roomescape/model/reservation/ReservationRepository.java
similarity index 96%
rename from src/main/java/roomescape/model/ReservationRepository.java
rename to src/main/java/roomescape/model/reservation/ReservationRepository.java
index c41da2937..2368fd22a 100644
--- a/src/main/java/roomescape/model/ReservationRepository.java
+++ b/src/main/java/roomescape/model/reservation/ReservationRepository.java
@@ -1,4 +1,4 @@
-package roomescape.model;
+package roomescape.model.reservation;
 
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
diff --git a/src/main/java/roomescape/model/ReservationRequest.java b/src/main/java/roomescape/model/reservation/ReservationRequest.java
similarity index 92%
rename from src/main/java/roomescape/model/ReservationRequest.java
rename to src/main/java/roomescape/model/reservation/ReservationRequest.java
index baeab676e..62c8c7318 100644
--- a/src/main/java/roomescape/model/ReservationRequest.java
+++ b/src/main/java/roomescape/model/reservation/ReservationRequest.java
@@ -1,4 +1,4 @@
-package roomescape.model;
+package roomescape.model.reservation;
 
 public class ReservationRequest {
     private String name;
diff --git a/src/main/java/roomescape/model/ReservationService.java b/src/main/java/roomescape/model/reservation/ReservationService.java
similarity index 98%
rename from src/main/java/roomescape/model/ReservationService.java
rename to src/main/java/roomescape/model/reservation/ReservationService.java
index 6de9013c3..9a56add95 100644
--- a/src/main/java/roomescape/model/ReservationService.java
+++ b/src/main/java/roomescape/model/reservation/ReservationService.java
@@ -1,4 +1,4 @@
-package roomescape.model;
+package roomescape.model.reservation;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;

From 2eb8035549e66c627834b95afb321641da0b521c Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 02:03:32 +0900
Subject: [PATCH 05/34] =?UTF-8?q?feat(TimeRequest):=20[8=EB=8B=A8=EA=B3=84?=
 =?UTF-8?q?]=20=EC=98=88=EC=95=BD=20=EC=8B=9C=EA=B0=84=20=EC=9A=94?=
 =?UTF-8?q?=EC=B2=AD=EC=97=90=20=EC=82=AC=EC=9A=A9=ED=95=A0=20DTO=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/model/time/TimeRequest.java    | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 src/main/java/roomescape/model/time/TimeRequest.java

diff --git a/src/main/java/roomescape/model/time/TimeRequest.java b/src/main/java/roomescape/model/time/TimeRequest.java
new file mode 100644
index 000000000..e3692f32e
--- /dev/null
+++ b/src/main/java/roomescape/model/time/TimeRequest.java
@@ -0,0 +1,19 @@
+package roomescape.model.time;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class TimeRequest {
+    @JsonProperty("time")
+    private String time;
+
+    public TimeRequest() {
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}

From ab272cdd740e2930b490c2d26eedaf5f39f674ef Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 02:03:54 +0900
Subject: [PATCH 06/34] =?UTF-8?q?refactor(Time):=20[8=EB=8B=A8=EA=B3=84]?=
 =?UTF-8?q?=20=ED=8C=A8=ED=82=A4=EC=A7=80=20=EC=9D=B4=EB=8F=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/model/{ => time}/Time.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename src/main/java/roomescape/model/{ => time}/Time.java (92%)

diff --git a/src/main/java/roomescape/model/Time.java b/src/main/java/roomescape/model/time/Time.java
similarity index 92%
rename from src/main/java/roomescape/model/Time.java
rename to src/main/java/roomescape/model/time/Time.java
index ed0aafce9..f931e94d2 100644
--- a/src/main/java/roomescape/model/Time.java
+++ b/src/main/java/roomescape/model/time/Time.java
@@ -1,4 +1,4 @@
-package roomescape.model;
+package roomescape.model.time;
 
 public class Time {
 

From 2d600abd16d430eb2caed8e7c66795c44b44228e Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 02:04:31 +0900
Subject: [PATCH 07/34] =?UTF-8?q?feat(TimeController):=20[8=EB=8B=A8?=
 =?UTF-8?q?=EA=B3=84]=20=EC=8B=9C=EA=B0=84=20=EC=B6=94=EA=B0=80=20API=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
new file mode 100644
index 000000000..79a299297
--- /dev/null
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -0,0 +1,45 @@
+package roomescape.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import roomescape.model.time.Time;
+import roomescape.model.time.TimeRequest;
+
+import java.sql.PreparedStatement;
+
+@Controller
+public class TimeController {
+    private final JdbcTemplate jdbcTemplate;
+
+    public TimeController(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    @PostMapping("/times")
+    public ResponseEntity<Time> createTimes(@RequestBody TimeRequest timeRequest) {
+        Time time = new Time(timeRequest.getTime());
+
+        String sql = "INSERT INTO time (time) VALUES (?)";
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(sql, new String[]{"id"});
+            ps.setString(1, time.getTime());
+            return ps;
+        }, keyHolder);
+
+        Number generatedId = keyHolder.getKey();
+        if (generatedId != null) {
+            time.setId(generatedId.longValue());
+        }
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .header("Location", "/times/" + time.getId())
+                .body(time);
+    }
+}

From 156607aee0d1b07ae64335430df8c5bffbbfd54e Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 02:19:52 +0900
Subject: [PATCH 08/34] =?UTF-8?q?feat(TimeController):=20[8=EB=8B=A8?=
 =?UTF-8?q?=EA=B3=84]=20=EC=8B=9C=EA=B0=84=20=EC=A1=B0=ED=9A=8C=20API=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/controller/TimeController.java | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
index 79a299297..2ee01da1c 100644
--- a/src/main/java/roomescape/controller/TimeController.java
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -3,15 +3,21 @@
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 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.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.ResponseBody;
 import roomescape.model.time.Time;
 import roomescape.model.time.TimeRequest;
 
 import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.List;
 
 @Controller
 public class TimeController {
@@ -20,6 +26,21 @@ public class TimeController {
     public TimeController(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
+    @GetMapping("/times")
+    @ResponseBody
+    public List<Time> getTimes() {
+        String sql = "SELECT * FROM time";
+        return jdbcTemplate.query(sql, new TimeRowMapper());
+    }
+
+    private static class TimeRowMapper implements RowMapper<Time> {
+        @Override
+        public Time mapRow(ResultSet rs,  int rowNum) throws SQLException {
+            Time time = new Time(rs.getString("time"));
+            time.setId(rs.getLong("id"));
+            return time;
+        }
+    }
 
     @PostMapping("/times")
     public ResponseEntity<Time> createTimes(@RequestBody TimeRequest timeRequest) {

From 9ab28f4151eff7566db4fbe0a5e078cfdb4279aa Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 02:28:16 +0900
Subject: [PATCH 09/34] =?UTF-8?q?feat(TimeController):=20[8=EB=8B=A8?=
 =?UTF-8?q?=EA=B3=84]=20=EC=8B=9C=EA=B0=84=20=EC=82=AD=EC=A0=9C=20API=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/roomescape/controller/TimeController.java   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
index 2ee01da1c..59c6b6eb5 100644
--- a/src/main/java/roomescape/controller/TimeController.java
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -7,10 +7,7 @@
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 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;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 import roomescape.model.time.Time;
 import roomescape.model.time.TimeRequest;
 
@@ -26,6 +23,7 @@ public class TimeController {
     public TimeController(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
+
     @GetMapping("/times")
     @ResponseBody
     public List<Time> getTimes() {
@@ -63,4 +61,10 @@ public ResponseEntity<Time> createTimes(@RequestBody TimeRequest timeRequest) {
                 .header("Location", "/times/" + time.getId())
                 .body(time);
     }
+
+    @DeleteMapping("/times/{id}")
+    public ResponseEntity<Void> deleteTime(@PathVariable Long id) {
+        String sql = "DELETE FROM time WHERE id = ?";
+        return ResponseEntity.noContent().build();
+    }
 }

From c1d7d5e091fcdb5504559b7e83bf5a054d9f1e50 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 02:31:36 +0900
Subject: [PATCH 10/34] =?UTF-8?q?refactor(MissionStepTest):=20[8=EB=8B=A8?=
 =?UTF-8?q?=EA=B3=84]=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20'=ED=8C=94=EB=8B=A8=EA=B3=84'=20=EC=B6=94=EA=B0=80(=ED=86=B5?=
 =?UTF-8?q?=EA=B3=BC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/roomescape/MissionStepTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index e3ac7a35b..d6f3d05ec 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -7,7 +7,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.DirtiesContext;
-import roomescape.model.Reservation;
+import roomescape.model.reservation.Reservation;
 
 import java.sql.Connection;
 import java.sql.SQLException;
@@ -181,5 +181,4 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(204);
     }
-
 }

From 7e4316d9eeb9035fe29b257197fd53a44d86db03 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 02:35:25 +0900
Subject: [PATCH 11/34] =?UTF-8?q?refactor(schema.sql):=20[9=EB=8B=A8?=
 =?UTF-8?q?=EA=B3=84]=20=ED=85=8C=EC=9D=B4=EB=B8=94=20=EC=8A=A4=ED=82=A4?=
 =?UTF-8?q?=EB=A7=88=20=EC=9E=AC=EC=A0=95=EC=9D=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/schema.sql | 21 ++++++++++++---------
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 029290021..f550359a4 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -1,14 +1,17 @@
-CREATE TABLE RESERVATION
-(
-    id   BIGINT PRIMARY KEY AUTO_INCREMENT,
-    name VARCHAR(50) NOT NULL,
-    date VARCHAR(10) NOT NULL, -- yyyy-mm-dd -> 10 글자
-    time VARCHAR(5)  NOT NULL  -- hh-mm -> 5 글자
-);
-
 CREATE TABLE time
 (
     id   BIGINT       NOT NULL AUTO_INCREMENT,
     time VARCHAR(255) NOT NULL,
     PRIMARY KEY (id)
-);
\ No newline at end of file
+);
+
+CREATE TABLE reservation
+(
+    id   BIGINT PRIMARY KEY AUTO_INCREMENT,
+    name VARCHAR(255) NOT NULL,
+    date VARCHAR(255) NOT NULL,
+    time_id BIGINT,
+    PRIMARY KEY (id),
+    FOREIGN KEY (time_id) REFERENCES time(id)
+);
+

From 24fb51ce7df503b41ed35bfa4f7051bb8c141d7a Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 13:57:34 +0900
Subject: [PATCH 12/34] =?UTF-8?q?refactor(ReservationRepository):=20[9?=
 =?UTF-8?q?=EB=8B=A8=EA=B3=84]=20=EC=98=88=EC=95=BD=20=EC=BF=BC=EB=A6=AC?=
 =?UTF-8?q?=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reservation/ReservationRepository.java    | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/src/main/java/roomescape/model/reservation/ReservationRepository.java b/src/main/java/roomescape/model/reservation/ReservationRepository.java
index 2368fd22a..4a7997167 100644
--- a/src/main/java/roomescape/model/reservation/ReservationRepository.java
+++ b/src/main/java/roomescape/model/reservation/ReservationRepository.java
@@ -3,6 +3,7 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
+import roomescape.model.time.Time;
 
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -17,15 +18,35 @@ public ReservationRepository(JdbcTemplate jdbcTemplate) {
     }
 
     public List<Reservation> findAll() {
-        String sql = "SELECT * FROM reservation";
+        String sql = """
+            SELECT 
+                r.id as reservation_id, 
+                r.name, 
+                r.date, 
+                t.id as time_id, 
+                t.time as time_value 
+            FROM reservation as r 
+            INNER JOIN time as t ON r.time_id = t.id
+        """;
+
         return jdbcTemplate.query(sql, new ReservationRowMapper());
     }
 
     private static class ReservationRowMapper implements RowMapper<Reservation> {
         @Override
         public Reservation mapRow(ResultSet rs, int rowNum) throws SQLException {
-            Reservation reservation = new Reservation(rs.getString("name"), rs.getString("date"), rs.getString("time"));
-            reservation.setId(rs.getLong("id"));
+
+            Long timeId  = rs.getLong("time_id");
+            String timeValue = rs.getString("time_value");
+
+            Time time = new Time(timeValue);
+
+            Reservation reservation = new Reservation(
+                    rs.getString("name"),
+                    rs.getString("date"),
+                    time
+            );
+            reservation.setId(rs.getLong("reservation_id"));
             return reservation;
         }
     }

From a3c0efac920e49ebbe3257ec350508409099cb5a Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 13:58:55 +0900
Subject: [PATCH 13/34] =?UTF-8?q?refactor(Reservation):=20[9=EB=8B=A8?=
 =?UTF-8?q?=EA=B3=84]=20=EC=8B=9C=EA=B0=84=20=ED=83=80=EC=9E=85=20String?=
 =?UTF-8?q?=20=EC=97=90=EC=84=9C=20=EA=B0=9D=EC=B2=B4=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/roomescape/model/reservation/Reservation.java    | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/roomescape/model/reservation/Reservation.java b/src/main/java/roomescape/model/reservation/Reservation.java
index 5f1b4de77..5ec37ac47 100644
--- a/src/main/java/roomescape/model/reservation/Reservation.java
+++ b/src/main/java/roomescape/model/reservation/Reservation.java
@@ -1,13 +1,15 @@
 package roomescape.model.reservation;
 
+import roomescape.model.time.Time;
+
 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;
@@ -29,7 +31,7 @@ public String getDate() {
         return date;
     }
 
-    public String getTime() {
+    public Time getTime() {
         return time;
     }
 }

From c8ff013350bd895dda21b912bcd4283fbd508532 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 13:59:08 +0900
Subject: [PATCH 14/34] =?UTF-8?q?refactor(ReservationRequest):=20[9?=
 =?UTF-8?q?=EB=8B=A8=EA=B3=84]=20=EC=8B=9C=EA=B0=84=20=ED=83=80=EC=9E=85?=
 =?UTF-8?q?=20String=20=EC=97=90=EC=84=9C=20=EA=B0=9D=EC=B2=B4=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/model/reservation/ReservationRequest.java  | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/java/roomescape/model/reservation/ReservationRequest.java b/src/main/java/roomescape/model/reservation/ReservationRequest.java
index 62c8c7318..3f622d3da 100644
--- a/src/main/java/roomescape/model/reservation/ReservationRequest.java
+++ b/src/main/java/roomescape/model/reservation/ReservationRequest.java
@@ -1,11 +1,13 @@
 package roomescape.model.reservation;
 
+import roomescape.model.time.Time;
+
 public class ReservationRequest {
     private String name;
     private String date;
-    private String time;
+    private Time time;
 
-    public ReservationRequest(String name, String date, String time) {
+    public ReservationRequest(String name, String date, Time time) {
         this.name = name;
         this.date = date;
         this.time = time;
@@ -19,7 +21,7 @@ public String getDate() {
         return date;
     }
 
-    public String getTime() {
+    public Time getTime() {
         return time;
     }
 }

From 66d0038d21e6f21f7c4721a1ec5cdb7814f933d1 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 13:59:23 +0900
Subject: [PATCH 15/34] =?UTF-8?q?refactor(ReservationService):=20[9?=
 =?UTF-8?q?=EB=8B=A8=EA=B3=84]=20=EC=8B=9C=EA=B0=84=20=ED=83=80=EC=9E=85?=
 =?UTF-8?q?=20String=20=EC=97=90=EC=84=9C=20=EA=B0=9D=EC=B2=B4=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/reservation/ReservationService.java     | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/src/main/java/roomescape/model/reservation/ReservationService.java b/src/main/java/roomescape/model/reservation/ReservationService.java
index 9a56add95..962b5ca6e 100644
--- a/src/main/java/roomescape/model/reservation/ReservationService.java
+++ b/src/main/java/roomescape/model/reservation/ReservationService.java
@@ -7,6 +7,7 @@
 import org.springframework.stereotype.Service;
 import roomescape.exception.InvalidReservationParameterException;
 import roomescape.exception.NotFoundReservationException;
+import roomescape.model.time.Time;
 
 import java.sql.PreparedStatement;
 import java.util.List;
@@ -29,20 +30,26 @@ public List<Reservation> getAllReservations() {
     public Reservation addReservation(ReservationRequest reservationRequest) {
         if (reservationRequest.getName() == null || reservationRequest.getName().isEmpty() ||
                 reservationRequest.getDate() == null || reservationRequest.getDate().isEmpty() ||
-                reservationRequest.getTime() == null || reservationRequest.getTime().isEmpty()) {
+                reservationRequest.getTime() == null) {
             throw new InvalidReservationParameterException("예약 내용에 누락된 부분이 있습니다.");
         }
 
-        Reservation reservation = new Reservation(reservationRequest.getName(), reservationRequest.getDate(),reservationRequest.getTime());
+        Time time = reservationRequest.getTime();
 
-        String sql = "INSERT INTO reservation (name,date,time) VALUES (?,?,?)";
+        Reservation reservation = new Reservation(
+                reservationRequest.getName(),
+                reservationRequest.getDate(),
+                time
+        );
+
+        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.setString(2, reservation.getDate());
-            ps.setString(3, reservation.getTime());
+            ps.setLong(3, time.getId());
             return ps;
         }, keyHolder);
 

From 2d067f7764445f32383f76951b4354a632c70e39 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 13:59:46 +0900
Subject: [PATCH 16/34] =?UTF-8?q?refactor(TimeController):=20[9=EB=8B=A8?=
 =?UTF-8?q?=EA=B3=84]=20=EC=8B=9C=EA=B0=84=20=ED=83=80=EC=9E=85=20String?=
 =?UTF-8?q?=20=EC=97=90=EC=84=9C=20=EA=B0=9D=EC=B2=B4=EB=A1=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/controller/TimeController.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
index 59c6b6eb5..ebf3b6e23 100644
--- a/src/main/java/roomescape/controller/TimeController.java
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -34,7 +34,8 @@ public List<Time> getTimes() {
     private static class TimeRowMapper implements RowMapper<Time> {
         @Override
         public Time mapRow(ResultSet rs,  int rowNum) throws SQLException {
-            Time time = new Time(rs.getString("time"));
+            String timeValue = rs.getString("time");
+            Time time = new Time(timeValue);
             time.setId(rs.getLong("id"));
             return time;
         }
@@ -42,7 +43,8 @@ public Time mapRow(ResultSet rs,  int rowNum) throws SQLException {
 
     @PostMapping("/times")
     public ResponseEntity<Time> createTimes(@RequestBody TimeRequest timeRequest) {
-        Time time = new Time(timeRequest.getTime());
+        String timeValue = timeRequest.getTime();
+        Time time = new Time(timeValue);
 
         String sql = "INSERT INTO time (time) VALUES (?)";
         KeyHolder keyHolder = new GeneratedKeyHolder();

From 905f8f11d0f98d2b75488e8610d3c5f92463aceb Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 14:01:01 +0900
Subject: [PATCH 17/34] =?UTF-8?q?refactor(Time):=20[9=EB=8B=A8=EA=B3=84]?=
 =?UTF-8?q?=20Property=20=EB=B0=A9=EC=8B=9D=EC=9C=BC=EB=A1=9C=20=EB=A7=A4?=
 =?UTF-8?q?=EA=B0=9C=EB=B3=80=EC=88=98=EB=A5=BC=20=EC=B2=98=EB=9D=BC?=
 =?UTF-8?q?=ED=95=98=EA=B8=B0=20=EC=9C=84=ED=95=B4=20JsonCreator=20?=
 =?UTF-8?q?=EC=96=B4=EB=85=B8=ED=85=8C=EC=9D=B4=EC=85=98=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/model/time/Time.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/roomescape/model/time/Time.java b/src/main/java/roomescape/model/time/Time.java
index f931e94d2..ca7edd30b 100644
--- a/src/main/java/roomescape/model/time/Time.java
+++ b/src/main/java/roomescape/model/time/Time.java
@@ -1,10 +1,13 @@
 package roomescape.model.time;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
+
 public class Time {
 
     private Long id;
     private String time;
 
+    @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
     public Time(String time) {
         this.time = time;
     }

From b5f5bf43bdb592cfaeb6583c05be152620dac2f6 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 14:01:38 +0900
Subject: [PATCH 18/34] =?UTF-8?q?refactor(MissionStepTest):=20[9=EB=8B=A8?=
 =?UTF-8?q?=EA=B3=84]=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20'=EA=B5=AC=EB=8B=A8=EA=B3=84'=20=EC=B6=94=EA=B0=80(=ED=86=B5?=
 =?UTF-8?q?=EA=B3=BC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index d6f3d05ec..c3b08d173 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -181,4 +181,19 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(204);
     }
+
+    @Test
+    void 구단계() {
+        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 688661128a43dcf9ed57f35077a1e811e5a676c4 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 14:05:27 +0900
Subject: [PATCH 19/34] =?UTF-8?q?refactor(MissionStepTest):=20[10=EB=8B=A8?=
 =?UTF-8?q?=EA=B3=84]=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=20'=EC=8B=AD=EB=8B=A8=EA=B3=84'=20=EC=B6=94=EA=B0=80(=ED=86=B5?=
 =?UTF-8?q?=EA=B3=BC)=20-=20=EC=95=9E=EC=84=A0=20=EB=A6=AC=EB=B7=B0?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20=EC=A7=84=ED=96=89=ED=95=9C=20=EB=82=B4?=
 =?UTF-8?q?=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index c3b08d173..53943775d 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -7,8 +7,10 @@
 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.model.reservation.Reservation;
 
+import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -196,4 +198,22 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(400);
     }
+
+    @Autowired
+    private ReservationController reservationController;
+
+    @Test
+    void 십단계() {
+        boolean isJdbcTemplateInjected = false;
+
+        for (Field field : reservationController.getClass().getDeclaredFields()) {
+            if (field.getType().equals(JdbcTemplate.class)) {
+                isJdbcTemplateInjected = true;
+                break;
+            }
+        }
+
+        assertThat(isJdbcTemplateInjected).isFalse();
+    }
+
 }

From 62e8003304669e2268a335b6deb9393cebb6b7a0 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 15:05:24 +0900
Subject: [PATCH 20/34] =?UTF-8?q?refactor(Time):=20=EC=83=9D=EC=84=B1?=
 =?UTF-8?q?=EC=9E=90=EC=97=90=20JsonCreator,=20JsonProperty=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/model/time/Time.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/roomescape/model/time/Time.java b/src/main/java/roomescape/model/time/Time.java
index ca7edd30b..c2f78d3c3 100644
--- a/src/main/java/roomescape/model/time/Time.java
+++ b/src/main/java/roomescape/model/time/Time.java
@@ -1,14 +1,18 @@
 package roomescape.model.time;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class Time {
 
     private Long id;
     private String time;
 
+    public Time() {
+    }
+
     @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
-    public Time(String time) {
+    public Time(@JsonProperty("time") String time) {
         this.time = time;
     }
 

From 8c936b171fd1a831affc578fdabfe0faaa11d262 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 15:06:54 +0900
Subject: [PATCH 21/34] =?UTF-8?q?refactor(TimeController,=20TimeRequest):?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81(ne?=
 =?UTF-8?q?w=20Time()=20->=20toTime())?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/controller/TimeController.java | 2 +-
 src/main/java/roomescape/model/time/TimeRequest.java    | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
index ebf3b6e23..1ef65d6b3 100644
--- a/src/main/java/roomescape/controller/TimeController.java
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -44,7 +44,7 @@ public Time mapRow(ResultSet rs,  int rowNum) throws SQLException {
     @PostMapping("/times")
     public ResponseEntity<Time> createTimes(@RequestBody TimeRequest timeRequest) {
         String timeValue = timeRequest.getTime();
-        Time time = new Time(timeValue);
+        Time time = timeRequest.toTime();
 
         String sql = "INSERT INTO time (time) VALUES (?)";
         KeyHolder keyHolder = new GeneratedKeyHolder();
diff --git a/src/main/java/roomescape/model/time/TimeRequest.java b/src/main/java/roomescape/model/time/TimeRequest.java
index e3692f32e..cecb2cf66 100644
--- a/src/main/java/roomescape/model/time/TimeRequest.java
+++ b/src/main/java/roomescape/model/time/TimeRequest.java
@@ -3,6 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 public class TimeRequest {
+
     @JsonProperty("time")
     private String time;
 
@@ -16,4 +17,8 @@ public String getTime() {
     public void setTime(String time) {
         this.time = time;
     }
+
+    public Time toTime() {
+        return new Time(this.time);
+    }
 }

From b92587b958747998569bae42edf6bde3c82c56ad Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 15:08:08 +0900
Subject: [PATCH 22/34] =?UTF-8?q?refactor(Reservation,=20ReservationContro?=
 =?UTF-8?q?ller):=20=EC=BD=94=EB=93=9C=20=EB=A6=AC=ED=8C=A9=ED=86=A0?=
 =?UTF-8?q?=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/controller/ReservationController.java |  2 +-
 .../roomescape/model/reservation/Reservation.java    | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
index 5e3b8faa5..1560c15f6 100644
--- a/src/main/java/roomescape/controller/ReservationController.java
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -21,7 +21,7 @@ public ReservationController(ReservationService reservationService) {
 
     @GetMapping("/reservation")
     public String reservationPage() {
-        return "reservation";
+        return "new-reservation";
     }
 
     @GetMapping("/reservations")
diff --git a/src/main/java/roomescape/model/reservation/Reservation.java b/src/main/java/roomescape/model/reservation/Reservation.java
index 5ec37ac47..de549a602 100644
--- a/src/main/java/roomescape/model/reservation/Reservation.java
+++ b/src/main/java/roomescape/model/reservation/Reservation.java
@@ -27,6 +27,18 @@ public String getName() {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public void setTime(Time time) {
+        this.time = time;
+    }
+
     public String getDate() {
         return date;
     }

From c4e8b2f3419de58c3c2c1a1d80967f0770102b92 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 15:09:41 +0900
Subject: [PATCH 23/34] =?UTF-8?q?feat(data.sql):=20=EC=8B=9C=EA=B0=84=20?=
 =?UTF-8?q?=EB=8D=B0=EC=9D=B4=ED=84=B0=20=EC=9E=84=EC=9D=98=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/data.sql | 9 +++++++++
 1 file changed, 9 insertions(+)
 create mode 100644 src/main/resources/data.sql

diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
new file mode 100644
index 000000000..6c3eb92ae
--- /dev/null
+++ b/src/main/resources/data.sql
@@ -0,0 +1,9 @@
+INSERT INTO time (time)
+VALUES ('10:00'),
+       ('11:30'),
+       ('13:00'),
+       ('14:30'),
+       ('16:00'),
+       ('17:30'),
+       ('19:00'),
+       ('20:30');

From be9d153d809bfeb150f92353ff1a60e0eeecab03 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Tue, 26 Nov 2024 15:48:50 +0900
Subject: [PATCH 24/34] =?UTF-8?q?refactor(MissionStepTest,=20data.sql):=20?=
 =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD(=EC=8B=9C=EA=B0=84=20=EB=8D=B0=EC=9D=B4=ED=84=B0=20?=
 =?UTF-8?q?=EC=88=98=EB=8F=99=20=EC=83=9D=EC=84=B1=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B8=ED=95=9C=20id=20=EA=B0=92=20=EB=B6=88=EC=9D=BC?=
 =?UTF-8?q?=EC=B9=98,=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EC=BD=94=EB=93=9C?=
 =?UTF-8?q?=EC=9A=A9=20=EC=8B=9C=EA=B0=84(15:30)=20=EC=B6=94=EA=B0=80)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/data.sql                   | 1 +
 src/test/java/roomescape/MissionStepTest.java | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
index 6c3eb92ae..fb6478cc7 100644
--- a/src/main/resources/data.sql
+++ b/src/main/resources/data.sql
@@ -5,5 +5,6 @@ VALUES ('10:00'),
        ('14:30'),
        ('16:00'),
        ('17:30'),
+       ('15:40'),
        ('19:00'),
        ('20:30');
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 53943775d..72e7eaeee 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -170,16 +170,16 @@ public class MissionStepTest {
                 .when().post("/times")
                 .then().log().all()
                 .statusCode(201)
-                .header("Location", "/times/1");
+                .header("Location", "/times/10");
 
         RestAssured.given().log().all()
                 .when().get("/times")
                 .then().log().all()
                 .statusCode(200)
-                .body("size()", is(1));
+                .body("size()", is(10));
 
         RestAssured.given().log().all()
-                .when().delete("/times/1")
+                .when().delete("/times/10")
                 .then().log().all()
                 .statusCode(204);
     }

From 4915b5b068d5dd3e4a929ec7ac3036dc57778e5b Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Wed, 27 Nov 2024 15:19:23 +0900
Subject: [PATCH 25/34] =?UTF-8?q?refactor:=20=EB=AF=B8=EC=82=AC=EC=9A=A9,?=
 =?UTF-8?q?=20=EB=B6=88=ED=95=84=EC=9A=94,=20=EC=A4=91=EB=B3=B5=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=82=AD=EC=A0=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/reservation/Reservation.java           | 16 ++++++++--------
 .../model/reservation/ReservationRepository.java |  2 +-
 src/main/resources/application.properties        |  5 +----
 src/main/resources/data.sql                      | 10 ----------
 src/test/java/roomescape/MissionStepTest.java    |  7 ++++---
 5 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 src/main/resources/data.sql

diff --git a/src/main/java/roomescape/model/reservation/Reservation.java b/src/main/java/roomescape/model/reservation/Reservation.java
index de549a602..19d49ac5d 100644
--- a/src/main/java/roomescape/model/reservation/Reservation.java
+++ b/src/main/java/roomescape/model/reservation/Reservation.java
@@ -31,19 +31,19 @@ public void setName(String name) {
         this.name = name;
     }
 
-    public void setDate(String date) {
-        this.date = date;
-    }
-
-    public void setTime(Time time) {
-        this.time = time;
-    }
-
     public String getDate() {
         return date;
     }
 
+    public void setDate(String date) {
+        this.date = date;
+    }
+
     public Time getTime() {
         return time;
     }
+
+    public void setTime(Time time) {
+        this.time = time;
+    }
 }
diff --git a/src/main/java/roomescape/model/reservation/ReservationRepository.java b/src/main/java/roomescape/model/reservation/ReservationRepository.java
index 4a7997167..c771194e1 100644
--- a/src/main/java/roomescape/model/reservation/ReservationRepository.java
+++ b/src/main/java/roomescape/model/reservation/ReservationRepository.java
@@ -36,7 +36,7 @@ private static class ReservationRowMapper implements RowMapper<Reservation> {
         @Override
         public Reservation mapRow(ResultSet rs, int rowNum) throws SQLException {
 
-            Long timeId  = rs.getLong("time_id");
+//            Long timeId  = rs.getLong("time_id");
             String timeValue = rs.getString("time_value");
 
             Time time = new Time(timeValue);
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index 9938a2d27..b63619d73 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,6 +1,3 @@
-# h2-console
 spring.h2.console.enabled=true
 spring.h2.console.path=/h2-console
-# db url
-# h2 -> database
-spring.datasource.url=jdbc:h2:mem:database
\ No newline at end of file
+spring.datasource.url=jdbc:h2:mem:database
diff --git a/src/main/resources/data.sql b/src/main/resources/data.sql
deleted file mode 100644
index fb6478cc7..000000000
--- a/src/main/resources/data.sql
+++ /dev/null
@@ -1,10 +0,0 @@
-INSERT INTO time (time)
-VALUES ('10:00'),
-       ('11:30'),
-       ('13:00'),
-       ('14:30'),
-       ('16:00'),
-       ('17:30'),
-       ('15:40'),
-       ('19:00'),
-       ('20:30');
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 72e7eaeee..63f493db2 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -170,20 +170,21 @@ public class MissionStepTest {
                 .when().post("/times")
                 .then().log().all()
                 .statusCode(201)
-                .header("Location", "/times/10");
+                .header("Location", "/times/1");
 
         RestAssured.given().log().all()
                 .when().get("/times")
                 .then().log().all()
                 .statusCode(200)
-                .body("size()", is(10));
+                .body("size()", is(1));
 
         RestAssured.given().log().all()
-                .when().delete("/times/10")
+                .when().delete("/times/1")
                 .then().log().all()
                 .statusCode(204);
     }
 
+
     @Test
     void 구단계() {
         Map<String, String> reservation = new HashMap<>();

From bdc553fcbf1b9bcbe065a85f7be078186104fb73 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Wed, 27 Nov 2024 15:23:02 +0900
Subject: [PATCH 26/34] =?UTF-8?q?refactor(HomeController):=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=20=EA=B4=80=EB=A6=AC=20=ED=8E=98=EC=9D=B4=EC=A7=80?=
 =?UTF-8?q?=EB=A5=BC=20=EB=9D=84=EC=9A=B0=EB=8A=94=20GetMapping=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/controller/HomeController.java | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/main/java/roomescape/controller/HomeController.java b/src/main/java/roomescape/controller/HomeController.java
index 7bd5528df..eb38d161d 100644
--- a/src/main/java/roomescape/controller/HomeController.java
+++ b/src/main/java/roomescape/controller/HomeController.java
@@ -10,4 +10,9 @@ public class HomeController {
     public String home() {
         return "home";
     }
+
+    @GetMapping("/time")
+    public String time() {
+        return "time";
+    }
 }

From fbed97d045c72b3fa611d0f58259d2beb0fda499 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Wed, 27 Nov 2024 15:25:39 +0900
Subject: [PATCH 27/34] =?UTF-8?q?refactor(ReservationRequest):=20RequestBo?=
 =?UTF-8?q?dy=EB=A5=BC=20=ED=86=B5=ED=95=B4=20=EC=A0=95=EB=B3=B4=EB=A5=BC?=
 =?UTF-8?q?=20=EB=B0=9B=EC=9D=84=20=EB=95=8C=20time=EC=9D=80=20Long=20?=
 =?UTF-8?q?=ED=98=95=EC=9C=BC=EB=A1=9C=20=EB=B0=9B=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/model/reservation/ReservationRequest.java  | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/src/main/java/roomescape/model/reservation/ReservationRequest.java b/src/main/java/roomescape/model/reservation/ReservationRequest.java
index 3f622d3da..43b5d3b6d 100644
--- a/src/main/java/roomescape/model/reservation/ReservationRequest.java
+++ b/src/main/java/roomescape/model/reservation/ReservationRequest.java
@@ -1,13 +1,11 @@
 package roomescape.model.reservation;
 
-import roomescape.model.time.Time;
-
 public class ReservationRequest {
     private String name;
     private String date;
-    private Time time;
+    private Long time;
 
-    public ReservationRequest(String name, String date, Time time) {
+    public ReservationRequest(String name, String date, Long time) {
         this.name = name;
         this.date = date;
         this.time = time;
@@ -21,7 +19,7 @@ public String getDate() {
         return date;
     }
 
-    public Time getTime() {
+    public Long getTime() {
         return time;
     }
 }

From c9737cda21f607a670504423ca82a51e5ad5807f Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Thu, 28 Nov 2024 01:40:36 +0900
Subject: [PATCH 28/34] =?UTF-8?q?refactor(ReservationService):=20timeId?=
 =?UTF-8?q?=EB=A5=BC=20=ED=86=B5=ED=95=B4=20time=EA=B3=BC=20=EB=A7=B5?=
 =?UTF-8?q?=ED=95=91=ED=95=98=EB=8A=94=20=EC=BD=94=EB=93=9C=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/reservation/ReservationService.java         | 11 ++++++++++-
 src/main/java/roomescape/model/time/Time.java         |  5 +++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/roomescape/model/reservation/ReservationService.java b/src/main/java/roomescape/model/reservation/ReservationService.java
index 962b5ca6e..0883e51fd 100644
--- a/src/main/java/roomescape/model/reservation/ReservationService.java
+++ b/src/main/java/roomescape/model/reservation/ReservationService.java
@@ -34,7 +34,8 @@ public Reservation addReservation(ReservationRequest reservationRequest) {
             throw new InvalidReservationParameterException("예약 내용에 누락된 부분이 있습니다.");
         }
 
-        Time time = reservationRequest.getTime();
+        Long timeId = reservationRequest.getTime();
+        Time time = findTimeById(timeId);
 
         Reservation reservation = new Reservation(
                 reservationRequest.getName(),
@@ -60,6 +61,14 @@ public Reservation addReservation(ReservationRequest reservationRequest) {
         return reservation;
     }
 
+    private Time findTimeById(Long timeId) {
+        String sql = "SELECT id, time FROM time WHERE id = ?";
+        return jdbcTemplate.queryForObject(sql, (rs, rowNum) -> new Time(
+                rs.getLong("id"),
+                rs.getString("time")
+        ), timeId);
+    }
+
     public void deleteReservation(Long id) {
         int rowAffected = reservationRepository.deleteById(id);
         if (rowAffected == 0) {
diff --git a/src/main/java/roomescape/model/time/Time.java b/src/main/java/roomescape/model/time/Time.java
index c2f78d3c3..419d7444c 100644
--- a/src/main/java/roomescape/model/time/Time.java
+++ b/src/main/java/roomescape/model/time/Time.java
@@ -16,6 +16,11 @@ public Time(@JsonProperty("time") String time) {
         this.time = time;
     }
 
+    public Time(Long id, String time) {
+        this.id = id;
+        this.time = time;
+    }
+
     public Long getId() {
         return id;
     }

From 304fe1e2a660ae4cd5d120dc01fd9f564d8a1ae9 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Sat, 4 Jan 2025 19:28:55 +0900
Subject: [PATCH 29/34] =?UTF-8?q?[=EC=A3=BC=EC=84=9D=20=EC=A0=95=EB=A6=AC]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/model/reservation/Reservation.java | 5 +----
 src/main/java/roomescape/model/time/Time.java               | 5 +----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/main/java/roomescape/model/reservation/Reservation.java b/src/main/java/roomescape/model/reservation/Reservation.java
index 19d49ac5d..b9e9f49e7 100644
--- a/src/main/java/roomescape/model/reservation/Reservation.java
+++ b/src/main/java/roomescape/model/reservation/Reservation.java
@@ -2,6 +2,7 @@
 
 import roomescape.model.time.Time;
 
+// 예약 관련 데이터베이스 엔티티
 public class Reservation {
 
     private Long id;
@@ -35,10 +36,6 @@ public String getDate() {
         return date;
     }
 
-    public void setDate(String date) {
-        this.date = date;
-    }
-
     public Time getTime() {
         return time;
     }
diff --git a/src/main/java/roomescape/model/time/Time.java b/src/main/java/roomescape/model/time/Time.java
index 419d7444c..6e7be0d34 100644
--- a/src/main/java/roomescape/model/time/Time.java
+++ b/src/main/java/roomescape/model/time/Time.java
@@ -3,14 +3,11 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class Time {
+public class Time { // 도메인-비즈니스에 관련이 있는 경우 이름을 time 으로 해도 좋지만, 데이터베이스와 접근하기 때문에 ReservationTime 으로 고려하기
 
     private Long id;
     private String time;
 
-    public Time() {
-    }
-
     @JsonCreator(mode = JsonCreator.Mode.PROPERTIES)
     public Time(@JsonProperty("time") String time) {
         this.time = time;

From 1da44ff5ed79fceb7cc3ccd33d85bc71b3a48297 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Sat, 4 Jan 2025 19:30:44 +0900
Subject: [PATCH 30/34] =?UTF-8?q?[=EC=A3=BC=EC=84=9D=20=EC=A0=9C=EA=B1=B0]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/controller/CustomerController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/roomescape/controller/CustomerController.java b/src/main/java/roomescape/controller/CustomerController.java
index 22d34a19b..d721b0478 100644
--- a/src/main/java/roomescape/controller/CustomerController.java
+++ b/src/main/java/roomescape/controller/CustomerController.java
@@ -25,7 +25,7 @@ public ResponseEntity<Void> save(@RequestBody Customer customer) {
         return ResponseEntity.ok().build();
     }
 
-    @GetMapping("/customers") // -> customers 라는 파일(경로)을 만든 적이 없는데 코드가 돌아가긴 함..
+    @GetMapping("/customers")
     public ResponseEntity<List<Customer>> list() {
         String sql = "select id, first_name, last_name from customers";
         List<Customer> customers = jdbcTemplate.query(

From 7a9185bac71b51b71de59a690613a8d734bad9ff Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Sat, 4 Jan 2025 19:32:32 +0900
Subject: [PATCH 31/34] refactor: ReservationRequest -> ReservationDTO,
 ReservationRepository -> ReservationDAO

---
 .../controller/ReservationController.java     |  4 ++--
 ...ionRepository.java => ReservationDAO.java} |  5 ++--
 ...vationRequest.java => ReservationDTO.java} |  4 ++--
 .../model/reservation/ReservationService.java | 24 +++++++++----------
 4 files changed, 18 insertions(+), 19 deletions(-)
 rename src/main/java/roomescape/model/reservation/{ReservationRepository.java => ReservationDAO.java} (91%)
 rename src/main/java/roomescape/model/reservation/{ReservationRequest.java => ReservationDTO.java} (78%)

diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
index 1560c15f6..af827cf7a 100644
--- a/src/main/java/roomescape/controller/ReservationController.java
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -5,7 +5,7 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import roomescape.model.reservation.Reservation;
-import roomescape.model.reservation.ReservationRequest;
+import roomescape.model.reservation.ReservationDTO;
 import roomescape.model.reservation.ReservationService;
 
 import java.util.List;
@@ -31,7 +31,7 @@ public List<Reservation> getReservations() {
     }
 
     @PostMapping("/reservations")
-    public ResponseEntity<Reservation> addReservation(@RequestBody ReservationRequest reservationRequest) {
+    public ResponseEntity<Reservation> addReservation(@RequestBody ReservationDTO reservationRequest) {
         Reservation reservation = reservationService.addReservation(reservationRequest);
         return ResponseEntity.status(HttpStatus.CREATED) // status: 201
                 .header("Location", "/reservations/" + reservation.getId())
diff --git a/src/main/java/roomescape/model/reservation/ReservationRepository.java b/src/main/java/roomescape/model/reservation/ReservationDAO.java
similarity index 91%
rename from src/main/java/roomescape/model/reservation/ReservationRepository.java
rename to src/main/java/roomescape/model/reservation/ReservationDAO.java
index c771194e1..d3691530f 100644
--- a/src/main/java/roomescape/model/reservation/ReservationRepository.java
+++ b/src/main/java/roomescape/model/reservation/ReservationDAO.java
@@ -10,10 +10,10 @@
 import java.util.List;
 
 @Repository
-public class ReservationRepository {
+public class ReservationDAO {
     private final JdbcTemplate jdbcTemplate;
 
-    public ReservationRepository(JdbcTemplate jdbcTemplate) {
+    public ReservationDAO(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
 
@@ -36,7 +36,6 @@ private static class ReservationRowMapper implements RowMapper<Reservation> {
         @Override
         public Reservation mapRow(ResultSet rs, int rowNum) throws SQLException {
 
-//            Long timeId  = rs.getLong("time_id");
             String timeValue = rs.getString("time_value");
 
             Time time = new Time(timeValue);
diff --git a/src/main/java/roomescape/model/reservation/ReservationRequest.java b/src/main/java/roomescape/model/reservation/ReservationDTO.java
similarity index 78%
rename from src/main/java/roomescape/model/reservation/ReservationRequest.java
rename to src/main/java/roomescape/model/reservation/ReservationDTO.java
index 43b5d3b6d..df2807870 100644
--- a/src/main/java/roomescape/model/reservation/ReservationRequest.java
+++ b/src/main/java/roomescape/model/reservation/ReservationDTO.java
@@ -1,11 +1,11 @@
 package roomescape.model.reservation;
 
-public class ReservationRequest {
+public class ReservationDTO {
     private String name;
     private String date;
     private Long time;
 
-    public ReservationRequest(String name, String date, Long time) {
+    public ReservationDTO(String name, String date, Long time) {
         this.name = name;
         this.date = date;
         this.time = time;
diff --git a/src/main/java/roomescape/model/reservation/ReservationService.java b/src/main/java/roomescape/model/reservation/ReservationService.java
index 0883e51fd..8f9c60461 100644
--- a/src/main/java/roomescape/model/reservation/ReservationService.java
+++ b/src/main/java/roomescape/model/reservation/ReservationService.java
@@ -15,31 +15,31 @@
 @Service
 public class ReservationService {
     private final JdbcTemplate jdbcTemplate;
-    private final ReservationRepository reservationRepository;
+    private final ReservationDAO reservationDAO;
 
     @Autowired
-    public ReservationService(JdbcTemplate jdbcTemplate, ReservationRepository reservationRepository) {
+    public ReservationService(JdbcTemplate jdbcTemplate, ReservationDAO reservationDAO) {
         this.jdbcTemplate = jdbcTemplate;
-        this.reservationRepository = reservationRepository;
+        this.reservationDAO = reservationDAO;
     }
 
     public List<Reservation> getAllReservations() {
-        return reservationRepository.findAll();
+        return reservationDAO.findAll();
     }
 
-    public Reservation addReservation(ReservationRequest reservationRequest) {
-        if (reservationRequest.getName() == null || reservationRequest.getName().isEmpty() ||
-                reservationRequest.getDate() == null || reservationRequest.getDate().isEmpty() ||
-                reservationRequest.getTime() == null) {
+    public Reservation addReservation(ReservationDTO reservationDTO) {
+        if (reservationDTO.getName() == null || reservationDTO.getName().isEmpty() ||
+                reservationDTO.getDate() == null || reservationDTO.getDate().isEmpty() ||
+                reservationDTO.getTime() == null) {
             throw new InvalidReservationParameterException("예약 내용에 누락된 부분이 있습니다.");
         }
 
-        Long timeId = reservationRequest.getTime();
+        Long timeId = reservationDTO.getTime();
         Time time = findTimeById(timeId);
 
         Reservation reservation = new Reservation(
-                reservationRequest.getName(),
-                reservationRequest.getDate(),
+                reservationDTO.getName(),
+                reservationDTO.getDate(),
                 time
         );
 
@@ -70,7 +70,7 @@ private Time findTimeById(Long timeId) {
     }
 
     public void deleteReservation(Long id) {
-        int rowAffected = reservationRepository.deleteById(id);
+        int rowAffected = reservationDAO.deleteById(id);
         if (rowAffected == 0) {
             throw new NotFoundReservationException("삭제하려는 예약이 없습니다.");
         }

From 446a234fc16f770a100eec6d89bf00412e36a7fc Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Sun, 5 Jan 2025 02:04:52 +0900
Subject: [PATCH 32/34] =?UTF-8?q?feat(NotFoundTimeException):=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=20=EA=B4=80=EB=A0=A8=20=EC=98=88=EC=99=B8=20=ED=81=B4?=
 =?UTF-8?q?=EB=9E=98=EC=8A=A4=20=EC=83=9D=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/roomescape/exception/NotFoundTimeException.java   | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 src/main/java/roomescape/exception/NotFoundTimeException.java

diff --git a/src/main/java/roomescape/exception/NotFoundTimeException.java b/src/main/java/roomescape/exception/NotFoundTimeException.java
new file mode 100644
index 000000000..c9a11ef7b
--- /dev/null
+++ b/src/main/java/roomescape/exception/NotFoundTimeException.java
@@ -0,0 +1,7 @@
+package roomescape.exception;
+
+public class NotFoundTimeException extends RuntimeException {
+    public NotFoundTimeException(String message) {
+        super(message);
+    }
+}

From 52565c95b32210a0d9f5a8289398eb54d8f09343 Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Sun, 5 Jan 2025 02:07:10 +0900
Subject: [PATCH 33/34] =?UTF-8?q?refactor(Reservation):=20=EC=98=88?=
 =?UTF-8?q?=EC=95=BD=20=EA=B4=80=EB=A0=A8=20=EB=A1=9C=EC=A7=81=20=EB=A6=AC?=
 =?UTF-8?q?=ED=8C=A9=ED=86=A0=EB=A7=81(=EB=A0=88=EC=9D=B4=EC=96=B4?=
 =?UTF-8?q?=EB=93=9C=20=EC=95=84=ED=82=A4=ED=85=8D=EC=B2=98=20=EB=B0=98?=
 =?UTF-8?q?=EC=98=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ReservationController.java     |  8 ++--
 .../model/reservation/Reservation.java        |  1 -
 .../model/reservation/ReservationDAO.java     | 40 ++++---------------
 .../model/reservation/ReservationDTO.java     | 14 ++++---
 .../reservation/ReservationRowMapper.java     | 25 ++++++++++++
 .../model/reservation/ReservationService.java | 25 +++++-------
 6 files changed, 55 insertions(+), 58 deletions(-)
 create mode 100644 src/main/java/roomescape/model/reservation/ReservationRowMapper.java

diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
index af827cf7a..0eee60bfc 100644
--- a/src/main/java/roomescape/controller/ReservationController.java
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -13,7 +13,7 @@
 @Controller
 public class ReservationController {
 
-    private ReservationService reservationService;
+    private final ReservationService reservationService;
 
     public ReservationController(ReservationService reservationService) {
         this.reservationService = reservationService;
@@ -31,9 +31,9 @@ public List<Reservation> getReservations() {
     }
 
     @PostMapping("/reservations")
-    public ResponseEntity<Reservation> addReservation(@RequestBody ReservationDTO reservationRequest) {
-        Reservation reservation = reservationService.addReservation(reservationRequest);
-        return ResponseEntity.status(HttpStatus.CREATED) // status: 201
+    public ResponseEntity<Reservation> addReservation(@RequestBody ReservationDTO reservationDTO) {
+        Reservation reservation = reservationService.addReservation(reservationDTO);
+        return ResponseEntity.status(HttpStatus.CREATED)
                 .header("Location", "/reservations/" + reservation.getId())
                 .body(reservation);
     }
diff --git a/src/main/java/roomescape/model/reservation/Reservation.java b/src/main/java/roomescape/model/reservation/Reservation.java
index b9e9f49e7..57689a51b 100644
--- a/src/main/java/roomescape/model/reservation/Reservation.java
+++ b/src/main/java/roomescape/model/reservation/Reservation.java
@@ -2,7 +2,6 @@
 
 import roomescape.model.time.Time;
 
-// 예약 관련 데이터베이스 엔티티
 public class Reservation {
 
     private Long id;
diff --git a/src/main/java/roomescape/model/reservation/ReservationDAO.java b/src/main/java/roomescape/model/reservation/ReservationDAO.java
index d3691530f..610e0a357 100644
--- a/src/main/java/roomescape/model/reservation/ReservationDAO.java
+++ b/src/main/java/roomescape/model/reservation/ReservationDAO.java
@@ -1,12 +1,8 @@
 package roomescape.model.reservation;
 
 import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Repository;
-import roomescape.model.time.Time;
 
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.List;
 
 @Repository
@@ -19,37 +15,17 @@ public ReservationDAO(JdbcTemplate jdbcTemplate) {
 
     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 as r 
-            INNER JOIN time as t ON r.time_id = t.id
-        """;
-
+                    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, new ReservationRowMapper());
     }
 
-    private static class ReservationRowMapper implements RowMapper<Reservation> {
-        @Override
-        public Reservation mapRow(ResultSet rs, int rowNum) throws SQLException {
-
-            String timeValue = rs.getString("time_value");
-
-            Time time = new Time(timeValue);
-
-            Reservation reservation = new Reservation(
-                    rs.getString("name"),
-                    rs.getString("date"),
-                    time
-            );
-            reservation.setId(rs.getLong("reservation_id"));
-            return reservation;
-        }
-    }
-
     public int deleteById(Long id) {
         String sql = "DELETE FROM reservation WHERE id = ?";
         return jdbcTemplate.update(sql, id);
diff --git a/src/main/java/roomescape/model/reservation/ReservationDTO.java b/src/main/java/roomescape/model/reservation/ReservationDTO.java
index df2807870..ef2378229 100644
--- a/src/main/java/roomescape/model/reservation/ReservationDTO.java
+++ b/src/main/java/roomescape/model/reservation/ReservationDTO.java
@@ -1,14 +1,18 @@
 package roomescape.model.reservation;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 public class ReservationDTO {
     private String name;
     private String date;
-    private Long time;
 
-    public ReservationDTO(String name, String date, Long time) {
+    @JsonProperty("time")
+    private Long timeId;
+
+    public ReservationDTO(String name, String date, Long timeId) {
         this.name = name;
         this.date = date;
-        this.time = time;
+        this.timeId = timeId;
     }
 
     public String getName() {
@@ -19,7 +23,7 @@ public String getDate() {
         return date;
     }
 
-    public Long getTime() {
-        return time;
+    public Long getTimeId() {
+        return timeId;
     }
 }
diff --git a/src/main/java/roomescape/model/reservation/ReservationRowMapper.java b/src/main/java/roomescape/model/reservation/ReservationRowMapper.java
new file mode 100644
index 000000000..821ec5dda
--- /dev/null
+++ b/src/main/java/roomescape/model/reservation/ReservationRowMapper.java
@@ -0,0 +1,25 @@
+package roomescape.model.reservation;
+
+import org.springframework.jdbc.core.RowMapper;
+import roomescape.model.time.Time;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class ReservationRowMapper implements RowMapper<Reservation> {
+    @Override
+    public Reservation mapRow(ResultSet rs, int rowNum) throws SQLException {
+
+        String timeValue = rs.getString("time_value");
+
+        Time time = new Time(timeValue);
+
+        Reservation reservation = new Reservation(
+                rs.getString("name"),
+                rs.getString("date"),
+                time
+        );
+        reservation.setId(rs.getLong("reservation_id"));
+        return reservation;
+    }
+}
diff --git a/src/main/java/roomescape/model/reservation/ReservationService.java b/src/main/java/roomescape/model/reservation/ReservationService.java
index 8f9c60461..ce2118922 100644
--- a/src/main/java/roomescape/model/reservation/ReservationService.java
+++ b/src/main/java/roomescape/model/reservation/ReservationService.java
@@ -1,6 +1,5 @@
 package roomescape.model.reservation;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
@@ -8,6 +7,7 @@
 import roomescape.exception.InvalidReservationParameterException;
 import roomescape.exception.NotFoundReservationException;
 import roomescape.model.time.Time;
+import roomescape.model.time.TimeService;
 
 import java.sql.PreparedStatement;
 import java.util.List;
@@ -16,11 +16,12 @@
 public class ReservationService {
     private final JdbcTemplate jdbcTemplate;
     private final ReservationDAO reservationDAO;
+    private final TimeService timeService;
 
-    @Autowired
-    public ReservationService(JdbcTemplate jdbcTemplate, ReservationDAO reservationDAO) {
+    public ReservationService(JdbcTemplate jdbcTemplate, ReservationDAO reservationDAO, TimeService timeService) {
         this.jdbcTemplate = jdbcTemplate;
         this.reservationDAO = reservationDAO;
+        this.timeService = timeService;
     }
 
     public List<Reservation> getAllReservations() {
@@ -30,12 +31,12 @@ public List<Reservation> getAllReservations() {
     public Reservation addReservation(ReservationDTO reservationDTO) {
         if (reservationDTO.getName() == null || reservationDTO.getName().isEmpty() ||
                 reservationDTO.getDate() == null || reservationDTO.getDate().isEmpty() ||
-                reservationDTO.getTime() == null) {
+                reservationDTO.getTimeId() == null) {
             throw new InvalidReservationParameterException("예약 내용에 누락된 부분이 있습니다.");
         }
 
-        Long timeId = reservationDTO.getTime();
-        Time time = findTimeById(timeId);
+        Long timeId = reservationDTO.getTimeId();
+        Time time = timeService.findTimeById(timeId);
 
         Reservation reservation = new Reservation(
                 reservationDTO.getName(),
@@ -43,7 +44,7 @@ public Reservation addReservation(ReservationDTO reservationDTO) {
                 time
         );
 
-        String sql = "INSERT INTO reservation (name,date,time_id) VALUES (?,?,?)";
+        String sql = "INSERT INTO reservation (name, date, time_id) VALUES (?,?,?)";
         KeyHolder keyHolder = new GeneratedKeyHolder();
 
         jdbcTemplate.update(connection -> {
@@ -61,18 +62,10 @@ public Reservation addReservation(ReservationDTO reservationDTO) {
         return reservation;
     }
 
-    private Time findTimeById(Long timeId) {
-        String sql = "SELECT id, time FROM time WHERE id = ?";
-        return jdbcTemplate.queryForObject(sql, (rs, rowNum) -> new Time(
-                rs.getLong("id"),
-                rs.getString("time")
-        ), timeId);
-    }
-
     public void deleteReservation(Long id) {
         int rowAffected = reservationDAO.deleteById(id);
         if (rowAffected == 0) {
-            throw new NotFoundReservationException("삭제하려는 예약이 없습니다.");
+            throw new NotFoundReservationException("삭제하려는 예약이 존재하지 않습니다.");
         }
     }
 }

From 2ec9f44df785e9c3c5a2908a84dafe228635e81d Mon Sep 17 00:00:00 2001
From: sinji <tobeabestns@naver.com>
Date: Sun, 5 Jan 2025 02:08:24 +0900
Subject: [PATCH 34/34] =?UTF-8?q?refactor(Time):=20=EC=8B=9C=EA=B0=84=20?=
 =?UTF-8?q?=EA=B4=80=EB=A0=A8=20=EB=A1=9C=EC=A7=81=20=EB=A6=AC=ED=8C=A9?=
 =?UTF-8?q?=ED=86=A0=EB=A7=81(=EB=A0=88=EC=9D=B4=EC=96=B4=EB=93=9C=20?=
 =?UTF-8?q?=EC=95=84=ED=82=A4=ED=85=8D=EC=B2=98=20=EB=B0=98=EC=98=81)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/controller/TimeController.java | 61 +++++--------------
 src/main/java/roomescape/model/time/Time.java |  3 +-
 .../java/roomescape/model/time/TimeDAO.java   | 25 ++++++++
 .../time/{TimeRequest.java => TimeDTO.java}   |  9 +--
 .../roomescape/model/time/TimeRowMapper.java  | 16 +++++
 .../roomescape/model/time/TimeService.java    | 60 ++++++++++++++++++
 6 files changed, 122 insertions(+), 52 deletions(-)
 create mode 100644 src/main/java/roomescape/model/time/TimeDAO.java
 rename src/main/java/roomescape/model/time/{TimeRequest.java => TimeDTO.java} (64%)
 create mode 100644 src/main/java/roomescape/model/time/TimeRowMapper.java
 create mode 100644 src/main/java/roomescape/model/time/TimeService.java

diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
index 1ef65d6b3..efe13e68d 100644
--- a/src/main/java/roomescape/controller/TimeController.java
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -2,71 +2,40 @@
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-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.Controller;
 import org.springframework.web.bind.annotation.*;
 import roomescape.model.time.Time;
-import roomescape.model.time.TimeRequest;
+import roomescape.model.time.TimeDTO;
+import roomescape.model.time.TimeService;
 
-import java.sql.PreparedStatement;
-import java.sql.ResultSet;
-import java.sql.SQLException;
 import java.util.List;
 
-@Controller
+@RestController
+@RequestMapping("/times")
 public class TimeController {
-    private final JdbcTemplate jdbcTemplate;
 
-    public TimeController(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
+    private final TimeService timeService;
+
+    public TimeController(TimeService timeService) {
+        this.timeService = timeService;
     }
 
-    @GetMapping("/times")
+    @GetMapping
     @ResponseBody
     public List<Time> getTimes() {
-        String sql = "SELECT * FROM time";
-        return jdbcTemplate.query(sql, new TimeRowMapper());
-    }
-
-    private static class TimeRowMapper implements RowMapper<Time> {
-        @Override
-        public Time mapRow(ResultSet rs,  int rowNum) throws SQLException {
-            String timeValue = rs.getString("time");
-            Time time = new Time(timeValue);
-            time.setId(rs.getLong("id"));
-            return time;
-        }
+        return timeService.getAllTimes();
     }
 
-    @PostMapping("/times")
-    public ResponseEntity<Time> createTimes(@RequestBody TimeRequest timeRequest) {
-        String timeValue = timeRequest.getTime();
-        Time time = timeRequest.toTime();
-
-        String sql = "INSERT INTO time (time) VALUES (?)";
-        KeyHolder keyHolder = new GeneratedKeyHolder();
-
-        jdbcTemplate.update(connection -> {
-            PreparedStatement ps = connection.prepareStatement(sql, new String[]{"id"});
-            ps.setString(1, time.getTime());
-            return ps;
-        }, keyHolder);
-
-        Number generatedId = keyHolder.getKey();
-        if (generatedId != null) {
-            time.setId(generatedId.longValue());
-        }
+    @PostMapping
+    public ResponseEntity<Time> addTime(@RequestBody TimeDTO timeDTO) {
+        Time time = timeService.addTime(timeDTO);
         return ResponseEntity.status(HttpStatus.CREATED)
                 .header("Location", "/times/" + time.getId())
                 .body(time);
     }
 
-    @DeleteMapping("/times/{id}")
+    @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteTime(@PathVariable Long id) {
-        String sql = "DELETE FROM time WHERE id = ?";
+        timeService.deleteTime(id);
         return ResponseEntity.noContent().build();
     }
 }
diff --git a/src/main/java/roomescape/model/time/Time.java b/src/main/java/roomescape/model/time/Time.java
index 6e7be0d34..f852f2a56 100644
--- a/src/main/java/roomescape/model/time/Time.java
+++ b/src/main/java/roomescape/model/time/Time.java
@@ -3,8 +3,7 @@
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class Time { // 도메인-비즈니스에 관련이 있는 경우 이름을 time 으로 해도 좋지만, 데이터베이스와 접근하기 때문에 ReservationTime 으로 고려하기
-
+public class Time {
     private Long id;
     private String time;
 
diff --git a/src/main/java/roomescape/model/time/TimeDAO.java b/src/main/java/roomescape/model/time/TimeDAO.java
new file mode 100644
index 000000000..fb1e39a77
--- /dev/null
+++ b/src/main/java/roomescape/model/time/TimeDAO.java
@@ -0,0 +1,25 @@
+package roomescape.model.time;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class TimeDAO {
+    private final JdbcTemplate jdbcTemplate;
+
+    public TimeDAO(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    public List<Time> findAll() {
+        String sql = "SELECT * FROM time";
+        return jdbcTemplate.query(sql, new TimeRowMapper());
+    }
+
+    public int deleteById(Long id) {
+        String sql = "DELETE FROM time WHERE id = ?";
+        return jdbcTemplate.update(sql, id);
+    }
+}
diff --git a/src/main/java/roomescape/model/time/TimeRequest.java b/src/main/java/roomescape/model/time/TimeDTO.java
similarity index 64%
rename from src/main/java/roomescape/model/time/TimeRequest.java
rename to src/main/java/roomescape/model/time/TimeDTO.java
index cecb2cf66..5d39d2efa 100644
--- a/src/main/java/roomescape/model/time/TimeRequest.java
+++ b/src/main/java/roomescape/model/time/TimeDTO.java
@@ -1,13 +1,14 @@
 package roomescape.model.time;
 
+import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class TimeRequest {
-
-    @JsonProperty("time")
+public class TimeDTO {
     private String time;
 
-    public TimeRequest() {
+    @JsonCreator
+    public TimeDTO(@JsonProperty("time") String time) {
+        this.time = time;
     }
 
     public String getTime() {
diff --git a/src/main/java/roomescape/model/time/TimeRowMapper.java b/src/main/java/roomescape/model/time/TimeRowMapper.java
new file mode 100644
index 000000000..edc73e2b7
--- /dev/null
+++ b/src/main/java/roomescape/model/time/TimeRowMapper.java
@@ -0,0 +1,16 @@
+package roomescape.model.time;
+
+import org.springframework.jdbc.core.RowMapper;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class TimeRowMapper implements RowMapper<Time> {
+    @Override
+    public Time mapRow(ResultSet rs, int rowNum) throws SQLException {
+        String timeValue = rs.getString("time");
+        Time time = new Time(timeValue);
+        time.setId(rs.getLong("id"));
+        return time;
+    }
+}
diff --git a/src/main/java/roomescape/model/time/TimeService.java b/src/main/java/roomescape/model/time/TimeService.java
new file mode 100644
index 000000000..bf73069f5
--- /dev/null
+++ b/src/main/java/roomescape/model/time/TimeService.java
@@ -0,0 +1,60 @@
+package roomescape.model.time;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Service;
+import roomescape.exception.NotFoundTimeException;
+
+import java.sql.PreparedStatement;
+import java.util.List;
+
+@Service
+public class TimeService {
+    private final JdbcTemplate jdbcTemplate;
+    private final TimeDAO timeDAO;
+
+    public TimeService(JdbcTemplate jdbcTemplate, TimeDAO timeDAO) {
+        this.jdbcTemplate = jdbcTemplate;
+        this.timeDAO = timeDAO;
+    }
+
+    public List<Time> getAllTimes() {
+        return timeDAO.findAll();
+    }
+
+    public Time addTime(TimeDTO timeDTO) {
+        String timeValue = timeDTO.getTime();
+        Time time = timeDTO.toTime();
+
+        String sql = "INSERT INTO time (time) VALUES (?)";
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(sql, new String[]{"id"});
+            ps.setString(1, time.getTime());
+            return ps;
+        }, keyHolder);
+
+        Number generatedId = keyHolder.getKey();
+        if (generatedId != null) {
+            time.setId(generatedId.longValue());
+        }
+        return time;
+    }
+
+    public void deleteTime(Long id) {
+        int rowAffected = timeDAO.deleteById(id);
+        if (rowAffected == 0) {
+            throw new NotFoundTimeException("삭제하려는 시간이 존재하지 않습니다.");
+        }
+    }
+
+    public Time findTimeById(Long timeId) {
+        String sql = "SELECT * FROM time WHERE id = ?";
+        return jdbcTemplate.queryForObject(sql, (rs, rowNum) -> new Time(
+                rs.getLong("id"),
+                rs.getString("time")
+        ), timeId);
+    }
+}