From ebffa5863bb164416d381e812933d9896954b660 Mon Sep 17 00:00:00 2001
From: siyoung <wfs0502@gmail.com>
Date: Fri, 6 Jun 2025 14:48:11 +0900
Subject: [PATCH 1/5] =?UTF-8?q?feat:=201=EB=8B=A8=EA=B3=84=20-=20=ED=99=88?=
 =?UTF-8?q?=20=ED=99=94=EB=A9=B4?=
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 972ba89accd78868c4ac2e91b3e7567ad6a242f0 Mon Sep 17 00:00:00 2001
From: siyoung <wfs0502@gmail.com>
Date: Fri, 6 Jun 2025 15:09:56 +0900
Subject: [PATCH 2/5] =?UTF-8?q?feat:=202=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

---
 build.gradle                                  |  1 +
 src/main/java/roomescape/Reservation.java     | 31 +++++++++++++++++++
 .../roomescape/ReservationController.java     | 30 ++++++++++++++++++
 src/test/java/roomescape/MissionStepTest.java | 16 ++++++++++
 4 files changed, 78 insertions(+)
 create mode 100644 src/main/java/roomescape/Reservation.java
 create mode 100644 src/main/java/roomescape/ReservationController.java

diff --git a/build.gradle b/build.gradle
index 74d35aaaf..40a581b15 100644
--- a/build.gradle
+++ b/build.gradle
@@ -15,6 +15,7 @@ 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'
 }
