From 428f452e5d6c701a5f665a3f5414323f6a9c5fb9 Mon Sep 17 00:00:00 2001
From: IDLE <83659656+idle2534@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:44:07 +0900
Subject: [PATCH 01/10] =?UTF-8?q?Refactor:=20web,=20thymleaf,=20lombok,=20?=
 =?UTF-8?q?validate,=20jdbc,=20h2=20implementation=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 build.gradle | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 57267157c..a847659f3 100644
--- a/build.gradle
+++ b/build.gradle
@@ -13,9 +13,15 @@ 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'
+    compileOnly 'org.projectlombok:lombok:1.18.34'
+    annotationProcessor 'org.projectlombok:lombok'
+    implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    runtimeOnly 'com.h2database:h2'
 }
 
 test {

From 53b30fc69d6f76b1b5bc86d73481989a67d6f601 Mon Sep 17 00:00:00 2001
From: IDLE <83659656+idle2534@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:44:32 +0900
Subject: [PATCH 02/10] =?UTF-8?q?Refactor:=20h2=20properties=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/application.properties | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties
index e69de29bb..f597afeef 100644
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -0,0 +1,3 @@
+spring.h2.console.enabled=true
+spring.h2.console.path=/h2-console
+spring.datasource.url=jdbc:h2:mem:database
\ No newline at end of file

From a54d75e4b3aa3fb7768f4bc87245196a82ed1b17 Mon Sep 17 00:00:00 2001
From: IDLE <83659656+idle2534@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:45:03 +0900
Subject: [PATCH 03/10] =?UTF-8?q?Refactor:=20home=EC=9D=84=20index.html?=
 =?UTF-8?q?=EB=A1=9C=20=EC=A7=80=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 a261f8e3914c6fc6986b7c95d31f94a5a7bcfd7c Mon Sep 17 00:00:00 2001
From: IDLE <83659656+idle2534@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:45:29 +0900
Subject: [PATCH 04/10] =?UTF-8?q?Feat:=20=ED=85=8C=EC=8A=A4=ED=8A=B8=20?=
 =?UTF-8?q?=EB=8B=A8=EA=B3=84=201=20~=2010=EA=B9=8C=EC=A7=80=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index cf4efbe91..ca2ba2b3a 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -1,9 +1,23 @@
 package roomescape;
 
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.hamcrest.Matchers.is;
+
 import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
+import java.lang.reflect.Field;
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import org.junit.jupiter.api.Test;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.DirtiesContext;
+import roomescape.controller.ReservationController;
+import roomescape.domain.Reservation;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 @DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
@@ -16,4 +30,187 @@ 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 삼단계() {
+        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));
+    }
+
+    @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;
+
+    @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 육단계() {
+        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);
+    }
+
+    @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);
+    }
+
+    @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);
+    }
+
+    @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);
+    }
+
+    @Autowired
+    private ReservationController reservationController;
+
+    @Test
+    void 십단계() {
+        boolean isJdbcTemplateInjected = false;
+
+        for (Field field : reservationController.getClass().getDeclaredFields()) {
+            if (field.getType().equals(JdbcTemplate.class)) {
+                isJdbcTemplateInjected = true;
+                break;
+            }
+        }
+
+        assertThat(isJdbcTemplateInjected).isFalse();
+    }
 }

From 61979faa272857a5ce8b57c719b36df221f41ad7 Mon Sep 17 00:00:00 2001
From: IDLE <83659656+idle2534@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:45:58 +0900
Subject: [PATCH 05/10] =?UTF-8?q?Feat:=20time,=20reservation=20=ED=85=8C?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EC=83=9D=EC=84=B1=20=EC=8A=A4=ED=82=A4?=
 =?UTF-8?q?=EB=A7=88=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/resources/schema.sql | 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..ca4b0ee4c
--- /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)
+);

