From 316a28e58396fc6abd3081681fc2d61f0721f828 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 27 Jun 2024 20:21:13 +0900
Subject: [PATCH 01/37] =?UTF-8?q?1=EB=8B=A8=EA=B3=84=20-=20=ED=99=88?=
 =?UTF-8?q?=ED=99=94=EB=A9=B4=20=EA=B5=AC=EC=84=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                                  | 1 +
 src/main/resources/{templates/home.html => static/index.html} | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename src/main/resources/{templates/home.html => static/index.html} (98%)

diff --git a/build.gradle b/build.gradle
index 57267157c..74d35aaaf 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,6 +14,7 @@ repositories {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:5.3.1'
 }
diff --git a/src/main/resources/templates/home.html b/src/main/resources/static/index.html
similarity index 98%
rename from src/main/resources/templates/home.html
rename to src/main/resources/static/index.html
index 7ddf752a6..8724f9086 100644
--- a/src/main/resources/templates/home.html
+++ b/src/main/resources/static/index.html
@@ -20,7 +20,7 @@
       <nav id="sidebar" class="text-white">
         <!-- 로고 영역 -->
         <div class="sidebar-logo p-4">
-          <a href="/">
+          <a href="/static">
             <img src="https://avatars.githubusercontent.com/u/141792611?s=96&v=4" alt="logo" class="img-fluid rounded-circle">
           </a>
         </div>

From 86dcc4d85847d8c33e50c4c22f41163e28c8c468 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 27 Jun 2024 21:23:24 +0900
Subject: [PATCH 02/37] =?UTF-8?q?2=EB=8B=A8=EA=B3=84=20-=20=EC=98=88?=
 =?UTF-8?q?=EC=95=BD=20=EC=A1=B0=ED=9A=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/roomescape/RoomescapeController.java | 33 +++++++++++++++++++
 src/test/java/roomescape/MissionStepTest.java | 15 +++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 src/main/java/roomescape/RoomescapeController.java

diff --git a/src/main/java/roomescape/RoomescapeController.java b/src/main/java/roomescape/RoomescapeController.java
new file mode 100644
index 000000000..91e1b582b
--- /dev/null
+++ b/src/main/java/roomescape/RoomescapeController.java
@@ -0,0 +1,33 @@
+package roomescape;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+public class RoomescapeController {
+
+    private List<Reservation> reservations = new ArrayList<>();
+
+    @GetMapping("/reservation")
+    public String reservation() {
+
+        return "reservation";
+    }
+
+    @GetMapping("/reservations")
+    @ResponseBody
+    public ResponseEntity<List<Reservation>> reservations() {
+        reservations.add(new Reservation(1, "브라운", "2023-01-01", "10:00"));
+        reservations.add(new Reservation(2, "브라운", "2021-01-02", "11:00"));
+        reservations.add(new Reservation(3, "브라운", "2021-01-03", "12:00"));
+
+        return new ResponseEntity<>(reservations, HttpStatus.OK);
+    }
+
+}
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index cf4efbe91..0f1ce65e7 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -5,6 +5,8 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
 
+import static org.hamcrest.Matchers.is;
+
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 public class MissionStepTest {
@@ -16,4 +18,17 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(200);
     }
+    @Test
+    void 이단계() {
+        RestAssured.given().log().all()
+                .when().get("/reservation")
+                .then().log().all()
+                .statusCode(200);
+
+        RestAssured.given().log().all()
+                .when().get("/reservations")
+                .then().log().all()
+                .statusCode(200)
+                .body("size()", is(3)); // 아직 생성 요청이 없으니 Controller에서 임의로 넣어준 Reservation 갯수 만큼 검증하거나 0개임을 확인하세요.
+    }
 }

From 633f3fa087fe203d18090cd22082c249c9d236e1 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 27 Jun 2024 21:50:00 +0900
Subject: [PATCH 03/37] =?UTF-8?q?3=EB=8B=A8=EA=B3=84=20-=20=EC=98=88?=
 =?UTF-8?q?=EC=95=BD=20=EC=B6=94=EA=B0=80/=EC=B7=A8=EC=86=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/roomescape/RoomescapeController.java | 30 ++++++++++++---
 src/test/java/roomescape/MissionStepTest.java | 38 +++++++++++++++++++
 2 files changed, 63 insertions(+), 5 deletions(-)

diff --git a/src/main/java/roomescape/RoomescapeController.java b/src/main/java/roomescape/RoomescapeController.java
index 91e1b582b..fe0fb471f 100644
--- a/src/main/java/roomescape/RoomescapeController.java
+++ b/src/main/java/roomescape/RoomescapeController.java
@@ -1,10 +1,10 @@
 package roomescape;
 
+import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,11 +23,31 @@ public String reservation() {
     @GetMapping("/reservations")
     @ResponseBody
     public ResponseEntity<List<Reservation>> reservations() {
-        reservations.add(new Reservation(1, "브라운", "2023-01-01", "10:00"));
-        reservations.add(new Reservation(2, "브라운", "2021-01-02", "11:00"));
-        reservations.add(new Reservation(3, "브라운", "2021-01-03", "12:00"));
 
         return new ResponseEntity<>(reservations, HttpStatus.OK);
     }
 
+    @PostMapping("/reservations")
+    @ResponseBody
+    public ResponseEntity<Reservation> createReservation( @RequestBody Reservation reservation) {
+        Reservation newReservation = new Reservation(reservations.size() + 1, reservation.getName(), reservation.getDate(), reservation.getTime());
+        reservations.add(newReservation);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Location", "/reservations/" + newReservation.getId());
+        return new ResponseEntity<>(newReservation,headers, HttpStatus.CREATED);
+    }
+
+    @DeleteMapping("/reservations/{id}")
+    @ResponseBody
+    public ResponseEntity<Reservation> deleteReservation(@PathVariable int id){
+        for (Reservation reservation : reservations) {
+            if (reservation.getId() == id) {
+                reservations.remove(reservation);
+                return new ResponseEntity<>(reservation, HttpStatus.NO_CONTENT);
+            }
+        }
+        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+    }
+
 }
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 0f1ce65e7..cbaf72744 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -1,10 +1,14 @@
 package roomescape;
 
 import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.hamcrest.Matchers.is;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@@ -31,4 +35,38 @@ public class MissionStepTest {
                 .statusCode(200)
                 .body("size()", is(3)); // 아직 생성 요청이 없으니 Controller에서 임의로 넣어준 Reservation 갯수 만큼 검증하거나 0개임을 확인하세요.
     }
+
+    @Test
+    void 삼단계() {
+        Map<String, String> params = new HashMap<>();
+        params.put("name", "브라운");
+        params.put("date", "2023-08-05");
+        params.put("time", "15:40");
+
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(params)
+                .when().post("/reservations")
+                .then().log().all()
+                .statusCode(201)
+                .header("Location", "/reservations/1")
+                .body("id", is(1));
+
+        RestAssured.given().log().all()
+                .when().get("/reservations")
+                .then().log().all()
+                .statusCode(200)
+                .body("size()", is(1));
+
+        RestAssured.given().log().all()
+                .when().delete("/reservations/1")
+                .then().log().all()
+                .statusCode(204);
+
+        RestAssured.given().log().all()
+                .when().get("/reservations")
+                .then().log().all()
+                .statusCode(200)
+                .body("size()", is(0));
+    }
 }

From cc436f59e6014cbae4775abdc9256850ca17078e Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 27 Jun 2024 22:21:41 +0900
Subject: [PATCH 04/37] =?UTF-8?q?4=EB=8B=A8=EA=B3=84=20-=20=EC=98=88?=
 =?UTF-8?q?=EC=99=B8=20=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/roomescape/RoomescapeController.java | 14 ++++++++++++-
 src/test/java/roomescape/MissionStepTest.java | 21 +++++++++++++++++++
 2 files changed, 34 insertions(+), 1 deletion(-)

diff --git a/src/main/java/roomescape/RoomescapeController.java b/src/main/java/roomescape/RoomescapeController.java
index fe0fb471f..93362e7e4 100644
--- a/src/main/java/roomescape/RoomescapeController.java
+++ b/src/main/java/roomescape/RoomescapeController.java
@@ -31,6 +31,11 @@ public ResponseEntity<List<Reservation>> reservations() {
     @ResponseBody
     public ResponseEntity<Reservation> createReservation( @RequestBody Reservation reservation) {
         Reservation newReservation = new Reservation(reservations.size() + 1, reservation.getName(), reservation.getDate(), reservation.getTime());
+        if (reservation.getName() == null || reservation.getName().trim().isEmpty() ||
+                reservation.getDate() == null || reservation.getDate().trim().isEmpty() ||
+                reservation.getTime() == null || reservation.getTime().trim().isEmpty()) {
+            throw new IllegalArgumentException("예약 정보가 부족합니다.");
+        }
         reservations.add(newReservation);
 
         HttpHeaders headers = new HttpHeaders();
@@ -47,7 +52,14 @@ public ResponseEntity<Reservation> deleteReservation(@PathVariable int id){
                 return new ResponseEntity<>(reservation, HttpStatus.NO_CONTENT);
             }
         }
-        return new ResponseEntity<>(HttpStatus.NOT_FOUND);
+        // 예약이 없는 경우 Exception 발생
+         throw new IllegalArgumentException("삭제할 예약이 없습니다.");
+
+    }
+
+    @ExceptionHandler(IllegalArgumentException.class)
+    public ResponseEntity<String> handleIllegalArgumentException(IllegalArgumentException e) {
+        return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST);
     }
 
 }
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index cbaf72744..daccf9c00 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -69,4 +69,25 @@ public class MissionStepTest {
                 .statusCode(200)
                 .body("size()", is(0));
     }
+    @Test
+    void 사단계() {
+        Map<String, String> params = new HashMap<>();
+        params.put("name", "브라운");
+        params.put("date", "");
+        params.put("time", "");
+
+        // 필요한 인자가 없는 경우
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(params)
+                .when().post("/reservations")
+                .then().log().all()
+                .statusCode(400);
+
+        // 삭제할 예약이 없는 경우
+        RestAssured.given().log().all()
+                .when().delete("/reservations/1")
+                .then().log().all()
+                .statusCode(400);
+    }
 }

From 9f2966aa79de30447862236f0d1e07661323a012 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Sun, 30 Jun 2024 14:31:48 +0900
Subject: [PATCH 05/37] =?UTF-8?q?4=EB=8B=A8=EA=B3=84=20-=20=EC=98=88?=
 =?UTF-8?q?=EC=99=B8=20=EC=B2=98=EB=A6=AC=20Reservation=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/Reservation.java     | 34 +++++++++++++++++++
 src/main/resources/templates/reservation.html |  2 +-
 2 files changed, 35 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/roomescape/Reservation.java

diff --git a/src/main/java/roomescape/Reservation.java b/src/main/java/roomescape/Reservation.java
new file mode 100644
index 000000000..d3efb6298
--- /dev/null
+++ b/src/main/java/roomescape/Reservation.java
@@ -0,0 +1,34 @@
+package roomescape;
+
+import jakarta.annotation.Generated;
+
+public class Reservation {
+    private int id;
+
+    private String name;
+    private String date;
+    private String time;
+
+    public Reservation(int id, String name, String date, String time) {
+        this.id = id;
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+}
diff --git a/src/main/resources/templates/reservation.html b/src/main/resources/templates/reservation.html
index 7c0eb9fc4..fdfdf2565 100644
--- a/src/main/resources/templates/reservation.html
+++ b/src/main/resources/templates/reservation.html
@@ -21,7 +21,7 @@
       <nav id="sidebar" class="text-white">
         <!-- 로고 영역 -->
         <div class="sidebar-logo p-4">
-          <a href="/">
+          <a href="/static">
             <img src="https://avatars.githubusercontent.com/u/141792611?s=96&v=4" alt="logo"
                  class="img-fluid rounded-circle">
           </a>

From fcfc498f4688a2ad2c5fb3638818f3ac1c97dba5 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Mon, 1 Jul 2024 23:32:40 +0900
Subject: [PATCH 06/37] =?UTF-8?q?=ED=85=8C=EC=8A=A4=ED=8A=B8=20=EB=AA=A8?=
 =?UTF-8?q?=EB=91=90=20=ED=86=B5=EA=B3=BC=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index daccf9c00..fc2fa32f6 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -33,7 +33,7 @@ public class MissionStepTest {
                 .when().get("/reservations")
                 .then().log().all()
                 .statusCode(200)
-                .body("size()", is(3)); // 아직 생성 요청이 없으니 Controller에서 임의로 넣어준 Reservation 갯수 만큼 검증하거나 0개임을 확인하세요.
+                .body("size()", is(0)); // 아직 생성 요청이 없으니 Controller에서 임의로 넣어준 Reservation 갯수 만큼 검증하거나 0개임을 확인하세요.
     }
 
     @Test

From ddb26a97ca5626a9ac4d8f6fe977ec1a6466ef94 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Mon, 1 Jul 2024 23:32:53 +0900
Subject: [PATCH 07/37] =?UTF-8?q?=EB=B6=88=ED=95=84=EC=9A=94=20=EA=B3=B5?=
 =?UTF-8?q?=EB=B0=B1=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/RoomescapeController.java | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/main/java/roomescape/RoomescapeController.java b/src/main/java/roomescape/RoomescapeController.java
index 93362e7e4..f76889ea5 100644
--- a/src/main/java/roomescape/RoomescapeController.java
+++ b/src/main/java/roomescape/RoomescapeController.java
@@ -23,7 +23,6 @@ public String reservation() {
     @GetMapping("/reservations")
     @ResponseBody
     public ResponseEntity<List<Reservation>> reservations() {
-
         return new ResponseEntity<>(reservations, HttpStatus.OK);
     }
 
@@ -53,8 +52,7 @@ public ResponseEntity<Reservation> deleteReservation(@PathVariable int id){
             }
         }
         // 예약이 없는 경우 Exception 발생
-         throw new IllegalArgumentException("삭제할 예약이 없습니다.");
-
+        throw new IllegalArgumentException("삭제할 예약이 없습니다.");
     }
 
     @ExceptionHandler(IllegalArgumentException.class)

