From d0ef8784386a8046be85e703803fa419d8396691 Mon Sep 17 00:00:00 2001
From: spig0126 <spig0126@gmail.com>
Date: Sat, 1 Jun 2024 17:34:38 +0900
Subject: [PATCH 1/9] Chore[step8]: add gradle dependency

- add spring boot data-jpa dependency
---
 build.gradle | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 57267157c..738895123 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,11 +13,19 @@ repositories {
 }
 
 dependencies {
-    implementation 'org.springframework.boot:spring-boot-starter'
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'jakarta.validation:jakarta.validation-api:3.0.0'
+    runtimeOnly 'com.h2database:h2'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:5.3.1'
+    testImplementation "junit:junit:4.12"
 }
 
 test {
     useJUnitPlatform()
+    jvmArgs '-Xshare:off'
 }

From 4cf1889a43d701fcdeb377317564c100e4cd92ee Mon Sep 17 00:00:00 2001
From: spig0126 <spig0126@gmail.com>
Date: Sat, 1 Jun 2024 18:48:52 +0900
Subject: [PATCH 2/9] Chore[step8]: add 'time' table in sql

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

diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
new file mode 100644
index 000000000..4ea1598ba
--- /dev/null
+++ b/src/main/resources/schema.sql
@@ -0,0 +1,16 @@
+CREATE TABLE time
+(
+    id   BIGINT       NOT NULL AUTO_INCREMENT,
+    time VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id)
+);
+
+CREATE TABLE reservation
+(
+    id   BIGINT       NOT NULL AUTO_INCREMENT,
+    name VARCHAR(255) NOT NULL,
+    date VARCHAR(255) NOT NULL,
+    time_id BIGINT,
+    PRIMARY KEY (id),
+    FOREIGN KEY (time_id) REFERENCES time(id)
+);
\ No newline at end of file

From dcc87b3be27cd3dbfb25da2953df67f2a4ff9161 Mon Sep 17 00:00:00 2001
From: spig0126 <spig0126@gmail.com>
Date: Sat, 1 Jun 2024 18:54:08 +0900
Subject: [PATCH 3/9] =?UTF-8?q?Feat[step8]:=20=EC=8B=9C=EA=B0=84=20?=
 =?UTF-8?q?=EA=B4=80=EB=A6=AC=20=EA=B8=B0=EB=8A=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- create layered architecture for time
- use custom exception (TimeNotFoundException)
---
 .../advice/GlobalControllerAdvice.java        | 35 +++++++++++++
 .../roomescape/controller/TimeController.java | 50 +++++++++++++++++++
 src/main/java/roomescape/domain/Time.java     | 25 ++++++++++
 .../exception/TimeNotFoundException.java      |  7 +++
 .../roomescape/repository/TimeRepository.java | 10 ++++
 .../java/roomescape/service/TimeService.java  | 39 +++++++++++++++
 6 files changed, 166 insertions(+)
 create mode 100644 src/main/java/roomescape/advice/GlobalControllerAdvice.java
 create mode 100644 src/main/java/roomescape/controller/TimeController.java
 create mode 100644 src/main/java/roomescape/domain/Time.java
 create mode 100644 src/main/java/roomescape/exception/TimeNotFoundException.java
 create mode 100644 src/main/java/roomescape/repository/TimeRepository.java
 create mode 100644 src/main/java/roomescape/service/TimeService.java