From 4b3adbe5de4b7d2c80c67d9e3561dc2e3fc47a0f Mon Sep 17 00:00:00 2001
From: IDLE <83659656+idle2534@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:47:10 +0900
Subject: [PATCH 06/10] =?UTF-8?q?Feat:=20Reservation=20=EA=B4=80=EB=A0=A8?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80=20&=20=EA=B3=84?=
 =?UTF-8?q?=EC=B8=B5=ED=99=94=20=EB=A6=AC=ED=8E=99=ED=86=A0=EB=A7=81=20?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ReservationController.java     | 54 +++++++++++++++++++
 .../java/roomescape/dao/ReservationDao.java   | 54 +++++++++++++++++++
 .../java/roomescape/domain/Reservation.java   | 19 +++++++
 .../roomescape/dto/ReservationRequestDto.java | 16 ++++++
 .../service/ReservationService.java           | 14 +++++
 .../service/ReservationServiceImpl.java       | 37 +++++++++++++
 6 files changed, 194 insertions(+)
 create mode 100644 src/main/java/roomescape/controller/ReservationController.java
 create mode 100644 src/main/java/roomescape/dao/ReservationDao.java
 create mode 100644 src/main/java/roomescape/domain/Reservation.java
 create mode 100644 src/main/java/roomescape/dto/ReservationRequestDto.java
 create mode 100644 src/main/java/roomescape/service/ReservationService.java
 create mode 100644 src/main/java/roomescape/service/ReservationServiceImpl.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..9fda4e450