diff --git a/src/main/java/roomescape/Reservation.java b/src/main/java/roomescape/Reservation.java
new file mode 100644
index 000000000..780d86b8c
--- /dev/null
+++ b/src/main/java/roomescape/Reservation.java
@@ -0,0 +1,31 @@
+package roomescape;
+
+public class Reservation {
+    private long id;
+    private String name;
+    private String date;
+    private String time;
+
+    public Reservation(long id, String name, String date, String time) {
+        this.id = id;
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public String getTime() {
+        return time;
+    }
+}
diff --git a/src/main/java/roomescape/ReservationController.java b/src/main/java/roomescape/ReservationController.java
new file mode 100644
index 000000000..00c757200
--- /dev/null
+++ b/src/main/java/roomescape/ReservationController.java
@@ -0,0 +1,30 @@
+package roomescape;
+
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+@Controller
+public class ReservationController {
+
+    private List<Reservation> reservations = new ArrayList<>();
+
+    public ReservationController() {
+        reservations.add(new Reservation(1L, "브라운", "2023-01-01", "10:00"));
+        reservations.add(new Reservation(2L, "브라운", "2023-01-02", "11:00"));
+        reservations.add(new Reservation(3L, "브라운", "2023-01-03", "12:00"));
+    }
+
+    @GetMapping("/reservation")
+    public String reservation() {
+        return "reservation";
+    }
+
+    @GetMapping("/reservations")
+    @ResponseBody
+    public List<Reservation> reservations() {
+        return reservations;
+    }
+}
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index cf4efbe91..b1a2e6f83 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -1,5 +1,7 @@
 package roomescape;
 
+import static org.hamcrest.CoreMatchers.is;
+
 import io.restassured.RestAssured;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
@@ -16,4 +18,18 @@ 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 2bf7f23ad384146cafddec291a1b055ba177fd9d Mon Sep 17 00:00:00 2001
From: siyoung <wfs0502@gmail.com>
Date: Fri, 6 Jun 2025 15:43:15 +0900
Subject: [PATCH 3/5] =?UTF-8?q?feat:=203=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

---
 src/main/java/roomescape/Reservation.java     | 13 +++++++
 .../roomescape/ReservationController.java     | 34 +++++++++++++---
 src/test/java/roomescape/MissionStepTest.java | 39 ++++++++++++++++++-
 3 files changed, 79 insertions(+), 7 deletions(-)

diff --git a/src/main/java/roomescape/Reservation.java b/src/main/java/roomescape/Reservation.java
index 780d86b8c..7dde0eb71 100644
--- a/src/main/java/roomescape/Reservation.java
+++ b/src/main/java/roomescape/Reservation.java
@@ -6,6 +6,9 @@ public class Reservation {
     private String date;
     private String time;
 
+    public Reservation() {
+    }
+
     public Reservation(long id, String name, String date, String time) {
         this.id = id;
         this.name = name;
@@ -13,6 +16,12 @@ public Reservation(long id, String name, String date, String time) {
         this.time = time;
     }
 
+    public Reservation(String name, String date, String time) {
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
     public long getId() {
         return id;
     }
@@ -28,4 +37,8 @@ public String getDate() {
     public String getTime() {
         return time;
     }
+
+    public static Reservation toEntity(Long id, Reservation reservation) {
+        return new Reservation(id, reservation.name, reservation.date, reservation.time);
+    }
 }
diff --git a/src/main/java/roomescape/ReservationController.java b/src/main/java/roomescape/ReservationController.java
index 00c757200..7373a87cf 100644
--- a/src/main/java/roomescape/ReservationController.java
+++ b/src/main/java/roomescape/ReservationController.java
@@ -1,21 +1,23 @@
 package roomescape;
 
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
 
 @Controller
 public class ReservationController {
 
     private List<Reservation> reservations = new ArrayList<>();
-
-    public ReservationController() {
-        reservations.add(new Reservation(1L, "브라운", "2023-01-01", "10:00"));
-        reservations.add(new Reservation(2L, "브라운", "2023-01-02", "11:00"));
-        reservations.add(new Reservation(3L, "브라운", "2023-01-03", "12:00"));
-    }
+    private AtomicLong index = new AtomicLong(0);
 
     @GetMapping("/reservation")
     public String reservation() {
@@ -27,4 +29,24 @@ public String reservation() {
     public List<Reservation> reservations() {
         return reservations;
     }
+
+    @PostMapping("/reservations")
+    public ResponseEntity<Reservation> addReservation(@RequestBody Reservation reservation) {
+        Reservation newReservation = Reservation.toEntity(index.incrementAndGet(), reservation);
+        reservations.add(newReservation);
+        return ResponseEntity.created(URI.create("/reservations/" + newReservation.getId()))
+                .body(newReservation);
+    }
+
+    @DeleteMapping("/reservations/{id}")
+    public ResponseEntity<Void> deleteReservation(@PathVariable long id) {
+        Reservation reservation = reservations.stream()
+                .filter(it -> it.getId() == id)
+                .findFirst()
+                .orElseThrow(RuntimeException::new);
+
+        reservations.remove(reservation);
+
+        return ResponseEntity.noContent().build();
+    }
 }
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index b1a2e6f83..072801168 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -3,6 +3,9 @@
 import static org.hamcrest.CoreMatchers.is;
 
 import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import java.util.HashMap;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
@@ -30,6 +33,40 @@ 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
+    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 3201e345f17e4a13ea451c6251e9a3b7148aedc5 Mon Sep 17 00:00:00 2001
From: siyoung <wfs0502@gmail.com>
Date: Fri, 6 Jun 2025 19:41:11 +0900
Subject: [PATCH 4/5] =?UTF-8?q?feat:=204=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

---
 .../ReservationController.java                | 18 +++++++++++++--
 .../InvalidReservationException.java          |  8 +++++++
 .../NotFoundReservationException.java         |  8 +++++++
 src/test/java/roomescape/MissionStepTest.java | 22 +++++++++++++++++++
 4 files changed, 54 insertions(+), 2 deletions(-)
 rename src/main/java/roomescape/{ => controller}/ReservationController.java (66%)
 create mode 100644 src/main/java/roomescape/exception/InvalidReservationException.java
 create mode 100644 src/main/java/roomescape/exception/NotFoundReservationException.java

diff --git a/src/main/java/roomescape/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
similarity index 66%
rename from src/main/java/roomescape/ReservationController.java
rename to src/main/java/roomescape/controller/ReservationController.java
index 7373a87cf..562a2be00 100644
--- a/src/main/java/roomescape/ReservationController.java
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -1,4 +1,4 @@
-package roomescape;
+package roomescape.controller;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -7,11 +7,15 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.ExceptionHandler;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.ResponseBody;
+import roomescape.Reservation;
+import roomescape.exception.InvalidReservationException;
+import roomescape.exception.NotFoundReservationException;
 
 @Controller
 public class ReservationController {
@@ -32,6 +36,11 @@ public List<Reservation> reservations() {
 
     @PostMapping("/reservations")
     public ResponseEntity<Reservation> addReservation(@RequestBody Reservation reservation) {
+        if (reservation.getName() == null || reservation.getName().isEmpty() ||
+                reservation.getDate() == null || reservation.getDate().isEmpty() ||
+                reservation.getTime() == null || reservation.getTime().isEmpty()) {
+            throw new InvalidReservationException();
+        }
         Reservation newReservation = Reservation.toEntity(index.incrementAndGet(), reservation);
         reservations.add(newReservation);
         return ResponseEntity.created(URI.create("/reservations/" + newReservation.getId()))
@@ -43,10 +52,15 @@ public ResponseEntity<Void> deleteReservation(@PathVariable long id) {
         Reservation reservation = reservations.stream()
                 .filter(it -> it.getId() == id)
                 .findFirst()
-                .orElseThrow(RuntimeException::new);
+                .orElseThrow(NotFoundReservationException::new);
 
         reservations.remove(reservation);
 
         return ResponseEntity.noContent().build();
     }
+
+    @ExceptionHandler({NotFoundReservationException.class, InvalidReservationException.class})
+    public ResponseEntity<String> handleNotFoundException(RuntimeException e) {
+        return ResponseEntity.badRequest().body(e.getMessage());
+    }
 }
diff --git a/src/main/java/roomescape/exception/InvalidReservationException.java b/src/main/java/roomescape/exception/InvalidReservationException.java
new file mode 100644
index 000000000..f694d9ae8
--- /dev/null
+++ b/src/main/java/roomescape/exception/InvalidReservationException.java
@@ -0,0 +1,8 @@
+package roomescape.exception;
+
+public class InvalidReservationException extends RuntimeException {
+
+    public InvalidReservationException() {
+        super("필수 인자값이 비어있습니다.");
+    }
+}
diff --git a/src/main/java/roomescape/exception/NotFoundReservationException.java b/src/main/java/roomescape/exception/NotFoundReservationException.java
new file mode 100644
index 000000000..e3112d58e
--- /dev/null
+++ b/src/main/java/roomescape/exception/NotFoundReservationException.java
@@ -0,0 +1,8 @@
+package roomescape.exception;
+
+public class NotFoundReservationException extends RuntimeException {
+
+    public NotFoundReservationException() {
+        super("예약 내역을 찾을 수 없습니다.");
+    }
+}
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 072801168..10d78736a 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -69,4 +69,26 @@ 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 28c676965e441e4ebc81b96e959c8ab8a21cec88 Mon Sep 17 00:00:00 2001
From: siyoung <wfs0502@gmail.com>
Date: Sat, 7 Jun 2025 13:07:16 +0900
Subject: [PATCH 5/5] =?UTF-8?q?refactor:=20validate=20=EB=B6=84=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/Reservation.java     | 17 ++++++++--------
 .../controller/ReservationController.java     | 20 ++++++++++---------
 2 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/src/main/java/roomescape/Reservation.java b/src/main/java/roomescape/Reservation.java
index 7dde0eb71..7cf2c13bd 100644
--- a/src/main/java/roomescape/Reservation.java
+++ b/src/main/java/roomescape/Reservation.java
@@ -1,5 +1,7 @@
 package roomescape;
 
+import roomescape.exception.InvalidReservationException;
+
 public class Reservation {
     private long id;
     private String name;
@@ -10,16 +12,19 @@ public Reservation() {
     }
 
     public Reservation(long id, String name, String date, String time) {
+        validate(name, date, time);
         this.id = id;
         this.name = name;
         this.date = date;
         this.time = time;
     }
 
-    public Reservation(String name, String date, String time) {
-        this.name = name;
-        this.date = date;
-        this.time = time;
+    private void validate(String name, String date, String time){
+        if (name == null || name.isEmpty() ||
+                date == null || date.isEmpty() ||
+                time == null || time.isEmpty()) {
+            throw new InvalidReservationException();
+        }
     }
 
     public long getId() {
@@ -37,8 +42,4 @@ public String getDate() {
     public String getTime() {
         return time;
     }
-
-    public static Reservation toEntity(Long id, Reservation reservation) {
-        return new Reservation(id, reservation.name, reservation.date, reservation.time);
-    }
 }
diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
index 562a2be00..bd3f2b092 100644
--- a/src/main/java/roomescape/controller/ReservationController.java
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -20,8 +20,8 @@
 @Controller
 public class ReservationController {
 
-    private List<Reservation> reservations = new ArrayList<>();
-    private AtomicLong index = new AtomicLong(0);
+    private final List<Reservation> reservations = new ArrayList<>();
+    private final AtomicLong index = new AtomicLong(0);
 
     @GetMapping("/reservation")
     public String reservation() {
@@ -30,19 +30,21 @@ public String reservation() {
 
     @GetMapping("/reservations")
     @ResponseBody
-    public List<Reservation> reservations() {
+    public List<Reservation> getReservations() {
         return reservations;
     }
 
     @PostMapping("/reservations")
     public ResponseEntity<Reservation> addReservation(@RequestBody Reservation reservation) {
-        if (reservation.getName() == null || reservation.getName().isEmpty() ||
-                reservation.getDate() == null || reservation.getDate().isEmpty() ||
-                reservation.getTime() == null || reservation.getTime().isEmpty()) {
-            throw new InvalidReservationException();
-        }
-        Reservation newReservation = Reservation.toEntity(index.incrementAndGet(), reservation);
+        Reservation newReservation = new Reservation(
+                index.incrementAndGet(),
+                reservation.getName(),
+                reservation.getDate(),
+                reservation.getTime()
+        );
+
         reservations.add(newReservation);
+
         return ResponseEntity.created(URI.create("/reservations/" + newReservation.getId()))
                 .body(newReservation);
     }