diff --git a/src/main/java/roomescape/advice/GlobalControllerAdvice.java b/src/main/java/roomescape/advice/GlobalControllerAdvice.java
new file mode 100644
index 000000000..7e625f848
--- /dev/null
+++ b/src/main/java/roomescape/advice/GlobalControllerAdvice.java
@@ -0,0 +1,35 @@
+package roomescape.advice;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.MethodArgumentNotValidException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import roomescape.exception.DatabaseOperationException;
+import roomescape.exception.ReservationNotFoundException;
+import roomescape.exception.TimeNotFoundException;
+
+@ControllerAdvice
+public class GlobalControllerAdvice {
+    @ExceptionHandler(ReservationNotFoundException.class)
+    public ResponseEntity<String> handleReservationNotFoundException(ReservationNotFoundException ex) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage());
+    }
+
+    @ExceptionHandler(DatabaseOperationException.class)
+    public ResponseEntity<String> handleDatabaseOperationException(DatabaseOperationException ex) {
+        return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body(ex.getMessage());
+    }
+
+    @ExceptionHandler(MethodArgumentNotValidException.class)
+    public ResponseEntity<String> handleValidationExceptions(MethodArgumentNotValidException ex) {
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage());
+    }
+
+    @ExceptionHandler(TimeNotFoundException.class)
+    public ResponseEntity handleTimeNotFoundException(TimeNotFoundException ex) {
+        System.out.println("---------------------HI");
+        return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage());
+    }
+}
diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
new file mode 100644
index 000000000..d9965a2a8
--- /dev/null
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -0,0 +1,50 @@
+package roomescape.controller;
+
+import jakarta.validation.Valid;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import roomescape.domain.Time;
+import roomescape.service.TimeService;
+
+import java.net.URI;
+import java.util.List;
+
+@Controller
+public class TimeController {
+    @Autowired
+    private TimeService timeService;
+
+    @GetMapping("/time")
+    public String time() {
+        return "time";
+    }
+
+    @GetMapping("/times")
+    public ResponseEntity<List<Time>> getTimes() {
+        List<Time> times = timeService.getAllTimes();
+        return ResponseEntity.ok(times);
+    }
+
+    @GetMapping("/times/{id}")
+    @ResponseBody
+    public ResponseEntity<Time> getTimeById(@PathVariable long id) {
+        Time time = timeService.getTimeById(id);
+        return ResponseEntity.ok(time);
+    }
+
+    @PostMapping("/times")
+    @ResponseBody
+    public ResponseEntity<Time> addTime(@Valid @RequestBody Time time) {
+        Time newTime = timeService.createTime(time);
+        String uri = "/times/" + newTime.getId();
+        return ResponseEntity.created(URI.create(uri)).body(newTime);
+    }
+
+    @DeleteMapping("/times/{id}")
+    public ResponseEntity<Void> deleteTime(@PathVariable long id) {
+        timeService.deleteTimeById(id);
+        return ResponseEntity.noContent().build();
+    }
+}
diff --git a/src/main/java/roomescape/domain/Time.java b/src/main/java/roomescape/domain/Time.java
new file mode 100644
index 000000000..1f65abb38
--- /dev/null
+++ b/src/main/java/roomescape/domain/Time.java
@@ -0,0 +1,25 @@
+package roomescape.domain;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotBlank;
+
+@Entity
+public class Time {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @NotBlank(message="Time cannot be empty")
+    private String time;
+
+    public Time(){}
+
+    public long getId() {return this.id;}
+    public String getTime() {return this.time;}
+
+    public long setId(long id) {return this.id = id;}
+    public String setTime(String time) {return this.time = time;}
+}
diff --git a/src/main/java/roomescape/exception/TimeNotFoundException.java b/src/main/java/roomescape/exception/TimeNotFoundException.java
new file mode 100644
index 000000000..42025d4cb
--- /dev/null
+++ b/src/main/java/roomescape/exception/TimeNotFoundException.java
@@ -0,0 +1,7 @@
+package roomescape.exception;
+
+public class TimeNotFoundException extends RuntimeException {
+    public TimeNotFoundException(String message) {
+        super(message);
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/roomescape/repository/TimeRepository.java b/src/main/java/roomescape/repository/TimeRepository.java
new file mode 100644
index 000000000..326a5c162
--- /dev/null
+++ b/src/main/java/roomescape/repository/TimeRepository.java
@@ -0,0 +1,10 @@
+package roomescape.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import roomescape.domain.Time;
+
+@Repository
+public interface TimeRepository extends JpaRepository<Time, Long> {
+}
\ No newline at end of file
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
new file mode 100644
index 000000000..64381c6fb
--- /dev/null
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -0,0 +1,39 @@
+package roomescape.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import roomescape.domain.Time;
+import roomescape.exception.TimeNotFoundException;
+import roomescape.repository.TimeRepository;
+
+import java.util.List;
+
+@Service
+public class TimeService {
+    @Autowired
+    private TimeRepository timeRepository;
+
+    public List<Time> getAllTimes() {
+        return timeRepository.findAll();
+    }
+
+    public Time getTimeById(long id) {
+        if (!timeRepository.existsById(id)) {
+            throw new TimeNotFoundException("Time with id " + id + " not found");
+        }
+        return timeRepository.getReferenceById(id);
+    }
+
+    public Time createTime(Time time) {
+        return timeRepository.save(time);
+    }
+
+    public void deleteTimeById(long id) {
+        if (!timeRepository.existsById(id)) {
+            throw new TimeNotFoundException("Time with id " + id + " not found");
+        }
+        Time time = getTimeById(id);
+        timeRepository.delete(time);
+    }
+}

From 170d340dceb38f42d5f1d1400668c653c173fe2a Mon Sep 17 00:00:00 2001
From: spig0126 <spig0126@gmail.com>
Date: Sat, 1 Jun 2024 18:54:26 +0900
Subject: [PATCH 4/9] Test[step8]: update earlier tests and add test for step8

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index cf4efbe91..4d12f4878 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 io.restassured.response.Response;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.Map;
 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 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 {
 
+    @Autowired
+    private JdbcTemplate jdbcTemplate;
+
     @Test
     void 일단계() {
         RestAssured.given().log().all()
@@ -16,4 +30,172 @@ 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(0)); // 아직 생성 요청이 없으니 Controller에서 임의로 넣어준 Reservation 갯수 만큼 검증하거나 0개임을 확인하세요.
+    }
+
+    @Test
+    void 삼단계() {
+        Response timeResponse = RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(Map.of("time", "15:40"))
+                .when().post("/times");
+
+        String[] locations = timeResponse.getHeader("Location").split("/times/");
+
+        Map<String, String> params = new HashMap<>();
+        params.put("name", "브라운");
+        params.put("date", "2023-08-05");
+        params.put("time", locations[1]);
+
+        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));
+    }
+
+    @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);
+    }
+
+    @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);
+        }
+    }
+
+    @Test
+    void 육단계() {
+        Response timeResponse = RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(Map.of("time", "15:40"))
+                .when().post("/times");
+
+        String[] locations = timeResponse.getHeader("Location").split("/times/");
+
+        jdbcTemplate.update("INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)", "브라운", "2023-08-05", locations[1]);
+
+        int size = RestAssured.given().log().all()
+                .when().get("/reservations")
+                .then().log().all()
+                .statusCode(200).extract()
+                .jsonPath().getList(".").size();
+
+        Integer count = jdbcTemplate.queryForObject("SELECT count(1) from reservation", Integer.class);
+
+        assertThat(size).isEqualTo(count);
+    }
+
+    @Test
+    void 칠단계() {
+        Response timeResponse = RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(Map.of("time", "15:40"))
+                .when().post("/times");
+
+        String[] locations = timeResponse.getHeader("Location").split("/times/");
+
+        Map<String, String> params = new HashMap<>();
+        params.put("name", "브라운");
+        params.put("date", "2023-08-05");
+        params.put("time", locations[1]);
+
+        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);
+    }
+
+    @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 f292798df2078c32caa0b4a4fd5c7fa4c1e70589 Mon Sep 17 00:00:00 2001
From: spig0126 <spig0126@gmail.com>
Date: Sat, 1 Jun 2024 18:56:15 +0900
Subject: [PATCH 5/9] Refactor[step9]: apply layered architecture to
 Reservation