--- /dev/null
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -0,0 +1,54 @@
+package roomescape.controller;
+
+import java.net.URI;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.validation.annotation.Validated;
+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 roomescape.domain.Reservation;
+import roomescape.domain.Reservation.NotFoundReservationException;
+import roomescape.dto.ReservationRequestDto;
+import roomescape.service.ReservationService;
+
+@Controller
+@RequiredArgsConstructor
+public class ReservationController {
+  private final ReservationService reservationService;
+
+  @GetMapping("/reservation")
+  public String reservation() {
+    return "new-reservation";
+  }
+
+  @GetMapping("/reservations")
+  public ResponseEntity<List<Reservation>> reservations() {
+    List<Reservation> reservations = reservationService.getReservations();
+    return ResponseEntity.ok(reservations);
+  }
+
+  @PostMapping("/reservations")
+  public ResponseEntity<Reservation> addReservation(@RequestBody @Validated ReservationRequestDto reservationRequestDto) {
+    Reservation reservation = reservationService.addReservation(reservationRequestDto);
+    return ResponseEntity
+        .created(URI.create("/reservations/" + reservation.getId()))
+        .body(reservation);
+  }
+
+  @DeleteMapping("/reservations/{id}")
+  public ResponseEntity<Reservation> deleteReservation(@PathVariable Long id) {
+    reservationService.removeReservation(id);
+    return ResponseEntity.noContent().build();
+  }
+
+  @ExceptionHandler(NotFoundReservationException.class)
+  public ResponseEntity<Void> handleException(NotFoundReservationException e) {
+    return ResponseEntity.badRequest().build();
+  }
+}
\ No newline at end of file
diff --git a/src/main/java/roomescape/dao/ReservationDao.java b/src/main/java/roomescape/dao/ReservationDao.java
new file mode 100644
index 000000000..5e2c542b6
--- /dev/null
+++ b/src/main/java/roomescape/dao/ReservationDao.java
@@ -0,0 +1,54 @@
+package roomescape.dao;
+
+import java.sql.PreparedStatement;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Repository;
+import roomescape.domain.Reservation;
+import roomescape.domain.Time;
+import roomescape.dto.ReservationRequestDto;
+
+@Repository
+@RequiredArgsConstructor
+public class ReservationDao {
+
+  private final JdbcTemplate jdbcTemplate;
+
+  public List<Reservation> findAll() {
+    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", (rs, rowNum) ->
+        new Reservation(
+            rs.getLong("reservation_id"),
+            rs.getString("name"),
+            rs.getString("date"),
+            new Time(rs.getLong("time_id"), rs.getString("time_value"))
+        ));
+  }
+
+  public Reservation createReservation(ReservationRequestDto reservationRequestDto) {
+    KeyHolder keyHolder = new GeneratedKeyHolder();
+    jdbcTemplate.update(connection -> {
+      PreparedStatement ps = connection.prepareStatement(
+          "INSERT INTO reservation (name, date) VALUES (?, ?)",
+          new String[]{"id"}
+      );
+      ps.setString(1, reservationRequestDto.getName());
+      ps.setString(2, reservationRequestDto.getDate());
+      return ps;
+    }, keyHolder);
+
+    return new Reservation(keyHolder.getKey().longValue(), reservationRequestDto.getName(), reservationRequestDto.getDate(), new Time());
+  }
+
+  public int deleteReservation(Long id) {
+    return jdbcTemplate.update("DELETE FROM reservation WHERE id = ?", id);
+  }
+}
diff --git a/src/main/java/roomescape/domain/Reservation.java b/src/main/java/roomescape/domain/Reservation.java
new file mode 100644
index 000000000..499910def
--- /dev/null
+++ b/src/main/java/roomescape/domain/Reservation.java
@@ -0,0 +1,19 @@
+package roomescape.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+public class Reservation {
+  public static class NotFoundReservationException extends RuntimeException{}
+
+  private Long id;
+  private String name;
+  private String date;
+  private Time time;
+}
diff --git a/src/main/java/roomescape/dto/ReservationRequestDto.java b/src/main/java/roomescape/dto/ReservationRequestDto.java
new file mode 100644
index 000000000..ab0face0b
--- /dev/null
+++ b/src/main/java/roomescape/dto/ReservationRequestDto.java
@@ -0,0 +1,16 @@
+package roomescape.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.Getter;
+
+@Getter
+public class ReservationRequestDto {
+
+  @NotBlank
+  private String name;
+
+  @NotBlank
+  private String date;
+
+  @Blank
+}
diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
new file mode 100644
index 000000000..b55d7c185
--- /dev/null
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -0,0 +1,14 @@
+package roomescape.service;
+
+import java.util.List;
+import roomescape.domain.Reservation;
+import roomescape.dto.ReservationRequestDto;
+
+public interface ReservationService {
+
+  List<Reservation> getReservations();
+
+  Reservation addReservation(ReservationRequestDto reservationRequestDto);
+
+  void removeReservation(Long id);
+}
diff --git a/src/main/java/roomescape/service/ReservationServiceImpl.java b/src/main/java/roomescape/service/ReservationServiceImpl.java
new file mode 100644
index 000000000..9fd66ae4e
--- /dev/null
+++ b/src/main/java/roomescape/service/ReservationServiceImpl.java
@@ -0,0 +1,37 @@
+package roomescape.service;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import roomescape.dao.ReservationDao;
+import roomescape.dao.TimeDao;
+import roomescape.domain.Reservation;
+import roomescape.domain.Reservation.NotFoundReservationException;
+import roomescape.domain.Time;
+import roomescape.dto.ReservationRequestDto;
+import roomescape.dto.TimeRequestDto;
+
+@Service
+@RequiredArgsConstructor
+public class ReservationServiceImpl implements ReservationService {
+
+  private final ReservationDao reservationDao;
+  private final TimeDao timeDao;
+
+  @Override
+  public List<Reservation> getReservations() {
+    return reservationDao.findAll();
+  }
+
+  @Override
+  public Reservation addReservation(final ReservationRequestDto reservationRequestDto) {
+    Reservation reservation = reservationDao.createReservation(reservationRequestDto);
+    return reservation;
+  }
+
+  @Override
+  public void removeReservation(final Long id) {
+    if (reservationDao.deleteReservation(id) == 0)
+      throw new NotFoundReservationException();
+  }
+}