From 598103cea2c93a453b7281a5be0a07719c5b6d51 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Mon, 1 Jul 2024 23:53:20 +0900
Subject: [PATCH 08/37] =?UTF-8?q?Test=20=EC=BD=94=EB=93=9C=EC=97=90=20@Dis?=
 =?UTF-8?q?playName=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 | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index fc2fa32f6..c703dd484 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -2,6 +2,7 @@
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
+import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
@@ -15,6 +16,7 @@
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 public class MissionStepTest {
 
+    @DisplayName("1단계: 매핑 경로 확인")
     @Test
     void 일단계() {
         RestAssured.given().log().all()
@@ -22,6 +24,7 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(200);
     }
+    @DisplayName("2단계: 예약 목록 조회")
     @Test
     void 이단계() {
         RestAssured.given().log().all()
@@ -36,6 +39,7 @@ public class MissionStepTest {
                 .body("size()", is(0)); // 아직 생성 요청이 없으니 Controller에서 임의로 넣어준 Reservation 갯수 만큼 검증하거나 0개임을 확인하세요.
     }
 
+    @DisplayName("3단계: 예약 생성 및 조회")
     @Test
     void 삼단계() {
         Map<String, String> params = new HashMap<>();
@@ -69,6 +73,7 @@ public class MissionStepTest {
                 .statusCode(200)
                 .body("size()", is(0));
     }
+    @DisplayName("4단계: 예외처리")
     @Test
     void 사단계() {
         Map<String, String> params = new HashMap<>();

From be6673970339bd6ff2c743230e100773c228d319 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Tue, 2 Jul 2024 13:45:14 +0900
Subject: [PATCH 09/37] =?UTF-8?q?thymeleaf=20=EC=9D=98=EC=A1=B4=EC=84=B1?=
 =?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

---
 build.gradle | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/build.gradle b/build.gradle
index 74d35aaaf..43db8c2b0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,6 +15,8 @@ repositories {
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:5.3.1'
 }

From 08c7387ed625ab2487a758d6afcd106e1bfa457e Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 4 Jul 2024 20:53:48 +0900
Subject: [PATCH 10/37] =?UTF-8?q?Feat:=205=EB=8B=A8=EA=B3=84:=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=EB=B2=A0=EC=9D=B4=EC=8A=A4=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=ED=95=98=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle                                  |  2 ++
 src/main/resources/application.properties     |  5 +++++
 src/main/resources/schema.sql                 | 10 +++++++++
 src/test/java/roomescape/MissionStepTest.java | 21 +++++++++++++++++++
 4 files changed, 38 insertions(+)
 create mode 100644 src/main/resources/schema.sql

diff --git a/build.gradle b/build.gradle
index 43db8c2b0..059741dd5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -16,9 +16,11 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:5.3.1'
+    runtimeOnly 'com.h2database:h2'
 }
 
 test {
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e69de29bb..7031c6249 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -0,0 +1,5 @@
+spring.h2.console.enabled=true
+spring.datasource.url=jdbc:h2:mem:database
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
new file mode 100644
index 000000000..fb84ad586
--- /dev/null
+++ b/src/main/resources/schema.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS reservations;
+
+CREATE TABLE reservation
+(
+    id      BIGINT       NOT NULL AUTO_INCREMENT,
+    name    VARCHAR(255) NOT NULL,
+    date    VARCHAR(255) NOT NULL,
+    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 c703dd484..ac31ba36e 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -4,12 +4,17 @@
 import io.restassured.http.ContentType;
 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 java.sql.Connection;
+import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.Map;
 
+import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@@ -95,4 +100,20 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(400);
     }
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @DisplayName("5단계: 데이터베이스 적용하기")
+    @Test
+    void 오단계() {
+        try (Connection connection = jdbcTemplate.getDataSource().getConnection()) {
+            assertThat(connection).isNotNull();
+            assertThat(connection.getCatalog()).isEqualTo("DATABASE");
+            assertThat(connection.getMetaData().getTables(null, null, "RESERVATION", null).next()).isTrue();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
 }

From 6c5bfc9dbe70e71947719a3415e8a736f8cff48f Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 4 Jul 2024 21:26:56 +0900
Subject: [PATCH 11/37] =?UTF-8?q?Feat:=206=EB=8B=A8=EA=B3=84:=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=A1=B0=ED=9A=8C=ED=95=98=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/RoomDAO.java         | 24 +++++++++++++++++++
 .../java/roomescape/RoomescapeController.java | 10 +++++---
 src/test/java/roomescape/MissionStepTest.java | 18 ++++++++++++++
 3 files changed, 49 insertions(+), 3 deletions(-)
 create mode 100644 src/main/java/roomescape/RoomDAO.java

diff --git a/src/main/java/roomescape/RoomDAO.java b/src/main/java/roomescape/RoomDAO.java
new file mode 100644
index 000000000..81bd498e0
--- /dev/null
+++ b/src/main/java/roomescape/RoomDAO.java
@@ -0,0 +1,24 @@
+package roomescape;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class RoomDAO {
+    private static JdbcTemplate jdbcTemplate;
+
+    public RoomDAO(JdbcTemplate jdbcTemplate) {
+        RoomDAO.jdbcTemplate = jdbcTemplate;
+    }
+    public List<Reservation> findAll() {
+        return jdbcTemplate.query("SELECT * FROM reservation", (resultSet, rowNum) -> new Reservation(
+                resultSet.getInt("id"),
+                resultSet.getString("name"),
+                resultSet.getString("date"),
+                resultSet.getString("time")
+        ));
+    }
+
+}
diff --git a/src/main/java/roomescape/RoomescapeController.java b/src/main/java/roomescape/RoomescapeController.java
index f76889ea5..33d22bbf5 100644
--- a/src/main/java/roomescape/RoomescapeController.java
+++ b/src/main/java/roomescape/RoomescapeController.java
@@ -12,18 +12,22 @@
 @Controller
 public class RoomescapeController {
 
+    private final RoomDAO RoomDAO;
     private List<Reservation> reservations = new ArrayList<>();
 
+    public RoomescapeController(RoomDAO roomDAO) {
+        RoomDAO = roomDAO;
+    }
+
     @GetMapping("/reservation")
     public String reservation() {
-
         return "reservation";
     }
 
     @GetMapping("/reservations")
     @ResponseBody
-    public ResponseEntity<List<Reservation>> reservations() {
-        return new ResponseEntity<>(reservations, HttpStatus.OK);
+    public ResponseEntity<List<Reservation>> getAllReservations(){
+        return new ResponseEntity<>(RoomDAO.findAll(), HttpStatus.OK);
     }
 
     @PostMapping("/reservations")
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index ac31ba36e..5e1f16039 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -12,6 +12,7 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 import static org.assertj.core.api.Assertions.assertThat;
@@ -116,4 +117,21 @@ public class MissionStepTest {
         }
     }
 
+    @DisplayName("6단계: 데이터 조회하기")
+    @Test
+    void 육단계() {
+        jdbcTemplate.update("INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)", "브라운", "2023-08-05", "15:40");
+
+        List<Reservation> reservations = RestAssured.given().log().all()
+                .when().get("/reservations")
+                .then().log().all()
+                .statusCode(200).extract()
+                .jsonPath().getList(".", Reservation.class);
+
+        Integer count = jdbcTemplate.queryForObject("SELECT count(1) from reservation", Integer.class);
+
+        assertThat(reservations.size()).isEqualTo(count);
+    }
+
+
 }

From 35a3e5affea061aa97e0aa70d54353b58155c9d5 Mon Sep 17 00:00:00 2001
From: Junyeong An <52746279+Junyeong-An@users.noreply.github.com>
Date: Thu, 4 Jul 2024 22:30:40 +0900
Subject: [PATCH 12/37] =?UTF-8?q?[Spring=20MVC]=20=EC=95=88=EC=A4=80?=
 =?UTF-8?q?=EC=98=81=20=EB=AF=B8=EC=85=98=20=EC=A0=9C=EC=B6=9C=ED=95=A9?=
 =?UTF-8?q?=EB=8B=88=EB=8B=A4.=20(#283)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* 1단계 - 홈화면 구성

* 2단계 - 예약 조회

* 3단계 - 예약 추가/취소

* 4단계 - 예외 처리

* 4단계 - 예외 처리 Reservation추가

* 테스트 모두 통과하도록 수정

* 불필요 공백 제거

* Test 코드에 @DisplayName추가

* thymeleaf 의존성 추가

* Feat: 5단계: 데이터베이스 적용하기

* Feat: 6단계: 데이터 조회하기
---
 build.gradle                                  |   5 +
 src/main/java/roomescape/Reservation.java     |  34 +++++
 src/main/java/roomescape/RoomDAO.java         |  24 ++++
 .../java/roomescape/RoomescapeController.java |  67 ++++++++++
 src/main/resources/application.properties     |   5 +
 src/main/resources/schema.sql                 |  10 ++
 .../home.html => static/index.html}           |   2 +-
 src/main/resources/templates/reservation.html |   2 +-
 src/test/java/roomescape/MissionStepTest.java | 118 ++++++++++++++++++
 9 files changed, 265 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/roomescape/Reservation.java
 create mode 100644 src/main/java/roomescape/RoomDAO.java
 create mode 100644 src/main/java/roomescape/RoomescapeController.java
 create mode 100644 src/main/resources/schema.sql
 rename src/main/resources/{templates/home.html => static/index.html} (98%)

diff --git a/build.gradle b/build.gradle
index 57267157c..059741dd5 100644
--- a/build.gradle
+++ b/build.gradle
@@ -14,8 +14,13 @@ repositories {
 
 dependencies {
     implementation 'org.springframework.boot:spring-boot-starter'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jdbc'
+
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:5.3.1'
+    runtimeOnly 'com.h2database:h2'
 }
 
 test {
diff --git a/src/main/java/roomescape/Reservation.java b/src/main/java/roomescape/Reservation.java
new file mode 100644
index 000000000..d3efb6298
--- /dev/null
+++ b/src/main/java/roomescape/Reservation.java
@@ -0,0 +1,34 @@
+package roomescape;
+
+import jakarta.annotation.Generated;
+
+public class Reservation {
+    private int id;
+
+    private String name;
+    private String date;
+    private String time;
+
+    public Reservation(int id, String name, String date, String time) {
+        this.id = id;
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+}
diff --git a/src/main/java/roomescape/RoomDAO.java b/src/main/java/roomescape/RoomDAO.java
new file mode 100644
index 000000000..81bd498e0
--- /dev/null
+++ b/src/main/java/roomescape/RoomDAO.java
@@ -0,0 +1,24 @@
+package roomescape;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class RoomDAO {
+    private static JdbcTemplate jdbcTemplate;
+
+    public RoomDAO(JdbcTemplate jdbcTemplate) {
+        RoomDAO.jdbcTemplate = jdbcTemplate;
+    }
+    public List<Reservation> findAll() {
+        return jdbcTemplate.query("SELECT * FROM reservation", (resultSet, rowNum) -> new Reservation(
+                resultSet.getInt("id"),
+                resultSet.getString("name"),
+                resultSet.getString("date"),
+                resultSet.getString("time")
+        ));
+    }
+
+}
diff --git a/src/main/java/roomescape/RoomescapeController.java b/src/main/java/roomescape/RoomescapeController.java
new file mode 100644
index 000000000..33d22bbf5
--- /dev/null
+++ b/src/main/java/roomescape/RoomescapeController.java
@@ -0,0 +1,67 @@
+package roomescape;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Controller
+public class RoomescapeController {
+
+    private final RoomDAO RoomDAO;
+    private List<Reservation> reservations = new ArrayList<>();
+
+    public RoomescapeController(RoomDAO roomDAO) {
+        RoomDAO = roomDAO;
+    }
+
+    @GetMapping("/reservation")
+    public String reservation() {
+        return "reservation";
+    }
+
+    @GetMapping("/reservations")
+    @ResponseBody
+    public ResponseEntity<List<Reservation>> getAllReservations(){
+        return new ResponseEntity<>(RoomDAO.findAll(), HttpStatus.OK);
+    }
+
+    @PostMapping("/reservations")
+    @ResponseBody
+    public ResponseEntity<Reservation> createReservation( @RequestBody Reservation reservation) {
+        Reservation newReservation = new Reservation(reservations.size() + 1, reservation.getName(), reservation.getDate(), reservation.getTime());
+        if (reservation.getName() == null || reservation.getName().trim().isEmpty() ||
+                reservation.getDate() == null || reservation.getDate().trim().isEmpty() ||
+                reservation.getTime() == null || reservation.getTime().trim().isEmpty()) {
+            throw new IllegalArgumentException("예약 정보가 부족합니다.");
+        }
+        reservations.add(newReservation);
+
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Location", "/reservations/" + newReservation.getId());
+        return new ResponseEntity<>(newReservation,headers, HttpStatus.CREATED);
+    }
+
+    @DeleteMapping("/reservations/{id}")
+    @ResponseBody
+    public ResponseEntity<Reservation> deleteReservation(@PathVariable int id){
+        for (Reservation reservation : reservations) {
+            if (reservation.getId() == id) {
+                reservations.remove(reservation);
+                return new ResponseEntity<>(reservation, HttpStatus.NO_CONTENT);
+            }
+        }
+        // 예약이 없는 경우 Exception 발생
+        throw new IllegalArgumentException("삭제할 예약이 없습니다.");
+    }
+
+    @ExceptionHandler(IllegalArgumentException.class)
+    public ResponseEntity<String> handleIllegalArgumentException(IllegalArgumentException e) {
+        return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST);
+    }
+
+}
diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e69de29bb..7031c6249 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -0,0 +1,5 @@
+spring.h2.console.enabled=true
+spring.datasource.url=jdbc:h2:mem:database
+spring.datasource.driver-class-name=org.h2.Driver
+spring.datasource.username=sa
+spring.datasource.password=
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
new file mode 100644
index 000000000..fb84ad586
--- /dev/null
+++ b/src/main/resources/schema.sql
@@ -0,0 +1,10 @@
+DROP TABLE IF EXISTS reservations;
+
+CREATE TABLE reservation
+(
+    id      BIGINT       NOT NULL AUTO_INCREMENT,
+    name    VARCHAR(255) NOT NULL,
+    date    VARCHAR(255) NOT NULL,
+    time    VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id)
+);
diff --git a/src/main/resources/templates/home.html b/src/main/resources/static/index.html
similarity index 98%
rename from src/main/resources/templates/home.html
rename to src/main/resources/static/index.html
index 7ddf752a6..8724f9086 100644
--- a/src/main/resources/templates/home.html
+++ b/src/main/resources/static/index.html
@@ -20,7 +20,7 @@
       <nav id="sidebar" class="text-white">
         <!-- 로고 영역 -->
         <div class="sidebar-logo p-4">
-          <a href="/">
+          <a href="/static">
             <img src="https://avatars.githubusercontent.com/u/141792611?s=96&v=4" alt="logo" class="img-fluid rounded-circle">
           </a>
         </div>
diff --git a/src/main/resources/templates/reservation.html b/src/main/resources/templates/reservation.html
index 7c0eb9fc4..fdfdf2565 100644
--- a/src/main/resources/templates/reservation.html
+++ b/src/main/resources/templates/reservation.html
@@ -21,7 +21,7 @@
       <nav id="sidebar" class="text-white">
         <!-- 로고 영역 -->
         <div class="sidebar-logo p-4">
-          <a href="/">
+          <a href="/static">
             <img src="https://avatars.githubusercontent.com/u/141792611?s=96&v=4" alt="logo"
                  class="img-fluid rounded-circle">
           </a>
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index cf4efbe91..5e1f16039 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -1,14 +1,28 @@
 package roomescape;
 
 import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+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 java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.is;
+
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 public class MissionStepTest {
 
+    @DisplayName("1단계: 매핑 경로 확인")
     @Test
     void 일단계() {
         RestAssured.given().log().all()
@@ -16,4 +30,108 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(200);
     }
+    @DisplayName("2단계: 예약 목록 조회")
+    @Test
+    void 이단계() {
+        RestAssured.given().log().all()
+                .when().get("/reservation")
+                .then().log().all()
+                .statusCode(200);
+
+        RestAssured.given().log().all()
+                .when().get("/reservations")
+                .then().log().all()
+                .statusCode(200)
+                .body("size()", is(0)); // 아직 생성 요청이 없으니 Controller에서 임의로 넣어준 Reservation 갯수 만큼 검증하거나 0개임을 확인하세요.
+    }
+
+    @DisplayName("3단계: 예약 생성 및 조회")
+    @Test
+    void 삼단계() {
+        Map<String, String> params = new HashMap<>();
+        params.put("name", "브라운");
+        params.put("date", "2023-08-05");
+        params.put("time", "15:40");
+
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(params)
+                .when().post("/reservations")
+                .then().log().all()
+                .statusCode(201)
+                .header("Location", "/reservations/1")
+                .body("id", is(1));
+
+        RestAssured.given().log().all()
+                .when().get("/reservations")
+                .then().log().all()
+                .statusCode(200)
+                .body("size()", is(1));
+
+        RestAssured.given().log().all()
+                .when().delete("/reservations/1")
+                .then().log().all()
+                .statusCode(204);
+
+        RestAssured.given().log().all()
+                .when().get("/reservations")
+                .then().log().all()
+                .statusCode(200)
+                .body("size()", is(0));
+    }
+    @DisplayName("4단계: 예외처리")
+    @Test
+    void 사단계() {
+        Map<String, String> params = new HashMap<>();
+        params.put("name", "브라운");
+        params.put("date", "");
+        params.put("time", "");
+
+        // 필요한 인자가 없는 경우
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(params)
+                .when().post("/reservations")
+                .then().log().all()
+                .statusCode(400);
+
+        // 삭제할 예약이 없는 경우
+        RestAssured.given().log().all()
+                .when().delete("/reservations/1")
+                .then().log().all()
+                .statusCode(400);
+    }
+
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
+    @DisplayName("5단계: 데이터베이스 적용하기")
+    @Test
+    void 오단계() {
+        try (Connection connection = jdbcTemplate.getDataSource().getConnection()) {
+            assertThat(connection).isNotNull();
+            assertThat(connection.getCatalog()).isEqualTo("DATABASE");
+            assertThat(connection.getMetaData().getTables(null, null, "RESERVATION", null).next()).isTrue();
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @DisplayName("6단계: 데이터 조회하기")
+    @Test
+    void 육단계() {
+        jdbcTemplate.update("INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)", "브라운", "2023-08-05", "15:40");
+
+        List<Reservation> reservations = RestAssured.given().log().all()
+                .when().get("/reservations")
+                .then().log().all()
+                .statusCode(200).extract()
+                .jsonPath().getList(".", Reservation.class);
+
+        Integer count = jdbcTemplate.queryForObject("SELECT count(1) from reservation", Integer.class);
+
+        assertThat(reservations.size()).isEqualTo(count);
+    }
+
+
 }

From cc73923c43c82f8d01eed9e7fd492f339858916d Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 4 Jul 2024 23:01:51 +0900
Subject: [PATCH 13/37] =?UTF-8?q?Feat:=207=EB=8B=A8=EA=B3=84:=20=EB=8D=B0?=
 =?UTF-8?q?=EC=9D=B4=ED=84=B0=20=EC=B6=94=EA=B0=80/=EC=82=AD=EC=A0=9C?=
 =?UTF-8?q?=ED=95=98=EA=B8=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/RoomDAO.java         | 19 +++++++++++++
 .../java/roomescape/RoomescapeController.java | 22 +++++----------
 src/test/java/roomescape/MissionStepTest.java | 28 +++++++++++++++++++
 3 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/main/java/roomescape/RoomDAO.java b/src/main/java/roomescape/RoomDAO.java
index 81bd498e0..9528ea300 100644
--- a/src/main/java/roomescape/RoomDAO.java
+++ b/src/main/java/roomescape/RoomDAO.java
@@ -20,5 +20,24 @@ public List<Reservation> findAll() {
                 resultSet.getString("time")
         ));
     }
+    public void insert(Reservation reservation) {
+        jdbcTemplate.update("INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)",
+                reservation.getName(), reservation.getDate(), reservation.getTime());
+    }
+    public void delete(int id) {
+        jdbcTemplate.update("DELETE FROM reservation WHERE id = ?", id);
+    }
+    public int getId(Reservation reservation) {
+        return jdbcTemplate.queryForObject("SELECT id FROM reservation WHERE name = ? AND date = ? AND time = ?",
+                Integer.class, reservation.getName(), reservation.getDate(), reservation.getTime());
+    }
+    public Reservation findById(int id) {
+        return jdbcTemplate.queryForObject("SELECT * FROM reservation WHERE id = ?", (resultSet, rowNum) -> new Reservation(
+                resultSet.getInt("id"),
+                resultSet.getString("name"),
+                resultSet.getString("date"),
+                resultSet.getString("time")
+        ), id);
+    }
 
 }
diff --git a/src/main/java/roomescape/RoomescapeController.java b/src/main/java/roomescape/RoomescapeController.java
index 33d22bbf5..042b37385 100644
--- a/src/main/java/roomescape/RoomescapeController.java
+++ b/src/main/java/roomescape/RoomescapeController.java
@@ -33,28 +33,20 @@ public ResponseEntity<List<Reservation>> getAllReservations(){
     @PostMapping("/reservations")
     @ResponseBody
     public ResponseEntity<Reservation> createReservation( @RequestBody Reservation reservation) {
-        Reservation newReservation = new Reservation(reservations.size() + 1, reservation.getName(), reservation.getDate(), reservation.getTime());
-        if (reservation.getName() == null || reservation.getName().trim().isEmpty() ||
-                reservation.getDate() == null || reservation.getDate().trim().isEmpty() ||
-                reservation.getTime() == null || reservation.getTime().trim().isEmpty()) {
-            throw new IllegalArgumentException("예약 정보가 부족합니다.");
-        }
-        reservations.add(newReservation);
-
+        RoomDAO.insert(reservation);
         HttpHeaders headers = new HttpHeaders();
-        headers.add("Location", "/reservations/" + newReservation.getId());
-        return new ResponseEntity<>(newReservation,headers, HttpStatus.CREATED);
+
+        headers.add("Location", "/reservations/" + RoomDAO.getId(reservation));
+        return new ResponseEntity<>(headers, HttpStatus.CREATED);
     }
 
     @DeleteMapping("/reservations/{id}")
     @ResponseBody
     public ResponseEntity<Reservation> deleteReservation(@PathVariable int id){
-        for (Reservation reservation : reservations) {
-            if (reservation.getId() == id) {
-                reservations.remove(reservation);
-                return new ResponseEntity<>(reservation, HttpStatus.NO_CONTENT);
+            if (RoomDAO.findById(id) != null) {
+                RoomDAO.delete(id);
+                return new ResponseEntity<>(HttpStatus.NO_CONTENT);
             }
-        }
         // 예약이 없는 경우 Exception 발생
         throw new IllegalArgumentException("삭제할 예약이 없습니다.");
     }
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 5e1f16039..f965fd35f 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -133,5 +133,33 @@ public class MissionStepTest {
         assertThat(reservations.size()).isEqualTo(count);
     }
 
+    @DisplayName("7단계: 데이터 추가/삭제하기")
+    @Test
+    void 칠단계() {
+        Map<String, String> params = new HashMap<>();
+        params.put("name", "브라운");
+        params.put("date", "2023-08-05");
+        params.put("time", "10:00");
+
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(params)
+                .when().post("/reservations")
+                .then().log().all()
+                .statusCode(201)
+                .header("Location", "/reservations/1");
+
+        Integer count = jdbcTemplate.queryForObject("SELECT count(1) from reservation", Integer.class);
+        assertThat(count).isEqualTo(1);
+
+        RestAssured.given().log().all()
+                .when().delete("/reservations/1")
+                .then().log().all()
+                .statusCode(204);
+
+        Integer countAfterDelete = jdbcTemplate.queryForObject("SELECT count(1) from reservation", Integer.class);
+        assertThat(countAfterDelete).isEqualTo(0);
+    }
+
 
 }

From 48c302706e46ed6a024967421750f53592aa3573 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 4 Jul 2024 23:19:26 +0900
Subject: [PATCH 14/37] =?UTF-8?q?Feat:=20=EB=B6=88=ED=95=84=EC=9A=94=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

---
 src/main/java/roomescape/RoomescapeController.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/roomescape/RoomescapeController.java b/src/main/java/roomescape/RoomescapeController.java
index 042b37385..d23fbb7b1 100644
--- a/src/main/java/roomescape/RoomescapeController.java
+++ b/src/main/java/roomescape/RoomescapeController.java
@@ -13,7 +13,6 @@
 public class RoomescapeController {
 
     private final RoomDAO RoomDAO;
-    private List<Reservation> reservations = new ArrayList<>();
 
     public RoomescapeController(RoomDAO roomDAO) {
         RoomDAO = roomDAO;

From ce883c092c4a117bd4054e89a2edca1f7dcfc8df Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Sun, 7 Jul 2024 23:08:31 +0900
Subject: [PATCH 15/37] =?UTF-8?q?Feat:=20static=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/RoomDAO.java              | 4 ++--
 src/main/java/roomescape/RoomescapeController.java | 1 -
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/java/roomescape/RoomDAO.java b/src/main/java/roomescape/RoomDAO.java
index 9528ea300..0e971a1f0 100644
--- a/src/main/java/roomescape/RoomDAO.java
+++ b/src/main/java/roomescape/RoomDAO.java
@@ -7,10 +7,10 @@
 
 @Repository
 public class RoomDAO {
-    private static JdbcTemplate jdbcTemplate;
+    private final JdbcTemplate jdbcTemplate;
 
     public RoomDAO(JdbcTemplate jdbcTemplate) {
-        RoomDAO.jdbcTemplate = jdbcTemplate;
+        this.jdbcTemplate = jdbcTemplate;
     }
     public List<Reservation> findAll() {
         return jdbcTemplate.query("SELECT * FROM reservation", (resultSet, rowNum) -> new Reservation(
diff --git a/src/main/java/roomescape/RoomescapeController.java b/src/main/java/roomescape/RoomescapeController.java
index d23fbb7b1..3ea7758c5 100644
--- a/src/main/java/roomescape/RoomescapeController.java
+++ b/src/main/java/roomescape/RoomescapeController.java
@@ -6,7 +6,6 @@
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
 import java.util.List;
 
 @Controller

From b7b92b0011294f844946b752c735b8ad93299e32 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Mon, 8 Jul 2024 20:57:17 +0900
Subject: [PATCH 16/37] =?UTF-8?q?Feat:=20insert=20=EC=98=88=EC=99=B8=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC=20=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/RoomescapeController.java | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/java/roomescape/RoomescapeController.java b/src/main/java/roomescape/RoomescapeController.java
index 3ea7758c5..11da21744 100644
--- a/src/main/java/roomescape/RoomescapeController.java
+++ b/src/main/java/roomescape/RoomescapeController.java
@@ -31,6 +31,9 @@ public ResponseEntity<List<Reservation>> getAllReservations(){
     @PostMapping("/reservations")
     @ResponseBody
     public ResponseEntity<Reservation> createReservation( @RequestBody Reservation reservation) {
+        if (reservation.getName() == null || reservation.getDate() == null || reservation.getTime() == null) {
+            throw new IllegalArgumentException("예약 정보가 부족합니다.");
+        }
         RoomDAO.insert(reservation);
         HttpHeaders headers = new HttpHeaders();
 

From c5b300ef1dc5cbb74460541f00ce45ba0094a9dc Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Mon, 8 Jul 2024 20:57:39 +0900
Subject: [PATCH 17/37] =?UTF-8?q?Refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=EB=AA=85=20=EC=98=81=EC=96=B4=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B3=80=ED=99=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 9d6890e4f..f9901c20d 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -24,7 +24,7 @@ public class MissionStepTest {
 
     @DisplayName("1단계: 매핑 경로 확인")
     @Test
-    void 일단계() {
+    void verifyMappingPath() {
         RestAssured.given().log().all()
                 .when().get("/")
                 .then().log().all()
@@ -32,7 +32,7 @@ public class MissionStepTest {
     }
     @DisplayName("2단계: 예약 목록 조회")
     @Test
-    void 이단계() {
+    void retrieveReservationList() {
         RestAssured.given().log().all()
                 .when().get("/reservation")
                 .then().log().all()
@@ -47,7 +47,7 @@ public class MissionStepTest {
 
     @DisplayName("3단계: 예약 생성 및 조회")
     @Test
-    void 삼단계() {
+    void createAndRetrieveReservation() {
         Map<String, String> params = new HashMap<>();
         params.put("name", "브라운");
         params.put("date", "2023-08-05");
@@ -81,7 +81,7 @@ public class MissionStepTest {
     }
     @DisplayName("4단계: 예외처리")
     @Test
-    void 사단계() {
+    void handleExceptions() {
         Map<String, String> params = new HashMap<>();
         params.put("name", "브라운");
         params.put("date", "");
@@ -107,7 +107,7 @@ public class MissionStepTest {
 
     @DisplayName("5단계: 데이터베이스 적용하기")
     @Test
-    void 오단계() {
+    void applyDatabase() {
         try (Connection connection = jdbcTemplate.getDataSource().getConnection()) {
             assertThat(connection).isNotNull();
             assertThat(connection.getCatalog()).isEqualTo("DATABASE");
@@ -119,7 +119,7 @@ public class MissionStepTest {
 
     @DisplayName("6단계: 데이터 조회하기")
     @Test
-    void 육단계() {
+    void retrieveDataFromDatabase() {
         jdbcTemplate.update("INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)", "브라운", "2023-08-05", "15:40");
 
         List<Reservation> reservations = RestAssured.given().log().all()
@@ -136,7 +136,7 @@ public class MissionStepTest {
 
     @DisplayName("7단계: 데이터 추가/삭제하기")
     @Test
-    void 칠단계() {
+    void addAndDeleteData() {
         Map<String, String> params = new HashMap<>();
         params.put("name", "브라운");
         params.put("date", "2023-08-05");

From 1a7d4cb8f8552477a8e51e46fd542d614835f9fa Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Mon, 8 Jul 2024 21:17:38 +0900
Subject: [PATCH 18/37] =?UTF-8?q?Refactor:=20id=EA=B0=92=20=EC=97=86?=
 =?UTF-8?q?=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20=EC=98=88=EC=99=B8=20=EC=B2=98?=
 =?UTF-8?q?=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/RoomDAO.java | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/main/java/roomescape/RoomDAO.java b/src/main/java/roomescape/RoomDAO.java
index 5814000a2..b36b91e29 100644
--- a/src/main/java/roomescape/RoomDAO.java
+++ b/src/main/java/roomescape/RoomDAO.java
@@ -1,5 +1,6 @@
 package roomescape;
 
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 
@@ -12,6 +13,7 @@ public class RoomDAO {
     public RoomDAO(JdbcTemplate jdbcTemplate) {
         this.jdbcTemplate = jdbcTemplate;
     }
+
     public List<Reservation> findAll() {
         return jdbcTemplate.query("SELECT * FROM reservation", (resultSet, rowNum) -> new Reservation(
                 resultSet.getInt("id"),
@@ -25,20 +27,26 @@ public void insert(Reservation reservation) {
         jdbcTemplate.update("INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)",
                 reservation.getName(), reservation.getDate(), reservation.getTime());
     }
+
     public void delete(int id) {
         jdbcTemplate.update("DELETE FROM reservation WHERE id = ?", id);
     }
+
     public int getId(Reservation reservation) {
         return jdbcTemplate.queryForObject("SELECT id FROM reservation WHERE name = ? AND date = ? AND time = ?",
                 Integer.class, reservation.getName(), reservation.getDate(), reservation.getTime());
     }
+
     public Reservation findById(int id) {
-        return jdbcTemplate.queryForObject("SELECT * FROM reservation WHERE id = ?", (resultSet, rowNum) -> new Reservation(
-                resultSet.getInt("id"),
-                resultSet.getString("name"),
-                resultSet.getString("date"),
-                resultSet.getString("time")
-        ), id);
+        try {
+            return jdbcTemplate.queryForObject("SELECT * FROM reservation WHERE id = ?", (resultSet, rowNum) -> new Reservation(
+                    resultSet.getInt("id"),
+                    resultSet.getString("name"),
+                    resultSet.getString("date"),
+                    resultSet.getString("time")
+            ), id);
+        } catch (EmptyResultDataAccessException e) {
+            throw new IllegalArgumentException("찾는 id가 존재하지 않습니다!");
+        }
     }
-
 }

From 520a3db9d18a7da6651187569e31588d2be10c56 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Wed, 10 Jul 2024 16:09:54 +0900
Subject: [PATCH 19/37] =?UTF-8?q?Feat:=20Dto=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RoomescapeController.java                 | 22 +++++++++++++------
 .../java/roomescape/{ => dao}/RoomDAO.java    |  3 ++-
 .../roomescape/{ => domain}/Reservation.java  |  4 +---
 .../java/roomescape/dto/ReservationDto.java   | 10 +++++++++
 src/test/java/roomescape/MissionStepTest.java |  1 +
 5 files changed, 29 insertions(+), 11 deletions(-)
 rename src/main/java/roomescape/{ => controller}/RoomescapeController.java (60%)
 rename src/main/java/roomescape/{ => dao}/RoomDAO.java (96%)
 rename src/main/java/roomescape/{ => domain}/Reservation.java (90%)
 create mode 100644 src/main/java/roomescape/dto/ReservationDto.java

diff --git a/src/main/java/roomescape/RoomescapeController.java b/src/main/java/roomescape/controller/RoomescapeController.java
similarity index 60%
rename from src/main/java/roomescape/RoomescapeController.java
rename to src/main/java/roomescape/controller/RoomescapeController.java
index 11da21744..902001a43 100644
--- a/src/main/java/roomescape/RoomescapeController.java
+++ b/src/main/java/roomescape/controller/RoomescapeController.java
@@ -1,17 +1,21 @@
-package roomescape;
+package roomescape.controller;
 
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import roomescape.domain.Reservation;
+import roomescape.dao.RoomDAO;
+import roomescape.dto.ReservationDto;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Controller
 public class RoomescapeController {
 
-    private final RoomDAO RoomDAO;
+    private final roomescape.dao.RoomDAO RoomDAO;
 
     public RoomescapeController(RoomDAO roomDAO) {
         RoomDAO = roomDAO;
@@ -24,21 +28,25 @@ public String reservation() {
 
     @GetMapping("/reservations")
     @ResponseBody
-    public ResponseEntity<List<Reservation>> getAllReservations(){
-        return new ResponseEntity<>(RoomDAO.findAll(), HttpStatus.OK);
+    public ResponseEntity<List<ReservationDto>> getAllReservations(){
+        List<ReservationDto> reservations = RoomDAO.findAll().stream()
+                .map(reservation -> new ReservationDto(reservation.getName(), reservation.getDate(), reservation.getTime()))
+                .collect(Collectors.toList());
+        return new ResponseEntity<>(reservations, HttpStatus.OK);
     }
 
     @PostMapping("/reservations")
     @ResponseBody
-    public ResponseEntity<Reservation> createReservation( @RequestBody Reservation reservation) {
-        if (reservation.getName() == null || reservation.getDate() == null || reservation.getTime() == null) {
+    public ResponseEntity<ReservationDto> createReservation( @RequestBody ReservationDto reservationDto) {
+        if (reservationDto.name() == null || reservationDto.date() == null || reservationDto.time() == null) {
             throw new IllegalArgumentException("예약 정보가 부족합니다.");
         }
+        Reservation reservation = new Reservation(0, reservationDto.name(), reservationDto.date(), reservationDto.time());
         RoomDAO.insert(reservation);
         HttpHeaders headers = new HttpHeaders();
 
         headers.add("Location", "/reservations/" + RoomDAO.getId(reservation));
-        return new ResponseEntity<>(headers, HttpStatus.CREATED);
+        return new ResponseEntity<>(reservationDto,headers, HttpStatus.CREATED);
     }
 
     @DeleteMapping("/reservations/{id}")
diff --git a/src/main/java/roomescape/RoomDAO.java b/src/main/java/roomescape/dao/RoomDAO.java
similarity index 96%
rename from src/main/java/roomescape/RoomDAO.java
rename to src/main/java/roomescape/dao/RoomDAO.java
index b36b91e29..7235cf8e6 100644
--- a/src/main/java/roomescape/RoomDAO.java
+++ b/src/main/java/roomescape/dao/RoomDAO.java
@@ -1,8 +1,9 @@
-package roomescape;
+package roomescape.dao;
 
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
+import roomescape.domain.Reservation;
 
 import java.util.List;
 
diff --git a/src/main/java/roomescape/Reservation.java b/src/main/java/roomescape/domain/Reservation.java
similarity index 90%
rename from src/main/java/roomescape/Reservation.java
rename to src/main/java/roomescape/domain/Reservation.java
index d3efb6298..c09c96c6e 100644
--- a/src/main/java/roomescape/Reservation.java
+++ b/src/main/java/roomescape/domain/Reservation.java
@@ -1,6 +1,4 @@
-package roomescape;
-
-import jakarta.annotation.Generated;
+package roomescape.domain;
 
 public class Reservation {
     private int id;
diff --git a/src/main/java/roomescape/dto/ReservationDto.java b/src/main/java/roomescape/dto/ReservationDto.java
new file mode 100644
index 000000000..88dd33725
--- /dev/null
+++ b/src/main/java/roomescape/dto/ReservationDto.java
@@ -0,0 +1,10 @@
+package roomescape.dto;
+
+public record ReservationDto(
+        String name, String date, String time
+) {
+    public static ReservationDto from(String name, String date, String time) {
+        return new ReservationDto(name, date, time);
+    }
+}
+
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index f9901c20d..3d2214adf 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -8,6 +8,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.DirtiesContext;
+import roomescape.domain.Reservation;
 
 import java.sql.Connection;
 import java.sql.SQLException;

From 9a92583e60125c194c5142f7503e12994082a797 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 11 Jul 2024 19:11:18 +0900
Subject: [PATCH 20/37] =?UTF-8?q?Feat:=20Time=20insert,delete,get=20?=
 =?UTF-8?q?=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/RoomescapeController.java      | 10 ++++-
 .../roomescape/controller/TimeController.java | 42 ++++++++++++++++++
 src/main/java/roomescape/dao/TimeDAO.java     | 44 +++++++++++++++++++
 src/main/java/roomescape/domain/Time.java     | 27 ++++++++++++
 src/main/java/roomescape/dto/TimeDto.java     |  6 +++
 .../java/roomescape/service/TimeService.java  | 33 ++++++++++++++
 src/main/resources/schema.sql                 |  7 +++
 src/test/java/roomescape/MissionStepTest.java | 27 ++++++++++++
 8 files changed, 195 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/roomescape/controller/TimeController.java
 create mode 100644 src/main/java/roomescape/dao/TimeDAO.java
 create mode 100644 src/main/java/roomescape/domain/Time.java
 create mode 100644 src/main/java/roomescape/dto/TimeDto.java
 create mode 100644 src/main/java/roomescape/service/TimeService.java

diff --git a/src/main/java/roomescape/controller/RoomescapeController.java b/src/main/java/roomescape/controller/RoomescapeController.java
index 902001a43..60e43f1ee 100644
--- a/src/main/java/roomescape/controller/RoomescapeController.java
+++ b/src/main/java/roomescape/controller/RoomescapeController.java
@@ -5,9 +5,12 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import roomescape.domain.Time;
+import roomescape.dto.TimeDto;
 import roomescape.domain.Reservation;
 import roomescape.dao.RoomDAO;
 import roomescape.dto.ReservationDto;
+import roomescape.service.TimeService;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -16,9 +19,11 @@
 public class RoomescapeController {
 
     private final roomescape.dao.RoomDAO RoomDAO;
+    private final TimeService TimeService;
 
-    public RoomescapeController(RoomDAO roomDAO) {
+    public RoomescapeController(RoomDAO roomDAO, TimeService timeService) {
         RoomDAO = roomDAO;
+        TimeService = timeService;
     }
 
     @GetMapping("/reservation")
@@ -49,6 +54,8 @@ public ResponseEntity<ReservationDto> createReservation( @RequestBody Reservatio
         return new ResponseEntity<>(reservationDto,headers, HttpStatus.CREATED);
     }
 
+
+
     @DeleteMapping("/reservations/{id}")
     @ResponseBody
     public ResponseEntity<Reservation> deleteReservation(@PathVariable int id){
@@ -60,6 +67,7 @@ public ResponseEntity<Reservation> deleteReservation(@PathVariable int id){
         throw new IllegalArgumentException("삭제할 예약이 없습니다.");
     }
 
+
     @ExceptionHandler(IllegalArgumentException.class)
     public ResponseEntity<String> handleIllegalArgumentException(IllegalArgumentException e) {
         return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST);
diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
new file mode 100644
index 000000000..9e4f506ab
--- /dev/null
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -0,0 +1,42 @@
+package roomescape.controller;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import roomescape.domain.Time;
+import roomescape.dto.TimeDto;
+import roomescape.service.TimeService;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/times")
+public class TimeController {
+    private final TimeService timeService;
+
+    public TimeController(TimeService timeService) {
+        this.timeService = timeService;
+    }
+
+    @PostMapping
+    @ResponseBody
+    public ResponseEntity<Time> addTime(@RequestBody TimeDto timeDto) {
+        Time time = timeService.addTime(timeDto);
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Location", "/times/" + time.getId());
+        return new ResponseEntity<>(time, headers, HttpStatus.CREATED);
+    }
+
+    @GetMapping
+    public ResponseEntity<List<Time>> getAllTimes() {
+        List<Time> times = timeService.getAllTimes();
+        return new ResponseEntity<>(times, HttpStatus.OK);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteTime(@PathVariable int id) {
+        timeService.deleteTime(id);
+        return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+    }
+}
diff --git a/src/main/java/roomescape/dao/TimeDAO.java b/src/main/java/roomescape/dao/TimeDAO.java
new file mode 100644
index 000000000..57c372809
--- /dev/null
+++ b/src/main/java/roomescape/dao/TimeDAO.java
@@ -0,0 +1,44 @@
+package roomescape.dao;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+import roomescape.domain.Reservation;
+import roomescape.domain.Time;
+import roomescape.dto.TimeDto;
+
+import java.util.List;
+
+@Repository
+public class TimeDAO {
+    private final JdbcTemplate jdbcTemplate;
+
+    public TimeDAO(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    public void insert(Time time) {
+        jdbcTemplate.update("INSERT INTO time (time) VALUES (?)",
+                time.getTime());
+    }
+
+    public int getId(Time time) {
+        try {
+            return jdbcTemplate.queryForObject(
+                    "SELECT id FROM time WHERE time = ? LIMIT 1",
+                    Integer.class, time.getTime()
+            );
+        } catch (Exception e) {
+            throw new RuntimeException("찾는 id가 존재하지 않습니다!");
+        }
+    }
+
+    public List<Time> findAll() {
+        return jdbcTemplate.query("SELECT * FROM time", (rs, rowNum) ->
+                new Time(rs.getInt("id"), rs.getString("time"))
+        );
+    }
+
+    public void delete(int id) {
+        jdbcTemplate.update("DELETE FROM time WHERE id = ?", id);
+    }
+}
diff --git a/src/main/java/roomescape/domain/Time.java b/src/main/java/roomescape/domain/Time.java
new file mode 100644
index 000000000..3c2428702
--- /dev/null
+++ b/src/main/java/roomescape/domain/Time.java
@@ -0,0 +1,27 @@
+package roomescape.domain;
+
+public class Time {
+    int id;
+    String time;
+
+    public Time(int id, String time) {
+        this.id = id;
+        this.time = time;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public int getId() {
+        return id;
+    }
+
+    public void setId(int id) {
+        this.id = id;
+    }
+}
diff --git a/src/main/java/roomescape/dto/TimeDto.java b/src/main/java/roomescape/dto/TimeDto.java
new file mode 100644
index 000000000..351fba4ce
--- /dev/null
+++ b/src/main/java/roomescape/dto/TimeDto.java
@@ -0,0 +1,6 @@
+package roomescape.dto;
+
+public record TimeDto(
+        String time
+) {
+}
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
new file mode 100644
index 000000000..8d6a9463d
--- /dev/null
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -0,0 +1,33 @@
+package roomescape.service;
+
+import org.springframework.stereotype.Service;
+import roomescape.dao.TimeDAO;
+import roomescape.domain.Time;
+import roomescape.dto.TimeDto;
+
+import java.util.List;
+
+@Service
+public class TimeService {
+    private final TimeDAO timeDAO;
+
+    public TimeService(TimeDAO timeDAO) {
+        this.timeDAO = timeDAO;
+    }
+
+    public Time addTime(TimeDto timeDto) {
+        Time time = new Time(0, timeDto.time());
+        timeDAO.insert(time);
+        int id = timeDAO.getId(time);
+        time.setId(id);
+        return time;
+    }
+
+    public List<Time> getAllTimes() {
+        return timeDAO.findAll();
+    }
+
+    public void deleteTime(int id) {
+        timeDAO.delete(id);
+    }
+}
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index fb84ad586..85da9f936 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -8,3 +8,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)
+);
\ No newline at end of file
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 3d2214adf..ec981ea08 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -163,5 +163,32 @@ void addAndDeleteData() {
         assertThat(countAfterDelete).isEqualTo(0);
     }
 
+    @DisplayName("8단계: 시간 관리 기능")
+    @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 878d9dd3923028304d4c04c65810535f24d423d1 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 11 Jul 2024 19:45:51 +0900
Subject: [PATCH 21/37] =?UTF-8?q?Feat:=20ReservationService=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

---
 .../roomescape/service/ReservationService.java | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 src/main/java/roomescape/service/ReservationService.java

diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
new file mode 100644
index 000000000..dd11fedca
--- /dev/null
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -0,0 +1,18 @@
+package roomescape.service;
+
+import org.springframework.stereotype.Service;
+import roomescape.dao.RoomDAO;
+import roomescape.domain.Reservation;
+
+@Service
+public class ReservationService {
+    private final RoomDAO roomDAO;
+
+    public ReservationService(RoomDAO roomDAO) {
+        this.roomDAO = roomDAO;
+    }
+
+    public void addReservation(Reservation reservation) {
+        roomDAO.insert(reservation);
+    }
+}

From 80f0f2053abc2baeb72ec5075777d3ad9b28a1a7 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 11 Jul 2024 19:46:11 +0900
Subject: [PATCH 22/37] =?UTF-8?q?Feat:=209=EB=8B=A8=EA=B3=84=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A1=B4=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/RoomescapeController.java      | 43 ++++++++++++-------
 src/main/java/roomescape/dao/RoomDAO.java     | 39 +++++++++--------
 src/main/java/roomescape/dao/TimeDAO.java     | 11 +++++
 .../java/roomescape/domain/Reservation.java   |  6 +--
 .../java/roomescape/dto/ReservationDto.java   |  6 ++-
 .../java/roomescape/service/TimeService.java  |  4 ++
 src/main/resources/schema.sql                 | 19 ++++----
 src/test/java/roomescape/MissionStepTest.java | 17 +++++++-
 8 files changed, 96 insertions(+), 49 deletions(-)

diff --git a/src/main/java/roomescape/controller/RoomescapeController.java b/src/main/java/roomescape/controller/RoomescapeController.java
index 60e43f1ee..c2d324413 100644
--- a/src/main/java/roomescape/controller/RoomescapeController.java
+++ b/src/main/java/roomescape/controller/RoomescapeController.java
@@ -5,30 +5,35 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.util.UriComponentsBuilder;
 import roomescape.domain.Time;
-import roomescape.dto.TimeDto;
 import roomescape.domain.Reservation;
 import roomescape.dao.RoomDAO;
 import roomescape.dto.ReservationDto;
+import roomescape.service.ReservationService;
 import roomescape.service.TimeService;
 
+import java.net.URI;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Controller
 public class RoomescapeController {
 
-    private final roomescape.dao.RoomDAO RoomDAO;
-    private final TimeService TimeService;
+    private final RoomDAO RoomDAO;
+    private final TimeService timeService;
+    private final ReservationService reservationService;
 
-    public RoomescapeController(RoomDAO roomDAO, TimeService timeService) {
-        RoomDAO = roomDAO;
-        TimeService = timeService;
+    public RoomescapeController(RoomDAO roomDAO, TimeService timeService, ReservationService reservationService) {
+        this.RoomDAO = roomDAO;
+        this.timeService = timeService;
+        this.reservationService = reservationService;
     }
 
     @GetMapping("/reservation")
     public String reservation() {
-        return "reservation";
+        return "new-reservation";
     }
 
     @GetMapping("/reservations")
@@ -41,17 +46,23 @@ public ResponseEntity<List<ReservationDto>> getAllReservations(){
     }
 
     @PostMapping("/reservations")
-    @ResponseBody
-    public ResponseEntity<ReservationDto> createReservation( @RequestBody ReservationDto reservationDto) {
-        if (reservationDto.name() == null || reservationDto.date() == null || reservationDto.time() == null) {
-            throw new IllegalArgumentException("예약 정보가 부족합니다.");
+    public ResponseEntity<?> createReservation(@RequestBody Map<String, String> reservationDto) {
+        String name = reservationDto.get("name");
+        String date = reservationDto.get("date");
+        String timeString = reservationDto.get("time");
+
+        Time time = timeService.findByTime(timeString);
+        if (time == null) {
+            return ResponseEntity.badRequest().body("잘못된 시간입니다.");
         }
-        Reservation reservation = new Reservation(0, reservationDto.name(), reservationDto.date(), reservationDto.time());
-        RoomDAO.insert(reservation);
-        HttpHeaders headers = new HttpHeaders();
 
-        headers.add("Location", "/reservations/" + RoomDAO.getId(reservation));
-        return new ResponseEntity<>(reservationDto,headers, HttpStatus.CREATED);
+        Reservation reservation = new Reservation(0, name, date, time);
+        reservationService.addReservation(reservation);
+        URI location = UriComponentsBuilder.fromPath("/reservations/{id}")
+                .buildAndExpand(RoomDAO.getId(reservation))
+                .toUri();
+
+        return ResponseEntity.created(location).body(reservation);
     }
 
 
diff --git a/src/main/java/roomescape/dao/RoomDAO.java b/src/main/java/roomescape/dao/RoomDAO.java
index 7235cf8e6..968e364dd 100644
--- a/src/main/java/roomescape/dao/RoomDAO.java
+++ b/src/main/java/roomescape/dao/RoomDAO.java
@@ -4,6 +4,7 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 import roomescape.domain.Reservation;
+import roomescape.domain.Time;
 
 import java.util.List;
 
@@ -16,17 +17,19 @@ public RoomDAO(JdbcTemplate jdbcTemplate) {
     }
 
     public List<Reservation> findAll() {
-        return jdbcTemplate.query("SELECT * FROM reservation", (resultSet, rowNum) -> new Reservation(
-                resultSet.getInt("id"),
-                resultSet.getString("name"),
-                resultSet.getString("date"),
-                resultSet.getString("time")
-        ));
+        return jdbcTemplate.query("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",
+                (resultSet, rowNum) -> new Reservation(
+                        resultSet.getInt("reservation_id"),
+                        resultSet.getString("name"),
+                        resultSet.getString("date"),
+                        new Time(resultSet.getInt("time_id"), resultSet.getString("time_value"))
+                ));
     }
 
     public void insert(Reservation reservation) {
-        jdbcTemplate.update("INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)",
-                reservation.getName(), reservation.getDate(), reservation.getTime());
+        jdbcTemplate.update("INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)",
+                reservation.getName(), reservation.getDate(), reservation.getTime().getId());
     }
 
     public void delete(int id) {
@@ -34,20 +37,22 @@ public void delete(int id) {
     }
 
     public int getId(Reservation reservation) {
-        return jdbcTemplate.queryForObject("SELECT id FROM reservation WHERE name = ? AND date = ? AND time = ?",
-                Integer.class, reservation.getName(), reservation.getDate(), reservation.getTime());
+        return jdbcTemplate.queryForObject("SELECT id FROM reservation WHERE name = ? AND date = ? AND time_id = ?",
+                Integer.class, reservation.getName(), reservation.getDate(), reservation.getTime().getId());
     }
 
     public Reservation findById(int id) {
         try {
-            return jdbcTemplate.queryForObject("SELECT * FROM reservation WHERE id = ?", (resultSet, rowNum) -> new Reservation(
-                    resultSet.getInt("id"),
-                    resultSet.getString("name"),
-                    resultSet.getString("date"),
-                    resultSet.getString("time")
-            ), id);
+            return jdbcTemplate.queryForObject("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 WHERE r.id = ?",
+                    (resultSet, rowNum) -> new Reservation(
+                            resultSet.getInt("reservation_id"),
+                            resultSet.getString("name"),
+                            resultSet.getString("date"),
+                            new Time(resultSet.getInt("time_id"), resultSet.getString("time_value"))
+                    ), id);
         } catch (EmptyResultDataAccessException e) {
             throw new IllegalArgumentException("찾는 id가 존재하지 않습니다!");
         }
-    }
+}
 }
diff --git a/src/main/java/roomescape/dao/TimeDAO.java b/src/main/java/roomescape/dao/TimeDAO.java
index 57c372809..4e010a503 100644
--- a/src/main/java/roomescape/dao/TimeDAO.java
+++ b/src/main/java/roomescape/dao/TimeDAO.java
@@ -1,5 +1,6 @@
 package roomescape.dao;
 
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 import roomescape.domain.Reservation;
@@ -41,4 +42,14 @@ public List<Time> findAll() {
     public void delete(int id) {
         jdbcTemplate.update("DELETE FROM time WHERE id = ?", id);
     }
+
+    public Time findByTime(String time) {
+        try {
+            return jdbcTemplate.queryForObject("SELECT id, time FROM time WHERE time = ? LIMIT 1",
+                    (resultSet, rowNum) -> new Time(resultSet.getInt("id"), resultSet.getString("time")),
+                    time);
+        } catch (EmptyResultDataAccessException e) {
+            return null;
+        }
+    }
 }
diff --git a/src/main/java/roomescape/domain/Reservation.java b/src/main/java/roomescape/domain/Reservation.java
index c09c96c6e..5b1ffcf28 100644
--- a/src/main/java/roomescape/domain/Reservation.java
+++ b/src/main/java/roomescape/domain/Reservation.java
@@ -5,9 +5,9 @@ public class Reservation {
 
     private String name;
     private String date;
-    private String time;
+    private Time time;
 
-    public Reservation(int id, String name, String date, String time) {
+    public Reservation(int id, String name, String date, Time time) {
         this.id = id;
         this.name = name;
         this.date = date;
@@ -26,7 +26,7 @@ public String getDate() {
         return date;
     }
 
-    public String getTime() {
+    public Time getTime() {
         return time;
     }
 }
diff --git a/src/main/java/roomescape/dto/ReservationDto.java b/src/main/java/roomescape/dto/ReservationDto.java
index 88dd33725..ab223d426 100644
--- a/src/main/java/roomescape/dto/ReservationDto.java
+++ b/src/main/java/roomescape/dto/ReservationDto.java
@@ -1,9 +1,11 @@
 package roomescape.dto;
 
+import roomescape.domain.Time;
+
 public record ReservationDto(
-        String name, String date, String time
+        String name, String date, Time time
 ) {
-    public static ReservationDto from(String name, String date, String time) {
+    public static ReservationDto from(String name, String date, Time time) {
         return new ReservationDto(name, date, time);
     }
 }
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
index 8d6a9463d..9a47cf0ed 100644
--- a/src/main/java/roomescape/service/TimeService.java
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -30,4 +30,8 @@ public List<Time> getAllTimes() {
     public void deleteTime(int id) {
         timeDAO.delete(id);
     }
+
+    public Time findByTime(String time) {
+        return timeDAO.findByTime(time);
+    }
 }
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 85da9f936..e89471fd5 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -1,17 +1,18 @@
 DROP TABLE IF EXISTS reservations;
 
-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)
-);
\ No newline at end of file
+    name VARCHAR(255) NOT NULL,
+    date VARCHAR(255) NOT NULL,
+    time_id BIGINT,
+    PRIMARY KEY (id),
+    FOREIGN KEY (time_id) REFERENCES time(id)
+    );
\ No newline at end of file
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index ec981ea08..62d3d2e05 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -165,7 +165,7 @@ void addAndDeleteData() {
 
     @DisplayName("8단계: 시간 관리 기능")
     @Test
-    void 팔단계() {
+    void testTimeManagementFunctionality() {
         Map<String, String> params = new HashMap<>();
         params.put("time", "10:00");
 
@@ -189,6 +189,19 @@ void addAndDeleteData() {
                 .statusCode(204);
     }
 
+    @DisplayName("9단계: 기존 코드 수정")
+    @Test
+    void testInvalidTimeReservation() {
+        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 976c1de3583c78cd609f60de058c0577c7353f19 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 11 Jul 2024 21:02:41 +0900
Subject: [PATCH 23/37] =?UTF-8?q?Feat:=2010=EB=8B=A8=EA=B3=84=20=EA=B3=84?=
 =?UTF-8?q?=EC=B8=B5=ED=99=94=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 62d3d2e05..cf08feb49 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -8,8 +8,10 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.DirtiesContext;
+import roomescape.controller.RoomescapeController;
 import roomescape.domain.Reservation;
 
+import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -204,4 +206,21 @@ void testInvalidTimeReservation() {
                 .then().log().all()
                 .statusCode(400);
     }
+
+    @Autowired
+    private RoomescapeController roomescapeController;
+
+    @Test
+    void 십단계() {
+        boolean isJdbcTemplateInjected = false;
+
+        for (Field field : roomescapeController.getClass().getDeclaredFields()) {
+            if (field.getType().equals(JdbcTemplate.class)) {
+                isJdbcTemplateInjected = true;
+                break;
+            }
+        }
+
+        assertThat(isJdbcTemplateInjected).isFalse();
+    }
 }

From 12561a7cebaad6fe2a2c65cb041d67cb847c540a Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 11 Jul 2024 21:14:01 +0900
Subject: [PATCH 24/37] =?UTF-8?q?Refactor:=20=EA=B3=84=EC=B8=B5=ED=99=94?=
 =?UTF-8?q?=20=EB=A6=AC=ED=8C=A9=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/RoomescapeController.java      | 25 +++++++------------
 .../java/roomescape/domain/Reservation.java   |  4 +++
 .../service/ReservationService.java           | 21 ++++++++++++++--
 3 files changed, 32 insertions(+), 18 deletions(-)

diff --git a/src/main/java/roomescape/controller/RoomescapeController.java b/src/main/java/roomescape/controller/RoomescapeController.java
index c2d324413..b638fc00f 100644
--- a/src/main/java/roomescape/controller/RoomescapeController.java
+++ b/src/main/java/roomescape/controller/RoomescapeController.java
@@ -46,23 +46,16 @@ public ResponseEntity<List<ReservationDto>> getAllReservations(){
     }
 
     @PostMapping("/reservations")
-    public ResponseEntity<?> createReservation(@RequestBody Map<String, String> reservationDto) {
-        String name = reservationDto.get("name");
-        String date = reservationDto.get("date");
-        String timeString = reservationDto.get("time");
-
-        Time time = timeService.findByTime(timeString);
-        if (time == null) {
-            return ResponseEntity.badRequest().body("잘못된 시간입니다.");
+    public ResponseEntity<?> createReservation(@RequestBody ReservationDto reservationDto) {
+        try {
+            Reservation reservation = reservationService.addReservation(reservationDto);
+            URI location = UriComponentsBuilder.fromPath("/reservations/{id}")
+                    .buildAndExpand(reservation.getId())
+                    .toUri();
+            return ResponseEntity.created(location).body(reservation);
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.badRequest().body(e.getMessage());
         }
-
-        Reservation reservation = new Reservation(0, name, date, time);
-        reservationService.addReservation(reservation);
-        URI location = UriComponentsBuilder.fromPath("/reservations/{id}")
-                .buildAndExpand(RoomDAO.getId(reservation))
-                .toUri();
-
-        return ResponseEntity.created(location).body(reservation);
     }
 
 
diff --git a/src/main/java/roomescape/domain/Reservation.java b/src/main/java/roomescape/domain/Reservation.java
index 5b1ffcf28..39a20279f 100644
--- a/src/main/java/roomescape/domain/Reservation.java
+++ b/src/main/java/roomescape/domain/Reservation.java
@@ -29,4 +29,8 @@ public String getDate() {
     public Time getTime() {
         return time;
     }
+
+    public void setId(int id) {
+        this.id = id;
+    }
 }
diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
index dd11fedca..90baa4e83 100644
--- a/src/main/java/roomescape/service/ReservationService.java
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -3,16 +3,33 @@
 import org.springframework.stereotype.Service;
 import roomescape.dao.RoomDAO;
 import roomescape.domain.Reservation;
+import roomescape.domain.Time;
+import roomescape.dto.ReservationDto;
 
 @Service
 public class ReservationService {
     private final RoomDAO roomDAO;
+    private final TimeService timeService;
 
-    public ReservationService(RoomDAO roomDAO) {
+    public ReservationService(RoomDAO roomDAO, TimeService timeService) {
         this.roomDAO = roomDAO;
+        this.timeService = timeService;
     }
 
-    public void addReservation(Reservation reservation) {
+    public Reservation addReservation(ReservationDto reservationDto) {
+        String name = reservationDto.name();
+        String date = reservationDto.date();
+        String timeString = reservationDto.time().getTime();
+
+        Time time = timeService.findByTime(timeString);
+        if (time == null) {
+            throw new IllegalArgumentException("시간을 찾을 수 없습니다.");
+        }
+
+        Reservation reservation = new Reservation(0, name, date, time);
         roomDAO.insert(reservation);
+        int id = roomDAO.getId(reservation);
+        reservation.setId(id);
+        return reservation;
     }
 }

From 7246d9273024ca5875835db30bd3b5da17049226 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 11 Jul 2024 21:18:31 +0900
Subject: [PATCH 25/37] =?UTF-8?q?Refactor:=20=ED=85=8C=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=EB=AA=85=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index cf08feb49..13059806c 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -211,7 +211,7 @@ void testInvalidTimeReservation() {
     private RoomescapeController roomescapeController;
 
     @Test
-    void 십단계() {
+    void verifyJdbcTemplateNotInjected() {
         boolean isJdbcTemplateInjected = false;
 
         for (Field field : roomescapeController.getClass().getDeclaredFields()) {

From bb9ddc2c0b76dfe52b3b61dca73fe2994264a8a7 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Fri, 12 Jul 2024 04:43:02 +0900
Subject: [PATCH 26/37] =?UTF-8?q?Refactor:=20=ED=95=84=EC=9A=94=EC=97=86?=
 =?UTF-8?q?=EB=8A=94=20import=EB=AC=B8=20=EC=A0=9C=EA=B1=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/roomescape/controller/RoomescapeController.java  | 8 --------
 src/main/java/roomescape/dao/TimeDAO.java                 | 2 --
 src/test/java/roomescape/MissionStepTest.java             | 1 -
 3 files changed, 11 deletions(-)

diff --git a/src/main/java/roomescape/controller/RoomescapeController.java b/src/main/java/roomescape/controller/RoomescapeController.java
index b638fc00f..8032a75ea 100644
--- a/src/main/java/roomescape/controller/RoomescapeController.java
+++ b/src/main/java/roomescape/controller/RoomescapeController.java
@@ -1,12 +1,10 @@
 package roomescape.controller;
 
-import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.util.UriComponentsBuilder;
-import roomescape.domain.Time;
 import roomescape.domain.Reservation;
 import roomescape.dao.RoomDAO;
 import roomescape.dto.ReservationDto;
@@ -15,19 +13,16 @@
 
 import java.net.URI;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
 
 @Controller
 public class RoomescapeController {
 
     private final RoomDAO RoomDAO;
-    private final TimeService timeService;
     private final ReservationService reservationService;
 
     public RoomescapeController(RoomDAO roomDAO, TimeService timeService, ReservationService reservationService) {
         this.RoomDAO = roomDAO;
-        this.timeService = timeService;
         this.reservationService = reservationService;
     }
 
@@ -58,8 +53,6 @@ public ResponseEntity<?> createReservation(@RequestBody ReservationDto reservati
         }
     }
 
-
-
     @DeleteMapping("/reservations/{id}")
     @ResponseBody
     public ResponseEntity<Reservation> deleteReservation(@PathVariable int id){
@@ -71,7 +64,6 @@ public ResponseEntity<Reservation> deleteReservation(@PathVariable int id){
         throw new IllegalArgumentException("삭제할 예약이 없습니다.");
     }
 
-
     @ExceptionHandler(IllegalArgumentException.class)
     public ResponseEntity<String> handleIllegalArgumentException(IllegalArgumentException e) {
         return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST);
diff --git a/src/main/java/roomescape/dao/TimeDAO.java b/src/main/java/roomescape/dao/TimeDAO.java
index 4e010a503..3ae90a8c1 100644
--- a/src/main/java/roomescape/dao/TimeDAO.java
+++ b/src/main/java/roomescape/dao/TimeDAO.java
@@ -3,9 +3,7 @@
 import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
-import roomescape.domain.Reservation;
 import roomescape.domain.Time;
-import roomescape.dto.TimeDto;
 
 import java.util.List;
 
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 13059806c..77413c1e6 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -220,7 +220,6 @@ void verifyJdbcTemplateNotInjected() {
                 break;
             }
         }
-
         assertThat(isJdbcTemplateInjected).isFalse();
     }
 }

From cadabba0f0e40da20b0ef3a13a059ec19e9cc88c Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Fri, 12 Jul 2024 05:08:46 +0900
Subject: [PATCH 27/37] =?UTF-8?q?Feat:=20Time=20=EB=B0=98=ED=99=98=20Dto?=
 =?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

---
 .../roomescape/controller/TimeController.java | 14 +++++++-------
 src/main/java/roomescape/dto/TimeResDto.java  | 11 +++++++++++
 .../java/roomescape/service/TimeService.java  | 19 +++++++++++++------
 3 files changed, 31 insertions(+), 13 deletions(-)
 create mode 100644 src/main/java/roomescape/dto/TimeResDto.java

diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
index 9e4f506ab..6f31956fa 100644
--- a/src/main/java/roomescape/controller/TimeController.java
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -6,6 +6,7 @@
 import org.springframework.web.bind.annotation.*;
 import roomescape.domain.Time;
 import roomescape.dto.TimeDto;
+import roomescape.dto.TimeResDto;
 import roomescape.service.TimeService;
 
 import java.util.List;
@@ -21,16 +22,15 @@ public TimeController(TimeService timeService) {
 
     @PostMapping
     @ResponseBody
-    public ResponseEntity<Time> addTime(@RequestBody TimeDto timeDto) {
-        Time time = timeService.addTime(timeDto);
+    public ResponseEntity<TimeResDto> addTime(@RequestBody TimeDto timeDto) {
+        TimeResDto timeResDto = timeService.addTime(timeDto);
         HttpHeaders headers = new HttpHeaders();
-        headers.add("Location", "/times/" + time.getId());
-        return new ResponseEntity<>(time, headers, HttpStatus.CREATED);
+        headers.add("Location", "/times/" + timeResDto.id());
+        return new ResponseEntity<>(timeResDto, headers, HttpStatus.CREATED);
     }
-
     @GetMapping
-    public ResponseEntity<List<Time>> getAllTimes() {
-        List<Time> times = timeService.getAllTimes();
+    public ResponseEntity<List<TimeResDto>> getAllTimes() {
+        List<TimeResDto> times = timeService.getAllTimes();
         return new ResponseEntity<>(times, HttpStatus.OK);
     }
 
diff --git a/src/main/java/roomescape/dto/TimeResDto.java b/src/main/java/roomescape/dto/TimeResDto.java
new file mode 100644
index 000000000..5a7d48d28
--- /dev/null
+++ b/src/main/java/roomescape/dto/TimeResDto.java
@@ -0,0 +1,11 @@
+package roomescape.dto;
+
+import roomescape.domain.Time;
+
+public record TimeResDto(
+        int id, String time
+) {
+    public static TimeResDto from(Time time) {
+        return new TimeResDto(time.getId(), time.getTime());
+    }
+}
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
index 9a47cf0ed..0af62402f 100644
--- a/src/main/java/roomescape/service/TimeService.java
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -4,8 +4,10 @@
 import roomescape.dao.TimeDAO;
 import roomescape.domain.Time;
 import roomescape.dto.TimeDto;
+import roomescape.dto.TimeResDto;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Service
 public class TimeService {
@@ -15,23 +17,28 @@ public TimeService(TimeDAO timeDAO) {
         this.timeDAO = timeDAO;
     }
 
-    public Time addTime(TimeDto timeDto) {
+    public TimeResDto addTime(TimeDto timeDto) {
         Time time = new Time(0, timeDto.time());
         timeDAO.insert(time);
         int id = timeDAO.getId(time);
         time.setId(id);
-        return time;
+        return new TimeResDto(id, time.getTime());
     }
 
-    public List<Time> getAllTimes() {
-        return timeDAO.findAll();
+    public List<TimeResDto> getAllTimes() {
+        List<Time> times = timeDAO.findAll();
+        return times.stream()
+                .map(TimeResDto::from)
+                .collect(Collectors.toList());
     }
 
     public void deleteTime(int id) {
         timeDAO.delete(id);
     }
+    public TimeResDto findByTime(String time) {
+        Time times = timeDAO.findByTime(time);
+        return TimeResDto.from(times);
 
-    public Time findByTime(String time) {
-        return timeDAO.findByTime(time);
     }
+
 }

From d55847c79c2a00de832582d0f269871beabbc5d8 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Fri, 12 Jul 2024 05:09:44 +0900
Subject: [PATCH 28/37] =?UTF-8?q?Feat:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=84=A4=EB=AA=85=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 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 77413c1e6..a7a1fc97c 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -210,6 +210,7 @@ void testInvalidTimeReservation() {
     @Autowired
     private RoomescapeController roomescapeController;
 
+    @DisplayName("10단계: 계층화 리팩터링")
     @Test
     void verifyJdbcTemplateNotInjected() {
         boolean isJdbcTemplateInjected = false;

From 4f515e3d8b92f096fd9a712d6442f34fc780f4b8 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Fri, 12 Jul 2024 05:13:59 +0900
Subject: [PATCH 29/37] =?UTF-8?q?Refactor:=20=EC=98=88=EC=95=BD=20?=
 =?UTF-8?q?=EC=84=9C=EB=B9=84=EC=8A=A4=EC=97=90=EC=84=9C=20Dto=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=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/service/ReservationService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
index 90baa4e83..180b5ebbf 100644
--- a/src/main/java/roomescape/service/ReservationService.java
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -5,6 +5,7 @@
 import roomescape.domain.Reservation;
 import roomescape.domain.Time;
 import roomescape.dto.ReservationDto;
+import roomescape.dto.TimeResDto;
 
 @Service
 public class ReservationService {
@@ -21,7 +22,8 @@ public Reservation addReservation(ReservationDto reservationDto) {
         String date = reservationDto.date();
         String timeString = reservationDto.time().getTime();
 
-        Time time = timeService.findByTime(timeString);
+        TimeResDto timeResDto = timeService.findByTime(timeString);
+        Time time = new Time(timeResDto.id(), timeResDto.time());
         if (time == null) {
             throw new IllegalArgumentException("시간을 찾을 수 없습니다.");
         }

From e47f4a0cb77a7710306789ad06635671029a9f1d Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Mon, 15 Jul 2024 05:09:58 +0900
Subject: [PATCH 30/37] =?UTF-8?q?refactor:=20=EA=B3=84=EC=B8=B5=ED=99=94?=
 =?UTF-8?q?=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/RoomescapeController.java      | 24 +++++++------------
 src/main/java/roomescape/dao/RoomDAO.java     |  2 +-
 src/main/java/roomescape/domain/Time.java     |  4 ++--
 .../service/ReservationService.java           | 21 +++++++++++++---
 4 files changed, 29 insertions(+), 22 deletions(-)

diff --git a/src/main/java/roomescape/controller/RoomescapeController.java b/src/main/java/roomescape/controller/RoomescapeController.java
index 8032a75ea..254def46a 100644
--- a/src/main/java/roomescape/controller/RoomescapeController.java
+++ b/src/main/java/roomescape/controller/RoomescapeController.java
@@ -6,23 +6,18 @@
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.util.UriComponentsBuilder;
 import roomescape.domain.Reservation;
-import roomescape.dao.RoomDAO;
 import roomescape.dto.ReservationDto;
 import roomescape.service.ReservationService;
-import roomescape.service.TimeService;
 
 import java.net.URI;
 import java.util.List;
-import java.util.stream.Collectors;
 
 @Controller
 public class RoomescapeController {
 
-    private final RoomDAO RoomDAO;
     private final ReservationService reservationService;
 
-    public RoomescapeController(RoomDAO roomDAO, TimeService timeService, ReservationService reservationService) {
-        this.RoomDAO = roomDAO;
+    public RoomescapeController(ReservationService reservationService) {
         this.reservationService = reservationService;
     }
 
@@ -34,9 +29,7 @@ public String reservation() {
     @GetMapping("/reservations")
     @ResponseBody
     public ResponseEntity<List<ReservationDto>> getAllReservations(){
-        List<ReservationDto> reservations = RoomDAO.findAll().stream()
-                .map(reservation -> new ReservationDto(reservation.getName(), reservation.getDate(), reservation.getTime()))
-                .collect(Collectors.toList());
+        List<ReservationDto> reservations = reservationService.getAllReservations();
         return new ResponseEntity<>(reservations, HttpStatus.OK);
     }
 
@@ -56,17 +49,16 @@ public ResponseEntity<?> createReservation(@RequestBody ReservationDto reservati
     @DeleteMapping("/reservations/{id}")
     @ResponseBody
     public ResponseEntity<Reservation> deleteReservation(@PathVariable int id){
-            if (RoomDAO.findById(id) != null) {
-                RoomDAO.delete(id);
-                return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-            }
-        // 예약이 없는 경우 Exception 발생
-        throw new IllegalArgumentException("삭제할 예약이 없습니다.");
+        try {
+            reservationService.deleteReservation(id);
+            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        } catch (IllegalArgumentException e) {
+            return ResponseEntity.badRequest().body(null);
+        }
     }
 
     @ExceptionHandler(IllegalArgumentException.class)
     public ResponseEntity<String> handleIllegalArgumentException(IllegalArgumentException e) {
         return new ResponseEntity<>(e.getMessage(), HttpStatus.BAD_REQUEST);
     }
-
 }
diff --git a/src/main/java/roomescape/dao/RoomDAO.java b/src/main/java/roomescape/dao/RoomDAO.java
index 968e364dd..2b3600661 100644
--- a/src/main/java/roomescape/dao/RoomDAO.java
+++ b/src/main/java/roomescape/dao/RoomDAO.java
@@ -32,7 +32,7 @@ public void insert(Reservation reservation) {
                 reservation.getName(), reservation.getDate(), reservation.getTime().getId());
     }
 
-    public void delete(int id) {
+    public void deletebyId(int id) {
         jdbcTemplate.update("DELETE FROM reservation WHERE id = ?", id);
     }
 
diff --git a/src/main/java/roomescape/domain/Time.java b/src/main/java/roomescape/domain/Time.java
index 3c2428702..8003fc430 100644
--- a/src/main/java/roomescape/domain/Time.java
+++ b/src/main/java/roomescape/domain/Time.java
@@ -1,8 +1,8 @@
 package roomescape.domain;
 
 public class Time {
-    int id;
-    String time;
+    private int id;
+    private String time;
 
     public Time(int id, String time) {
         this.id = id;
diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
index 180b5ebbf..ad115f022 100644
--- a/src/main/java/roomescape/service/ReservationService.java
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -7,6 +7,9 @@
 import roomescape.dto.ReservationDto;
 import roomescape.dto.TimeResDto;
 
+import java.util.List;
+import java.util.stream.Collectors;
+
 @Service
 public class ReservationService {
     private final RoomDAO roomDAO;
@@ -17,6 +20,12 @@ public ReservationService(RoomDAO roomDAO, TimeService timeService) {
         this.timeService = timeService;
     }
 
+    public List<ReservationDto> getAllReservations() {
+        return roomDAO.findAll().stream()
+                .map(reservation -> new ReservationDto(reservation.getName(), reservation.getDate(), reservation.getTime()))
+                .collect(Collectors.toList());
+    }
+
     public Reservation addReservation(ReservationDto reservationDto) {
         String name = reservationDto.name();
         String date = reservationDto.date();
@@ -24,9 +33,7 @@ public Reservation addReservation(ReservationDto reservationDto) {
 
         TimeResDto timeResDto = timeService.findByTime(timeString);
         Time time = new Time(timeResDto.id(), timeResDto.time());
-        if (time == null) {
-            throw new IllegalArgumentException("시간을 찾을 수 없습니다.");
-        }
+
 
         Reservation reservation = new Reservation(0, name, date, time);
         roomDAO.insert(reservation);
@@ -34,4 +41,12 @@ public Reservation addReservation(ReservationDto reservationDto) {
         reservation.setId(id);
         return reservation;
     }
+
+    public void deleteReservation(int id) {
+        if (roomDAO.findById(id) != null) {
+            roomDAO.deletebyId(id);
+        } else {
+            throw new IllegalArgumentException("삭제할 예약이 없습니다.");
+        }
+    }
 }

From 6d117be3028d552393a141ee2c442110f9325ee3 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Mon, 22 Jul 2024 20:55:27 +0900
Subject: [PATCH 31/37] =?UTF-8?q?remove:=20set=EB=A9=94=EC=84=9C=EB=93=9C?=
 =?UTF-8?q?=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/domain/Reservation.java         | 4 +---
 src/main/java/roomescape/domain/Time.java                | 3 ---
 src/main/java/roomescape/service/ReservationService.java | 2 --
 src/main/java/roomescape/service/TimeService.java        | 1 -
 4 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/main/java/roomescape/domain/Reservation.java b/src/main/java/roomescape/domain/Reservation.java
index 39a20279f..d44bc57d7 100644
--- a/src/main/java/roomescape/domain/Reservation.java
+++ b/src/main/java/roomescape/domain/Reservation.java
@@ -30,7 +30,5 @@ public Time getTime() {
         return time;
     }
 
-    public void setId(int id) {
-        this.id = id;
-    }
+
 }
diff --git a/src/main/java/roomescape/domain/Time.java b/src/main/java/roomescape/domain/Time.java
index 8003fc430..8ab0cb0b3 100644
--- a/src/main/java/roomescape/domain/Time.java
+++ b/src/main/java/roomescape/domain/Time.java
@@ -21,7 +21,4 @@ public int getId() {
         return id;
     }
 
-    public void setId(int id) {
-        this.id = id;
-    }
 }
diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
index ad115f022..3def8295c 100644
--- a/src/main/java/roomescape/service/ReservationService.java
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -37,8 +37,6 @@ public Reservation addReservation(ReservationDto reservationDto) {
 
         Reservation reservation = new Reservation(0, name, date, time);
         roomDAO.insert(reservation);
-        int id = roomDAO.getId(reservation);
-        reservation.setId(id);
         return reservation;
     }
 
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
index 0af62402f..8bb17dbb3 100644
--- a/src/main/java/roomescape/service/TimeService.java
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -21,7 +21,6 @@ public TimeResDto addTime(TimeDto timeDto) {
         Time time = new Time(0, timeDto.time());
         timeDAO.insert(time);
         int id = timeDAO.getId(time);
-        time.setId(id);
         return new TimeResDto(id, time.getTime());
     }
 

From f93e66f199a279225bc2acc6e7d22bbe26b4d31d Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Wed, 24 Jul 2024 18:41:06 +0900
Subject: [PATCH 32/37] =?UTF-8?q?refactor:=20header=20=EB=A1=9C=EC=A7=81?=
 =?UTF-8?q?=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/controller/TimeController.java | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
index 6f31956fa..37fb39d86 100644
--- a/src/main/java/roomescape/controller/TimeController.java
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -1,16 +1,21 @@
 package roomescape.controller;
 
+import java.util.List;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.web.bind.annotation.*;
-import roomescape.domain.Time;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.bind.annotation.RestController;
 import roomescape.dto.TimeDto;
 import roomescape.dto.TimeResDto;
 import roomescape.service.TimeService;
 
-import java.util.List;
-
 @RestController
 @RequestMapping("/times")
 public class TimeController {
@@ -24,10 +29,16 @@ public TimeController(TimeService timeService) {
     @ResponseBody
     public ResponseEntity<TimeResDto> addTime(@RequestBody TimeDto timeDto) {
         TimeResDto timeResDto = timeService.addTime(timeDto);
-        HttpHeaders headers = new HttpHeaders();
-        headers.add("Location", "/times/" + timeResDto.id());
+        HttpHeaders headers = createHeader("/times/" + timeResDto.id());
         return new ResponseEntity<>(timeResDto, headers, HttpStatus.CREATED);
     }
+
+    private HttpHeaders createHeader(String path) {
+        HttpHeaders headers = new HttpHeaders();
+        headers.add("Location", path);
+        return headers;
+    }
+
     @GetMapping
     public ResponseEntity<List<TimeResDto>> getAllTimes() {
         List<TimeResDto> times = timeService.getAllTimes();

From cbec7ba46af6efa6b68345752f62e933ad733644 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Wed, 24 Jul 2024 18:58:47 +0900
Subject: [PATCH 33/37] =?UTF-8?q?refactor:=20try-catch=20=EB=AC=B8=20?=
 =?UTF-8?q?=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/dao/TimeDAO.java     | 34 ++++++++-----------
 .../java/roomescape/service/TimeService.java  | 15 ++++----
 2 files changed, 22 insertions(+), 27 deletions(-)

diff --git a/src/main/java/roomescape/dao/TimeDAO.java b/src/main/java/roomescape/dao/TimeDAO.java
index 3ae90a8c1..210e9e943 100644
--- a/src/main/java/roomescape/dao/TimeDAO.java
+++ b/src/main/java/roomescape/dao/TimeDAO.java
@@ -1,12 +1,11 @@
 package roomescape.dao;
 
-import org.springframework.dao.EmptyResultDataAccessException;
+import java.util.List;
+import java.util.Optional;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Repository;
 import roomescape.domain.Time;
 
-import java.util.List;
-
 @Repository
 public class TimeDAO {
     private final JdbcTemplate jdbcTemplate;
@@ -20,15 +19,12 @@ public void insert(Time time) {
                 time.getTime());
     }
 
-    public int getId(Time time) {
-        try {
-            return jdbcTemplate.queryForObject(
-                    "SELECT id FROM time WHERE time = ? LIMIT 1",
-                    Integer.class, time.getTime()
-            );
-        } catch (Exception e) {
-            throw new RuntimeException("찾는 id가 존재하지 않습니다!");
-        }
+    public Optional<Integer> getId(Time time) {
+        return jdbcTemplate.query(
+                "SELECT id FROM time WHERE time = ? LIMIT 1",
+                (rs, rowNum) -> rs.getInt("id"),
+                time.getTime()
+        ).stream().findFirst();
     }
 
     public List<Time> findAll() {
@@ -41,13 +37,11 @@ public void delete(int id) {
         jdbcTemplate.update("DELETE FROM time WHERE id = ?", id);
     }
 
-    public Time findByTime(String time) {
-        try {
-            return jdbcTemplate.queryForObject("SELECT id, time FROM time WHERE time = ? LIMIT 1",
-                    (resultSet, rowNum) -> new Time(resultSet.getInt("id"), resultSet.getString("time")),
-                    time);
-        } catch (EmptyResultDataAccessException e) {
-            return null;
-        }
+    public Optional<Time> findByTime(String time) {
+        return jdbcTemplate.query(
+                "SELECT id, time FROM time WHERE time = ? LIMIT 1",
+                (rs, rowNum) -> new Time(rs.getInt("id"), rs.getString("time")),
+                time
+        ).stream().findFirst();
     }
 }
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
index 8bb17dbb3..e04a6307d 100644
--- a/src/main/java/roomescape/service/TimeService.java
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -1,14 +1,13 @@
 package roomescape.service;
 
+import java.util.List;
+import java.util.stream.Collectors;
 import org.springframework.stereotype.Service;
 import roomescape.dao.TimeDAO;
 import roomescape.domain.Time;
 import roomescape.dto.TimeDto;
 import roomescape.dto.TimeResDto;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Service
 public class TimeService {
     private final TimeDAO timeDAO;
@@ -20,7 +19,8 @@ public TimeService(TimeDAO timeDAO) {
     public TimeResDto addTime(TimeDto timeDto) {
         Time time = new Time(0, timeDto.time());
         timeDAO.insert(time);
-        int id = timeDAO.getId(time);
+        int id = timeDAO.getId(time)
+                .orElseThrow(() -> new IllegalArgumentException("Time ID를 찾을 수 없습니다."));
         return new TimeResDto(id, time.getTime());
     }
 
@@ -34,10 +34,11 @@ public List<TimeResDto> getAllTimes() {
     public void deleteTime(int id) {
         timeDAO.delete(id);
     }
-    public TimeResDto findByTime(String time) {
-        Time times = timeDAO.findByTime(time);
-        return TimeResDto.from(times);
 
+    public TimeResDto findByTime(String time) {
+        Time timeResult = timeDAO.findByTime(time)
+                .orElseThrow(() -> new IllegalArgumentException("해당 시간이 존재하지 않습니다."));
+        return TimeResDto.from(timeResult);
     }
 
 }

From 57bbf2e9e7584dd35b3d86e7db4289a1c62a3be4 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Wed, 24 Jul 2024 19:12:47 +0900
Subject: [PATCH 34/37] =?UTF-8?q?feat:=20Transactional=EC=A0=81=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
index 3def8295c..b5c7be765 100644
--- a/src/main/java/roomescape/service/ReservationService.java
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -1,15 +1,15 @@
 package roomescape.service;
 
+import java.util.List;
+import java.util.stream.Collectors;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import roomescape.dao.RoomDAO;
 import roomescape.domain.Reservation;
 import roomescape.domain.Time;
 import roomescape.dto.ReservationDto;
 import roomescape.dto.TimeResDto;
 
-import java.util.List;
-import java.util.stream.Collectors;
-
 @Service
 public class ReservationService {
     private final RoomDAO roomDAO;
@@ -20,12 +20,15 @@ public ReservationService(RoomDAO roomDAO, TimeService timeService) {
         this.timeService = timeService;
     }
 
+    @Transactional(readOnly = true)
     public List<ReservationDto> getAllReservations() {
         return roomDAO.findAll().stream()
-                .map(reservation -> new ReservationDto(reservation.getName(), reservation.getDate(), reservation.getTime()))
+                .map(reservation -> new ReservationDto(reservation.getName(), reservation.getDate(),
+                        reservation.getTime()))
                 .collect(Collectors.toList());
     }
 
+    @Transactional
     public Reservation addReservation(ReservationDto reservationDto) {
         String name = reservationDto.name();
         String date = reservationDto.date();
@@ -34,12 +37,12 @@ public Reservation addReservation(ReservationDto reservationDto) {
         TimeResDto timeResDto = timeService.findByTime(timeString);
         Time time = new Time(timeResDto.id(), timeResDto.time());
 
-
         Reservation reservation = new Reservation(0, name, date, time);
         roomDAO.insert(reservation);
         return reservation;
     }
 
+    @Transactional
     public void deleteReservation(int id) {
         if (roomDAO.findById(id) != null) {
             roomDAO.deletebyId(id);
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
index e04a6307d..7b743673f 100644
--- a/src/main/java/roomescape/service/TimeService.java
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -3,6 +3,7 @@
 import java.util.List;
 import java.util.stream.Collectors;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import roomescape.dao.TimeDAO;
 import roomescape.domain.Time;
 import roomescape.dto.TimeDto;
@@ -16,6 +17,7 @@ public TimeService(TimeDAO timeDAO) {
         this.timeDAO = timeDAO;
     }
 
+    @Transactional
     public TimeResDto addTime(TimeDto timeDto) {
         Time time = new Time(0, timeDto.time());
         timeDAO.insert(time);
@@ -24,6 +26,7 @@ public TimeResDto addTime(TimeDto timeDto) {
         return new TimeResDto(id, time.getTime());
     }
 
+    @Transactional(readOnly = true)
     public List<TimeResDto> getAllTimes() {
         List<Time> times = timeDAO.findAll();
         return times.stream()
@@ -31,10 +34,12 @@ public List<TimeResDto> getAllTimes() {
                 .collect(Collectors.toList());
     }
 
+    @Transactional
     public void deleteTime(int id) {
         timeDAO.delete(id);
     }
 
+    @Transactional(readOnly = true)
     public TimeResDto findByTime(String time) {
         Time timeResult = timeDAO.findByTime(time)
                 .orElseThrow(() -> new IllegalArgumentException("해당 시간이 존재하지 않습니다."));

From ee69a26da9b9a1850594f912f98335025b2caaf5 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 25 Jul 2024 02:41:02 +0900
Subject: [PATCH 35/37] =?UTF-8?q?refactor:=20toList()=EB=A6=AC=ED=8C=A9?=
 =?UTF-8?q?=ED=86=A0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/service/TimeService.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
index 7b743673f..284252d85 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 org.springframework.transaction.annotation.Transactional;
 import roomescape.dao.TimeDAO;
@@ -31,7 +30,7 @@ public List<TimeResDto> getAllTimes() {
         List<Time> times = timeDAO.findAll();
         return times.stream()
                 .map(TimeResDto::from)
-                .collect(Collectors.toList());
+                .toList();
     }
 
     @Transactional

From 8c9ff70ef3c5797b6a0939723869361a58ac65cc Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 25 Jul 2024 22:47:36 +0900
Subject: [PATCH 36/37] =?UTF-8?q?refactor:=20=ED=95=84=EC=9A=94=EC=97=86?=
 =?UTF-8?q?=EB=8A=94=20=EA=B3=B5=EB=B0=B1=20=EB=B0=8F=20=EC=96=B4=EB=85=B8?=
 =?UTF-8?q?=ED=85=8C=EC=9D=B4=EC=85=98=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/TimeController.java | 1 -
 src/main/java/roomescape/domain/Reservation.java        | 3 ---
 src/main/java/roomescape/domain/Time.java               | 1 -
 3 files changed, 5 deletions(-)

diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
index 37fb39d86..ed2180ba3 100644
--- a/src/main/java/roomescape/controller/TimeController.java
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -26,7 +26,6 @@ public TimeController(TimeService timeService) {
     }
 
     @PostMapping
-    @ResponseBody
     public ResponseEntity<TimeResDto> addTime(@RequestBody TimeDto timeDto) {
         TimeResDto timeResDto = timeService.addTime(timeDto);
         HttpHeaders headers = createHeader("/times/" + timeResDto.id());
diff --git a/src/main/java/roomescape/domain/Reservation.java b/src/main/java/roomescape/domain/Reservation.java
index d44bc57d7..3dc3087f7 100644
--- a/src/main/java/roomescape/domain/Reservation.java
+++ b/src/main/java/roomescape/domain/Reservation.java
@@ -2,7 +2,6 @@
 
 public class Reservation {
     private int id;
-
     private String name;
     private String date;
     private Time time;
@@ -29,6 +28,4 @@ public String getDate() {
     public Time getTime() {
         return time;
     }
-
-
 }
diff --git a/src/main/java/roomescape/domain/Time.java b/src/main/java/roomescape/domain/Time.java
index 8ab0cb0b3..8ff67e212 100644
--- a/src/main/java/roomescape/domain/Time.java
+++ b/src/main/java/roomescape/domain/Time.java
@@ -20,5 +20,4 @@ public void setTime(String time) {
     public int getId() {
         return id;
     }
-
 }

From 3a3a85bb33a39e801a347fd8c1929bbe850b3347 Mon Sep 17 00:00:00 2001
From: Junyeong-An <2117ab@gmail.com>
Date: Thu, 25 Jul 2024 22:47:49 +0900
Subject: [PATCH 37/37] =?UTF-8?q?refactor:=20=EB=A9=94=EC=84=9C=EB=93=9C?=
 =?UTF-8?q?=EB=AA=85=20=EC=9D=BC=EA=B4=80=EC=84=B1=EC=9E=88=EA=B2=8C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/roomescape/dao/TimeDAO.java b/src/main/java/roomescape/dao/TimeDAO.java
index 210e9e943..9bdc75a90 100644
--- a/src/main/java/roomescape/dao/TimeDAO.java
+++ b/src/main/java/roomescape/dao/TimeDAO.java
@@ -33,7 +33,7 @@ public List<Time> findAll() {
         );
     }
 
-    public void delete(int id) {
+    public void deleteById(int id) {
         jdbcTemplate.update("DELETE FROM time WHERE id = ?", id);
     }
 
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
index 284252d85..a72544a02 100644
--- a/src/main/java/roomescape/service/TimeService.java
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -35,7 +35,7 @@ public List<TimeResDto> getAllTimes() {
 
     @Transactional
     public void deleteTime(int id) {
-        timeDAO.delete(id);
+        timeDAO.deleteById(id);
     }
 
     @Transactional(readOnly = true)
@@ -44,5 +44,4 @@ public TimeResDto findByTime(String time) {
                 .orElseThrow(() -> new IllegalArgumentException("해당 시간이 존재하지 않습니다."));
         return TimeResDto.from(timeResult);
     }
-
 }