---
 .../controller/ReservationController.java     | 53 +++++++++++++++++++
 .../java/roomescape/domain/Reservation.java   | 35 ++++++++++++
 .../repository/ReservationRepository.java     | 10 ++++
 .../service/ReservationService.java           | 39 ++++++++++++++
 4 files changed, 137 insertions(+)
 create mode 100644 src/main/java/roomescape/controller/ReservationController.java
 create mode 100644 src/main/java/roomescape/domain/Reservation.java
 create mode 100644 src/main/java/roomescape/repository/ReservationRepository.java
 create mode 100644 src/main/java/roomescape/service/ReservationService.java

diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
new file mode 100644
index 000000000..7b6ee5012
--- /dev/null
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -0,0 +1,53 @@
+package roomescape.controller;
+
+import java.net.URI;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import jakarta.validation.Valid;
+
+import roomescape.domain.Reservation;
+import roomescape.service.ReservationService;
+
+@Controller
+public class ReservationController {
+    @Autowired
+    private ReservationService reservationService;
+
+    @GetMapping("/reservation")
+    public String reservation() {
+        return "reservation";
+    }
+
+    @GetMapping("/reservations")
+    @ResponseBody
+    public ResponseEntity<List<Reservation>> getReservations(){
+        List<Reservation> reservations = reservationService.getAllReservations();
+        return ResponseEntity.ok(reservations);
+    }
+
+    @GetMapping("/reservations/{id}")
+    @ResponseBody
+    public ResponseEntity<Reservation> getReservation(@PathVariable long id){
+        Reservation reservation = reservationService.getReservationById(id);
+        return ResponseEntity.ok(reservation);
+    }
+
+    @PostMapping("/reservations")
+    @ResponseBody
+    public ResponseEntity<Reservation> createReservation(@Valid @RequestBody Reservation reservation) {
+        Reservation newReservation = reservationService.createReservation(reservation);
+        String uri = "/reservations/" +  newReservation.getId();
+        return ResponseEntity.created(URI.create(uri)).body(newReservation);
+    }
+
+    @DeleteMapping("/reservations/{id}")
+    public ResponseEntity<Void> deleteReservation(@PathVariable long id){
+        reservationService.deleteReservation(id);
+        return ResponseEntity.noContent().build();
+    }
+}
diff --git a/src/main/java/roomescape/domain/Reservation.java b/src/main/java/roomescape/domain/Reservation.java
new file mode 100644
index 000000000..11be65dc7
--- /dev/null
+++ b/src/main/java/roomescape/domain/Reservation.java
@@ -0,0 +1,35 @@
+package roomescape.domain;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.validation.constraints.NotBlank;
+
+@Entity
+public class Reservation {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+
+    @NotBlank(message="Name cannot be empty")
+    private String name;
+
+    @NotBlank(message="Date cannot be empty")
+    private String date;
+
+    @NotBlank(message="Time cannot be empty")
+    private String time;
+
+    public Reservation(){}
+
+    public long getId() {return this.id;}
+    public String getName() {return this.name;}
+    public String getDate() {return this.date;}
+    public String getTime() {return this.time;}
+
+    public long setId(long id) {return this.id = id;}
+    public String setName(String name) {return this.name = name;}
+    public String setDate(String date) {return this.date = date;}
+    public String setTime(String time) {return this.time = time;}
+}
diff --git a/src/main/java/roomescape/repository/ReservationRepository.java b/src/main/java/roomescape/repository/ReservationRepository.java
new file mode 100644
index 000000000..d90a7ff11
--- /dev/null
+++ b/src/main/java/roomescape/repository/ReservationRepository.java
@@ -0,0 +1,10 @@
+package roomescape.repository;
+
+import org.springframework.stereotype.Repository;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+import roomescape.domain.Reservation;
+
+@Repository
+public interface ReservationRepository extends JpaRepository<Reservation, Long> {
+}
diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
new file mode 100644
index 000000000..773d2976e
--- /dev/null
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -0,0 +1,39 @@
+package roomescape.service;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import roomescape.domain.Reservation;
+import roomescape.exception.ReservationNotFoundException;
+import roomescape.repository.ReservationRepository;
+
+import java.util.List;
+
+@Service
+public class ReservationService {
+    @Autowired
+    private ReservationRepository reservationRepository;
+
+    public List<Reservation> getAllReservations() {
+        return reservationRepository.findAll();
+    }
+
+    public Reservation getReservationById(long id) {
+        if(!reservationRepository.existsById(id)) {
+            throw new ReservationNotFoundException("Reservation with id " + id + " not found");
+        }
+        return reservationRepository.getReferenceById(id);
+    }
+
+
+    public Reservation createReservation(Reservation reservation) {
+        return reservationRepository.save(reservation);
+    }
+
+    public void deleteReservation(long id) {
+        if(!reservationRepository.existsById(id)) {
+            throw new ReservationNotFoundException("Reservation with id " + id + " not found");
+        }
+        Reservation reservation = getReservationById(id);
+        reservationRepository.delete(reservation);
+    }
+}