From 00bd5cb7747fcb75e3bde7feade54b69355c479b Mon Sep 17 00:00:00 2001
From: IDLE <83659656+idle2534@users.noreply.github.com>
Date: Thu, 7 Nov 2024 09:47:54 +0900
Subject: [PATCH 07/10] =?UTF-8?q?Feat:=20Time=20=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=EC=BD=94=EB=93=9C=20=EC=B6=94=EA=B0=80=20&=20=EA=B3=84?=
 =?UTF-8?q?=EC=B8=B5=ED=99=94=20=EB=A6=AC=ED=8E=99=ED=86=A0=EB=A7=81=20?=
 =?UTF-8?q?=EC=99=84=EB=A3=8C=20Reservation=20=EA=B3=BC=EC=9D=98=20?=
 =?UTF-8?q?=EA=B4=80=EA=B3=84=20=EC=88=98=EC=A0=95=20=ED=95=84=EC=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../roomescape/controller/TimeController.java | 42 ++++++++++++++++++
 src/main/java/roomescape/dao/TimeDao.java     | 43 +++++++++++++++++++
 src/main/java/roomescape/domain/Time.java     | 18 ++++++++
 .../java/roomescape/dto/TimeRequestDto.java   | 14 ++++++
 .../java/roomescape/service/TimeService.java  | 14 ++++++
 .../roomescape/service/TimeServiceImpl.java   | 33 ++++++++++++++
 6 files changed, 164 insertions(+)
 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/TimeRequestDto.java
 create mode 100644 src/main/java/roomescape/service/TimeService.java
 create mode 100644 src/main/java/roomescape/service/TimeServiceImpl.java

diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
new file mode 100644
index 000000000..0a6d576a4
--- /dev/null
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -0,0 +1,42 @@
+package roomescape.controller;
+
+import java.net.URI;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import roomescape.domain.Time;
+import roomescape.dto.TimeRequestDto;
+import roomescape.service.TimeService;
+
+@Controller
+@RequiredArgsConstructor
+public class TimeController {
+
+  private final TimeService timeService;
+
+  @GetMapping("/times")
+  public ResponseEntity<List<Time>> getTimes() {
+    List<Time> times = timeService.getTimes();
+    return ResponseEntity.ok(times);
+  }
+
+  @PostMapping("/times")
+  public ResponseEntity<Time> times(@RequestBody TimeRequestDto timeRequestDto) {
+    Time time = timeService.addTime(timeRequestDto);
+    return ResponseEntity
+        .created(URI.create("/times/" + time.getId()))
+        .body(time);
+  }
+
+  @DeleteMapping("/times/{id}")
+  public ResponseEntity<Time> deleteTime(@PathVariable Long id) {
+    timeService.removeTime(id);
+    return ResponseEntity.noContent().build();
+  }
+}
diff --git a/src/main/java/roomescape/dao/TimeDao.java b/src/main/java/roomescape/dao/TimeDao.java
new file mode 100644
index 000000000..8b41bed61
--- /dev/null
+++ b/src/main/java/roomescape/dao/TimeDao.java
@@ -0,0 +1,43 @@
+package roomescape.dao;
+
+import java.sql.PreparedStatement;
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Repository;
+import roomescape.domain.Time;
+import roomescape.dto.TimeRequestDto;
+
+@Repository
+@RequiredArgsConstructor
+public class TimeDao {
+  private final JdbcTemplate jdbcTemplate;
+
+  public List<Time> findAll() {
+    return jdbcTemplate.query("SELECT * FROM time", (rs, rowNum) ->
+        new Time(
+            rs.getLong("id"),
+            rs.getString("time")
+        ));
+  }
+
+  public Time createTime(TimeRequestDto timeRequestDto) {
+    KeyHolder keyHolder = new GeneratedKeyHolder();
+    jdbcTemplate.update(connection -> {
+      PreparedStatement ps = connection.prepareStatement(
+          "INSERT INTO time (time) VALUES (?)",
+          new String[] {"id"}
+      );
+      ps.setString(1, timeRequestDto.getTime());
+      return ps;
+    }, keyHolder);
+
+    return new Time(keyHolder.getKey().longValue(), timeRequestDto.getTime());
+  }
+
+  public int deleteTime(Long id) {
+    return 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..74afa6bca
--- /dev/null
+++ b/src/main/java/roomescape/domain/Time.java
@@ -0,0 +1,18 @@
+package roomescape.domain;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+@Setter
+public class Time {
+  public static class NotFoundTimeException extends RuntimeException {}
+
+  Long id;
+
+  String time;
+}
diff --git a/src/main/java/roomescape/dto/TimeRequestDto.java b/src/main/java/roomescape/dto/TimeRequestDto.java
new file mode 100644
index 000000000..f42c97183
--- /dev/null
+++ b/src/main/java/roomescape/dto/TimeRequestDto.java
@@ -0,0 +1,14 @@
+package roomescape.dto;
+
+import jakarta.validation.constraints.NotBlank;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@NoArgsConstructor
+@Getter
+public class TimeRequestDto {
+
+  private 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..f3073f5db
--- /dev/null
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -0,0 +1,14 @@
+package roomescape.service;
+
+import java.util.List;
+import roomescape.domain.Time;
+import roomescape.dto.TimeRequestDto;
+
+public interface TimeService {
+
+  List<Time> getTimes();
+
+  Time addTime(TimeRequestDto timeRequestDto);
+
+  void removeTime(Long id);
+}
diff --git a/src/main/java/roomescape/service/TimeServiceImpl.java b/src/main/java/roomescape/service/TimeServiceImpl.java
new file mode 100644
index 000000000..5e1b72566
--- /dev/null
+++ b/src/main/java/roomescape/service/TimeServiceImpl.java
@@ -0,0 +1,33 @@
+package roomescape.service;
+
+import java.util.List;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+import roomescape.dao.TimeDao;
+import roomescape.domain.Time;
+import roomescape.domain.Time.NotFoundTimeException;
+import roomescape.dto.TimeRequestDto;
+
+@Service
+@RequiredArgsConstructor
+public class TimeServiceImpl implements TimeService {
+
+  private final TimeDao timeDao;
+
+  @Override
+  public List<Time> getTimes() {
+    return timeDao.findAll();
+  }
+
+  @Override
+  public Time addTime(final TimeRequestDto timeRequestDto) {
+    Time time = timeDao.createTime(timeRequestDto);
+    return time;
+  }
+
+  @Override
+  public void removeTime(final Long id) {
+    if (timeDao.deleteTime(id) == 0)
+      throw new NotFoundTimeException();
+  }
+}

From cd44f98ba373fd2654d2cedacfdcf415eae29e21 Mon Sep 17 00:00:00 2001
From: IDLE <83659656+idle2534@users.noreply.github.com>
Date: Thu, 7 Nov 2024 18:03:30 +0900
Subject: [PATCH 08/10] =?UTF-8?q?Feat:=20Reservation=EC=9D=98=20String=20t?=
 =?UTF-8?q?ime=20=ED=98=95=EC=8B=9D=20=EC=98=88=EC=99=B8=20=EC=B2=98?=
 =?UTF-8?q?=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

---
 .../java/roomescape/controller/ReservationController.java   | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
index 9fda4e450..3d0882f31 100644
--- a/src/main/java/roomescape/controller/ReservationController.java
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -35,6 +35,12 @@ public ResponseEntity<List<Reservation>> reservations() {
 
   @PostMapping("/reservations")
   public ResponseEntity<Reservation> addReservation(@RequestBody @Validated ReservationRequestDto reservationRequestDto) {
+    try {
+      Long.parseLong(reservationRequestDto.getTime());
+    } catch (NumberFormatException e) {
+      return ResponseEntity.badRequest().build();
+    }
+
     Reservation reservation = reservationService.addReservation(reservationRequestDto);
     return ResponseEntity
         .created(URI.create("/reservations/" + reservation.getId()))

From 368622c24734ffa6dc770d33d55bc45164b6dca9 Mon Sep 17 00:00:00 2001
From: IDLE <83659656+idle2534@users.noreply.github.com>
Date: Thu, 7 Nov 2024 18:05:36 +0900
Subject: [PATCH 09/10] =?UTF-8?q?Feat:=20Time=20=ED=99=88=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=20thymleaf=20=EC=BD=94=EB=93=9C=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
index 0a6d576a4..a54349edb 100644
--- a/src/main/java/roomescape/controller/TimeController.java
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -5,6 +5,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -20,6 +21,11 @@ public class TimeController {
 
   private final TimeService timeService;
 
+  @GetMapping("/time")
+  public String time() {
+    return "time";
+  }
+
   @GetMapping("/times")
   public ResponseEntity<List<Time>> getTimes() {
     List<Time> times = timeService.getTimes();

From e72642e6deba26a11fdc771eb8a19475fe809727 Mon Sep 17 00:00:00 2001
From: IDLE <83659656+idle2534@users.noreply.github.com>
Date: Thu, 7 Nov 2024 18:06:59 +0900
Subject: [PATCH 10/10] =?UTF-8?q?Fix:=20Reservation=EA=B3=BC=20Time=20?=
 =?UTF-8?q?=EA=B0=84=EC=9D=98=20=EA=B4=80=EA=B3=84=20=EC=BD=94=EB=93=9C=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

---
 .../java/roomescape/dao/ReservationDao.java   |  9 +++++----
 src/main/java/roomescape/dao/TimeDao.java     | 19 +++++++++++++++++--
 .../java/roomescape/domain/Reservation.java   |  6 ++++++
 .../roomescape/dto/ReservationRequestDto.java |  3 ++-
 .../service/ReservationServiceImpl.java       |  7 ++++---
 .../roomescape/service/TimeServiceImpl.java   |  4 ++--
 6 files changed, 36 insertions(+), 12 deletions(-)

diff --git a/src/main/java/roomescape/dao/ReservationDao.java b/src/main/java/roomescape/dao/ReservationDao.java
index 5e2c542b6..61c0f4d74 100644
--- a/src/main/java/roomescape/dao/ReservationDao.java
+++ b/src/main/java/roomescape/dao/ReservationDao.java
@@ -33,22 +33,23 @@ public List<Reservation> findAll() {
         ));
   }
 
-  public Reservation createReservation(ReservationRequestDto reservationRequestDto) {
+  public Reservation save(ReservationRequestDto reservationRequestDto) {
     KeyHolder keyHolder = new GeneratedKeyHolder();
     jdbcTemplate.update(connection -> {
       PreparedStatement ps = connection.prepareStatement(
-          "INSERT INTO reservation (name, date) VALUES (?, ?)",
+          "INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)",
           new String[]{"id"}
       );
       ps.setString(1, reservationRequestDto.getName());
       ps.setString(2, reservationRequestDto.getDate());
+      ps.setLong(3, Long.parseLong(reservationRequestDto.getTime()));
       return ps;
     }, keyHolder);
 
-    return new Reservation(keyHolder.getKey().longValue(), reservationRequestDto.getName(), reservationRequestDto.getDate(), new Time());
+    return new Reservation(keyHolder.getKey().longValue(), reservationRequestDto.getName(), reservationRequestDto.getDate());
   }
 
-  public int deleteReservation(Long id) {
+  public int delete(Long id) {
     return jdbcTemplate.update("DELETE FROM reservation WHERE id = ?", id);
   }
 }
diff --git a/src/main/java/roomescape/dao/TimeDao.java b/src/main/java/roomescape/dao/TimeDao.java
index 8b41bed61..c283dd2c0 100644
--- a/src/main/java/roomescape/dao/TimeDao.java
+++ b/src/main/java/roomescape/dao/TimeDao.java
@@ -2,7 +2,9 @@
 
 import java.sql.PreparedStatement;
 import java.util.List;
+import java.util.Optional;
 import lombok.RequiredArgsConstructor;
+import org.springframework.dao.EmptyResultDataAccessException;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
@@ -23,7 +25,20 @@ public List<Time> findAll() {
         ));
   }
 
-  public Time createTime(TimeRequestDto timeRequestDto) {
+  public Optional<Time> findById(Long id) {
+    try {
+      Time time = jdbcTemplate.queryForObject("SELECT * FROM time WHERE id = (?)", (rs, rowNum) ->
+          new Time(
+              rs.getLong("id"),
+              rs.getString("time")),
+          id);
+      return Optional.of(time);
+    } catch (EmptyResultDataAccessException e) {
+      return Optional.empty();
+    }
+  }
+
+  public Time save(TimeRequestDto timeRequestDto) {
     KeyHolder keyHolder = new GeneratedKeyHolder();
     jdbcTemplate.update(connection -> {
       PreparedStatement ps = connection.prepareStatement(
@@ -37,7 +52,7 @@ public Time createTime(TimeRequestDto timeRequestDto) {
     return new Time(keyHolder.getKey().longValue(), timeRequestDto.getTime());
   }
 
-  public int deleteTime(Long id) {
+  public int delete(Long id) {
     return jdbcTemplate.update("DELETE FROM time WHERE id = ?", id);
   }
 }
diff --git a/src/main/java/roomescape/domain/Reservation.java b/src/main/java/roomescape/domain/Reservation.java
index 499910def..fd6d51b8e 100644
--- a/src/main/java/roomescape/domain/Reservation.java
+++ b/src/main/java/roomescape/domain/Reservation.java
@@ -16,4 +16,10 @@ public static class NotFoundReservationException extends RuntimeException{}
   private String name;
   private String date;
   private Time time;
+
+  public Reservation(Long id, String name, String date) {
+    this.id = id;
+    this.name = name;
+    this.date = date;
+  }
 }
diff --git a/src/main/java/roomescape/dto/ReservationRequestDto.java b/src/main/java/roomescape/dto/ReservationRequestDto.java
index ab0face0b..566e0fabc 100644
--- a/src/main/java/roomescape/dto/ReservationRequestDto.java
+++ b/src/main/java/roomescape/dto/ReservationRequestDto.java
@@ -12,5 +12,6 @@ public class ReservationRequestDto {
   @NotBlank
   private String date;
 
-  @Blank
+  @NotBlank
+  private String time;
 }
diff --git a/src/main/java/roomescape/service/ReservationServiceImpl.java b/src/main/java/roomescape/service/ReservationServiceImpl.java
index 9fd66ae4e..1b4576bf8 100644
--- a/src/main/java/roomescape/service/ReservationServiceImpl.java
+++ b/src/main/java/roomescape/service/ReservationServiceImpl.java
@@ -9,7 +9,6 @@
 import roomescape.domain.Reservation.NotFoundReservationException;
 import roomescape.domain.Time;
 import roomescape.dto.ReservationRequestDto;
-import roomescape.dto.TimeRequestDto;
 
 @Service
 @RequiredArgsConstructor
@@ -25,13 +24,15 @@ public List<Reservation> getReservations() {
 
   @Override
   public Reservation addReservation(final ReservationRequestDto reservationRequestDto) {
-    Reservation reservation = reservationDao.createReservation(reservationRequestDto);
+    Reservation reservation = reservationDao.save(reservationRequestDto);
+    Time time = timeDao.findById(Long.parseLong(reservationRequestDto.getTime())).orElseThrow();
+    reservation.setTime(time);
     return reservation;
   }
 
   @Override
   public void removeReservation(final Long id) {
-    if (reservationDao.deleteReservation(id) == 0)
+    if (reservationDao.delete(id) == 0)
       throw new NotFoundReservationException();
   }
 }
diff --git a/src/main/java/roomescape/service/TimeServiceImpl.java b/src/main/java/roomescape/service/TimeServiceImpl.java
index 5e1b72566..40d77cc5b 100644
--- a/src/main/java/roomescape/service/TimeServiceImpl.java
+++ b/src/main/java/roomescape/service/TimeServiceImpl.java
@@ -21,13 +21,13 @@ public List<Time> getTimes() {
 
   @Override
   public Time addTime(final TimeRequestDto timeRequestDto) {
-    Time time = timeDao.createTime(timeRequestDto);
+    Time time = timeDao.save(timeRequestDto);
     return time;
   }
 
   @Override
   public void removeTime(final Long id) {
-    if (timeDao.deleteTime(id) == 0)
+    if (timeDao.delete(id) == 0)
       throw new NotFoundTimeException();
   }
 }