From 1022775b59e98cac28981f8a395bd45c83141500 Mon Sep 17 00:00:00 2001
From: spig0126 <spig0126@gmail.com>
Date: Sat, 1 Jun 2024 19:50:42 +0900
Subject: [PATCH 6/9] Refactor: remove dead code

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

diff --git a/src/main/java/roomescape/advice/GlobalControllerAdvice.java b/src/main/java/roomescape/advice/GlobalControllerAdvice.java
index 7e625f848..bd2d8d0f7 100644
--- a/src/main/java/roomescape/advice/GlobalControllerAdvice.java
+++ b/src/main/java/roomescape/advice/GlobalControllerAdvice.java
@@ -29,7 +29,6 @@ public ResponseEntity<String> handleValidationExceptions(MethodArgumentNotValidE
 
     @ExceptionHandler(TimeNotFoundException.class)
     public ResponseEntity handleTimeNotFoundException(TimeNotFoundException ex) {
-        System.out.println("---------------------HI");
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(ex.getMessage());
     }
 }

From abbd3ff15e79bfec0e25f6644872ba3abfdbe301 Mon Sep 17 00:00:00 2001
From: spig0126 <spig0126@gmail.com>
Date: Sat, 1 Jun 2024 19:52:39 +0900
Subject: [PATCH 7/9] =?UTF-8?q?Feat[step9]:=20=EA=B8=B0=EC=A1=B4=20?=
 =?UTF-8?q?=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/ReservationController.java           |  4 ++--
 src/main/java/roomescape/domain/Reservation.java    | 13 +++++--------
 src/main/java/roomescape/domain/Time.java           |  3 +++
 .../java/roomescape/service/ReservationService.java | 11 +++++++++++
 src/main/resources/schema.sql                       |  2 +-
 5 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
index 7b6ee5012..b0b12d315 100644
--- a/src/main/java/roomescape/controller/ReservationController.java
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -20,7 +20,7 @@ public class ReservationController {
 
     @GetMapping("/reservation")
     public String reservation() {
-        return "reservation";
+        return "new-reservation";
     }
 
     @GetMapping("/reservations")
@@ -50,4 +50,4 @@ public ResponseEntity<Void> deleteReservation(@PathVariable long id){
         reservationService.deleteReservation(id);
         return ResponseEntity.noContent().build();
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/roomescape/domain/Reservation.java b/src/main/java/roomescape/domain/Reservation.java
index 11be65dc7..80f941d00 100644
--- a/src/main/java/roomescape/domain/Reservation.java
+++ b/src/main/java/roomescape/domain/Reservation.java
@@ -1,9 +1,6 @@
 package roomescape.domain;
 
-import jakarta.persistence.Entity;
-import jakarta.persistence.GeneratedValue;
-import jakarta.persistence.GenerationType;
-import jakarta.persistence.Id;
+import jakarta.persistence.*;
 import jakarta.validation.constraints.NotBlank;
 
 @Entity
@@ -18,18 +15,18 @@ public class Reservation {
     @NotBlank(message="Date cannot be empty")
     private String date;
 
-    @NotBlank(message="Time cannot be empty")
-    private String time;
+    @ManyToOne
+    private Time time;
 
     public Reservation(){}
 
     public long getId() {return this.id;}
     public String getName() {return this.name;}
     public String getDate() {return this.date;}
-    public String getTime() {return this.time;}
+    public Time getTime() {return this.time;}
 
     public long setId(long id) {return this.id = id;}
     public String setName(String name) {return this.name = name;}
     public String setDate(String date) {return this.date = date;}
-    public String setTime(String time) {return this.time = time;}
+    public Time setTime(Time time) {return this.time = time;}
 }
diff --git a/src/main/java/roomescape/domain/Time.java b/src/main/java/roomescape/domain/Time.java
index 1f65abb38..022e472d4 100644
--- a/src/main/java/roomescape/domain/Time.java
+++ b/src/main/java/roomescape/domain/Time.java
@@ -17,6 +17,9 @@ public class Time {
 
     public Time(){}
 
+    public Time(String id) {
+        this.id = setId(Long.parseLong(id));
+    }
     public long getId() {return this.id;}
     public String getTime() {return this.time;}
 
diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
index 773d2976e..5a28ad076 100644
--- a/src/main/java/roomescape/service/ReservationService.java
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -3,8 +3,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import roomescape.domain.Reservation;
+import roomescape.domain.Time;
 import roomescape.exception.ReservationNotFoundException;
+import roomescape.exception.TimeNotFoundException;
 import roomescape.repository.ReservationRepository;
+import roomescape.repository.TimeRepository;
 
 import java.util.List;
 
@@ -13,6 +16,9 @@ public class ReservationService {
     @Autowired
     private ReservationRepository reservationRepository;
 
+    @Autowired
+    private TimeRepository timeRepository;
+
     public List<Reservation> getAllReservations() {
         return reservationRepository.findAll();
     }
@@ -26,6 +32,11 @@ public Reservation getReservationById(long id) {
 
 
     public Reservation createReservation(Reservation reservation) {
+        Time time = reservation.getTime();
+        if(!timeRepository.existsById(time.getId())) {
+            throw new TimeNotFoundException("Time with id " + time.getId() + " not found");
+        }
+        reservation.setTime(time);
         return reservationRepository.save(reservation);
     }
 
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 4ea1598ba..ca4b0ee4c 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -13,4 +13,4 @@ CREATE TABLE reservation
     time_id BIGINT,
     PRIMARY KEY (id),
     FOREIGN KEY (time_id) REFERENCES time(id)
-);
\ No newline at end of file
+);

From 6ac04289170050ca6fbc544df5eb0152afc93399 Mon Sep 17 00:00:00 2001
From: spig0126 <spig0126@gmail.com>
Date: Sat, 1 Jun 2024 19:52:48 +0900
Subject: [PATCH 8/9] test[step9]: add test

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 4d12f4878..107592d9f 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -198,4 +198,19 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(204);
     }
+
+    @Test
+    void 구단계() {
+        Map<String, String> reservation = new HashMap<>();
+        reservation.put("name", "브라운");
+        reservation.put("date", "2023-08-05");
+        reservation.put("time", "10:00");
+
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(reservation)
+                .when().post("/reservations")
+                .then().log().all()
+                .statusCode(400);
+    }
 }

From e127140564701566be478f2a183470213c90e6df Mon Sep 17 00:00:00 2001
From: spig0126 <spig0126@gmail.com>
Date: Sat, 1 Jun 2024 19:54:38 +0900
Subject: [PATCH 9/9] Test[step10]: add test

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 107592d9f..f42099114 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -3,6 +3,8 @@
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
 import io.restassured.response.Response;
+
+import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -12,6 +14,7 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.DirtiesContext;
+import roomescape.controller.ReservationController;
 
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.hamcrest.Matchers.is;
@@ -19,10 +22,12 @@
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
 public class MissionStepTest {
-
     @Autowired
     private JdbcTemplate jdbcTemplate;
 
+    @Autowired
+    private ReservationController reservationController;
+
     @Test
     void 일단계() {
         RestAssured.given().log().all()
@@ -213,4 +218,19 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(400);
     }
+
+
+    @Test
+    void 십단계() {
+        boolean isJdbcTemplateInjected = false;
+
+        for (Field field : reservationController.getClass().getDeclaredFields()) {
+            if (field.getType().equals(JdbcTemplate.class)) {
+                isJdbcTemplateInjected = true;
+                break;
+            }
+        }
+
+        assertThat(isJdbcTemplateInjected).isFalse();
+    }
 }