From 623d3af6b84a3b8cffc9a4b6e2ad08c2d667429a Mon Sep 17 00:00:00 2001
From: jermany17 <leejm5050@naver.com>
Date: Mon, 25 Nov 2024 21:32:30 +0900
Subject: [PATCH 1/6] =?UTF-8?q?8=EB=8B=A8=EA=B3=84=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 3091bfedd..11e5e0205 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -156,4 +156,29 @@ public class MissionStepTest {
         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 0ee18b060608be22b568a4218039f8e2240bc42e Mon Sep 17 00:00:00 2001
From: jermany17 <leejm5050@naver.com>
Date: Mon, 25 Nov 2024 21:33:15 +0900
Subject: [PATCH 2/6] =?UTF-8?q?8=EB=8B=A8=EA=B3=84=20-=20=EC=8B=9C?=
 =?UTF-8?q?=EA=B0=84=20=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

---
 .../roomescape/controller/TimeController.java | 77 +++++++++++++++++++
 src/main/java/roomescape/model/Time.java      | 30 ++++++++
 src/main/resources/schema.sql                 |  7 ++
 3 files changed, 114 insertions(+)
 create mode 100644 src/main/java/roomescape/controller/TimeController.java
 create mode 100644 src/main/java/roomescape/model/Time.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..82110d677
--- /dev/null
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -0,0 +1,77 @@
+package roomescape.controller;
+
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import roomescape.model.Time;
+
+import java.net.URI;
+import java.sql.PreparedStatement;
+import java.util.List;
+
+@Controller
+public class TimeController {
+
+    private final JdbcTemplate jdbcTemplate;
+
+    public TimeController(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    private final RowMapper<Time> timeRowMapper = (rs, rowNum) -> new Time(
+            rs.getLong("id"),
+            rs.getString("time")
+    );
+
+    // 시간 관리 페이지
+    @GetMapping("/time")
+    public String reservationPage() {
+        return "time";
+    }
+
+    // 시간 조회
+    @GetMapping("/times")
+    @ResponseBody
+    public ResponseEntity<List<Time>> getTimes() {
+        String sql = "SELECT id, time FROM time";
+        List<Time> times = jdbcTemplate.query(sql, timeRowMapper);
+        return ResponseEntity.ok(times);
+    }
+
+    // 시간 추가
+    @PostMapping("/times")
+    public ResponseEntity<Time> addTime(@RequestBody Time request) {
+        String sql = "INSERT INTO time (time) VALUES (?)";
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(sql, new String[]{"id"});
+            ps.setString(1, request.getTime());
+            return ps;
+        }, keyHolder);
+
+        Long id = keyHolder.getKey().longValue();
+        Time newTime = new Time(id, request.getTime());
+
+        return ResponseEntity.created(URI.create("/times/" + id)).body(newTime);
+    }
+
+    // 시간 삭제
+    @DeleteMapping("/times/{id}")
+    public ResponseEntity<Void> deleteTime(@PathVariable Long id) {
+        String sql = "DELETE FROM time WHERE id = ?";
+        int rowsAffected = jdbcTemplate.update(sql, id);
+
+        if (rowsAffected > 0) {
+            return ResponseEntity.noContent().build();
+        }
+
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
+    }
+}
diff --git a/src/main/java/roomescape/model/Time.java b/src/main/java/roomescape/model/Time.java
new file mode 100644
index 000000000..a708416cd
--- /dev/null
+++ b/src/main/java/roomescape/model/Time.java
@@ -0,0 +1,30 @@
+package roomescape.model;
+
+public class Time {
+    private Long id;
+    private String time;
+
+    public Time() {
+    }
+
+    public Time(Long id, String time) {
+        this.id = id;
+        this.time = time;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 8d9ab2754..59ca829e5 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -6,3 +6,10 @@ CREATE TABLE reservation
     time    VARCHAR(255) NOT NULL,
     PRIMARY KEY (id)
 );
+
+CREATE TABLE time
+(
+    id   BIGINT       NOT NULL AUTO_INCREMENT,
+    time VARCHAR(255) NOT NULL,
+    PRIMARY KEY (id)
+);
\ No newline at end of file

From a2848ff8bdba4001ad96448db5230c8fcb537af1 Mon Sep 17 00:00:00 2001
From: jermany17 <leejm5050@naver.com>
Date: Mon, 25 Nov 2024 23:01:26 +0900
Subject: [PATCH 3/6] =?UTF-8?q?9=EB=8B=A8=EA=B3=84=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/test/java/roomescape/MissionStepTest.java | 143 ++----------------
 1 file changed, 12 insertions(+), 131 deletions(-)

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 11e5e0205..aa5e92be8 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -24,161 +24,42 @@
 public class MissionStepTest {
 
     @Test
-    void 일단계() {
-        RestAssured.given().log().all()
-                .when().get("/")
-                .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));
-    }
-
-    @Test
-    void 삼단계() {
+    void 팔단계() {
         Map<String, String> params = new HashMap<>();
-        params.put("name", "브라운");
-        params.put("date", "2023-08-05");
-        params.put("time", "15:40");
+        params.put("time", "10:00");
 
         RestAssured.given().log().all()
                 .contentType(ContentType.JSON)
                 .body(params)
-                .when().post("/reservations")
+                .when().post("/times")
                 .then().log().all()
                 .statusCode(201)
-                .header("Location", "/reservations/1")
-                .body("id", is(1));
+                .header("Location", "/times/1");
 
         RestAssured.given().log().all()
-                .when().get("/reservations")
+                .when().get("/times")
                 .then().log().all()
                 .statusCode(200)
                 .body("size()", is(1));
 
         RestAssured.given().log().all()
-                .when().delete("/reservations/1")
+                .when().delete("/times/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", "");
+    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(params)
+                .body(reservation)
                 .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);
     }
 }

From e49727b15fc38686d5bbef05270be59da5c820af Mon Sep 17 00:00:00 2001
From: jermany17 <leejm5050@naver.com>
Date: Mon, 25 Nov 2024 23:01:47 +0900
Subject: [PATCH 4/6] =?UTF-8?q?9=EB=8B=A8=EA=B3=84=20-=20=EA=B8=B0?=
 =?UTF-8?q?=EC=A1=B4=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ReservationController.java     | 48 +++++++++++------
 .../java/roomescape/model/Reservation.java    | 22 +++++---
 .../roomescape/model/ReservationRequest.java  | 52 +++++++++++++++----
 src/main/resources/schema.sql                 | 19 +++----
 4 files changed, 101 insertions(+), 40 deletions(-)

diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
index 58ed6e559..e87850d98 100644
--- a/src/main/java/roomescape/controller/ReservationController.java
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -11,6 +11,7 @@
 import roomescape.exception.NotFoundReservationException;
 import roomescape.model.Reservation;
 import roomescape.model.ReservationRequest;
+import roomescape.model.Time;
 
 import java.net.URI;
 import java.sql.PreparedStatement;
@@ -26,46 +27,63 @@ public ReservationController(JdbcTemplate jdbcTemplate) {
     }
 
     private final RowMapper<Reservation> reservationRowMapper = (rs, rowNum) -> new Reservation(
-            rs.getLong("id"),
+            rs.getLong("reservation_id"),
             rs.getString("name"),
             rs.getString("date"),
-            rs.getString("time")
+            new Time(rs.getLong("time_id"), rs.getString("time_value"))
     );
 
     // 예약 관리 페이지
     @GetMapping("/reservation")
     public String reservationPage() {
-        return "reservation";
+        return "new-reservation";
     }
 
     // 예약 조회
     @GetMapping("/reservations")
     @ResponseBody
-    public List<Reservation> getReservations() {
-        String sql = "SELECT id, name, date, time FROM reservation";
-        return jdbcTemplate.query(sql, reservationRowMapper);
+    public ResponseEntity<List<Reservation>> getReservations() {
+        String sql = """
+            SELECT 
+                r.id as reservation_id, 
+                r.name, 
+                r.date, 
+                t.id as time_id, 
+                t.time as time_value 
+            FROM reservation as r 
+            INNER JOIN time as t 
+            ON r.time_id = t.id
+        """;
+        List<Reservation> reservations = jdbcTemplate.query(sql, reservationRowMapper);
+        return ResponseEntity.ok(reservations);
     }
 
     // 예약 추가
     @PostMapping("/reservations")
+    @ResponseBody
     public ResponseEntity<Reservation> addReservation(@RequestBody ReservationRequest request) {
-        request.validate();
-
-        Reservation newReservation = new Reservation(null, request.getName(), request.getDate(), request.getTime());
+        request.validateAndSetTimeId(jdbcTemplate);
 
-        String sql = "INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)";
+        // 예약 추가
+        String sql = "INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)";
         KeyHolder keyHolder = new GeneratedKeyHolder();
 
         jdbcTemplate.update(connection -> {
-            PreparedStatement ps = connection.prepareStatement(sql, new String[] {"id"});
-            ps.setString(1, newReservation.getName());
-            ps.setString(2, newReservation.getDate());
-            ps.setString(3, newReservation.getTime());
+            PreparedStatement ps = connection.prepareStatement(sql, new String[]{"id"});
+            ps.setString(1, request.getName());
+            ps.setString(2, request.getDate());
+            ps.setLong(3, request.getTimeId());
             return ps;
         }, keyHolder);
 
         Long id = keyHolder.getKey().longValue();
-        newReservation.setId(id);
+
+        String timeQuery = "SELECT time FROM time WHERE id = ?";
+        String timeValue = jdbcTemplate.queryForObject(timeQuery, String.class, request.getTime());
+
+        Reservation newReservation = new Reservation(id, request.getName(), request.getDate(),
+                new Time(request.getTimeId(), timeValue));
+
 
         return ResponseEntity.created(URI.create("/reservations/" + id)).body(newReservation);
     }
diff --git a/src/main/java/roomescape/model/Reservation.java b/src/main/java/roomescape/model/Reservation.java
index 8673b8b1c..fc052cc4e 100644
--- a/src/main/java/roomescape/model/Reservation.java
+++ b/src/main/java/roomescape/model/Reservation.java
@@ -4,16 +4,12 @@ public class Reservation {
     private Long id;
     private String name;
     private String date;
-    private String time;
+    private Time time;
 
-    // 기본 생성자를 추가 하는 이유
-        // 1. Jackson과의 호환성 및 역직렬화 원활
-        // 2. 객체를 생성할 때 기본 생서자로 빈 객체를 만든 후 필드를 하나씩 채워 넣는다.
-    // 기본 생성자를 추가하지 않고 @JsonCreator와 @JsonProperty를 사용하는 방법도 있음.
     public Reservation() {
     }
 
-    public Reservation(Long id, String name, String date, String time) {
+    public Reservation(Long id, String name, String date, Time time) {
         this.id = id;
         this.name = name;
         this.date = date;
@@ -32,12 +28,24 @@ public String getName() {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getDate() {
         return date;
     }
 
-    public String getTime() {
+    public void setDate(String date) {
+        this.date = date;
+    }
+
+    public Time getTime() {
         return time;
     }
+
+    public void setTime(Time time) {
+        this.time = time;
+    }
 }
 
diff --git a/src/main/java/roomescape/model/ReservationRequest.java b/src/main/java/roomescape/model/ReservationRequest.java
index 5b4f2be8c..772036502 100644
--- a/src/main/java/roomescape/model/ReservationRequest.java
+++ b/src/main/java/roomescape/model/ReservationRequest.java
@@ -1,38 +1,72 @@
 package roomescape.model;
 
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
 import roomescape.exception.InvalidReservationException;
 
 public class ReservationRequest {
     private String name;
     private String date;
     private String time;
+    private Long timeId;
 
-    public ReservationRequest() {}
+    public ReservationRequest() {
+    }
 
-    public ReservationRequest(String name, String date, String time) {
+    public ReservationRequest(String name, String date, String timeId) {
         this.name = name;
         this.date = date;
-        this.time = time;
+        this.time = timeId;
     }
 
     public String getName() {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getDate() {
         return date;
     }
 
+    public void setDate(String date) {
+        this.date = date;
+    }
+
     public String getTime() {
         return time;
     }
 
-    // 검증 메서드 추가
-    public void validate() {
-        if (name == null || name.isEmpty() ||
-                date == null || date.isEmpty() ||
-                time == null || time.isEmpty()) {
-            throw new InvalidReservationException("필요한 인자가 없습니다.");
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public Long getTimeId() {
+        return timeId;
+    }
+
+    public void validateAndSetTimeId(JdbcTemplate jdbcTemplate) {
+        if (name == null || name.isEmpty() || date == null || date.isEmpty() || time == null || time.isEmpty()) {
+            throw new InvalidReservationException("필수 입력값이 누락되었습니다.");
+        }
+
+        try {
+            timeId = Long.parseLong(time);
+        } catch (NumberFormatException e) {
+            throw new InvalidReservationException("유효하지 않은 timeId입니다: " + time);
+        }
+
+        String timeQuery = "SELECT time FROM time WHERE id = ?";
+        try {
+            // timeId로 유효성 검사
+            String resolvedTime = jdbcTemplate.queryForObject(timeQuery, String.class, timeId);
+            if (resolvedTime == null) {
+                throw new InvalidReservationException("유효하지 않은 timeId입니다: " + timeId);
+            }
+        } catch (EmptyResultDataAccessException e) {
+            throw new InvalidReservationException("유효하지 않은 시간입니다: " + timeId);
         }
     }
 }
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 59ca829e5..e0175a9fd 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -1,15 +1,16 @@
-CREATE TABLE reservation
-(
-    id      BIGINT       NOT NULL AUTO_INCREMENT,
-    name    VARCHAR(255) NOT NULL,
-    date    VARCHAR(255) NOT NULL,
-    time    VARCHAR(255) NOT NULL,
-    PRIMARY KEY (id)
-);
-
 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 61fd1c9895922869d53c7d137c766af71181ca4d Mon Sep 17 00:00:00 2001
From: jermany17 <leejm5050@naver.com>
Date: Mon, 25 Nov 2024 23:04:26 +0900
Subject: [PATCH 5/6] =?UTF-8?q?10=EB=8B=A8=EA=B3=84=20=ED=85=8C=EC=8A=A4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index aa5e92be8..22bcb798c 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -7,10 +7,12 @@
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.DirtiesContext;
+import roomescape.controller.ReservationController;
 import roomescape.model.Reservation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
+import java.lang.reflect.Field;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
@@ -62,4 +64,21 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(400);
     }
+
+    @Autowired
+    private ReservationController reservationController;
+
+    @Test
+    void 십단계() {
+        boolean isJdbcTemplateInjected = false;
+
+        for (Field field : reservationController.getClass().getDeclaredFields()) {
+            if (field.getType().equals(JdbcTemplate.class)) {
+                isJdbcTemplateInjected = true;
+                break;
+            }
+        }
+
+        assertThat(isJdbcTemplateInjected).isFalse();
+    }
 }

From 45d4f6c43f974ffc472a58a14d39695c457f2186 Mon Sep 17 00:00:00 2001
From: jermany17 <leejm5050@naver.com>
Date: Tue, 26 Nov 2024 12:56:13 +0900
Subject: [PATCH 6/6] =?UTF-8?q?10=EB=8B=A8=EA=B3=84=20-=20=EA=B3=84?=
 =?UTF-8?q?=EC=B8=B5=ED=99=94=20=EB=A6=AC=ED=8C=A9=ED=84=B0=EB=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ReservationController.java     | 73 +++---------------
 .../roomescape/controller/TimeController.java | 49 +++---------
 .../java/roomescape/dao/ReservationDao.java   | 74 +++++++++++++++++++
 src/main/java/roomescape/dao/TimeDao.java     | 50 +++++++++++++
 .../exception/GlobalExceptionHandler.java     |  6 ++
 src/main/java/roomescape/model/Time.java      |  3 +
 .../service/ReservationService.java           | 35 +++++++++
 .../java/roomescape/service/TimeService.java  | 35 +++++++++
 src/test/java/roomescape/MissionStepTest.java |  4 -
 9 files changed, 224 insertions(+), 105 deletions(-)
 create mode 100644 src/main/java/roomescape/dao/ReservationDao.java
 create mode 100644 src/main/java/roomescape/dao/TimeDao.java
 create mode 100644 src/main/java/roomescape/service/ReservationService.java
 create mode 100644 src/main/java/roomescape/service/TimeService.java

diff --git a/src/main/java/roomescape/controller/ReservationController.java b/src/main/java/roomescape/controller/ReservationController.java
index e87850d98..e481b9d8d 100644
--- a/src/main/java/roomescape/controller/ReservationController.java
+++ b/src/main/java/roomescape/controller/ReservationController.java
@@ -1,38 +1,24 @@
 package roomescape.controller;
 
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import roomescape.exception.NotFoundReservationException;
 import roomescape.model.Reservation;
-import roomescape.model.ReservationRequest;
-import roomescape.model.Time;
+import roomescape.model.ReservationRequest;;
+import roomescape.service.ReservationService;
 
 import java.net.URI;
-import java.sql.PreparedStatement;
 import java.util.List;
 
 @Controller
 public class ReservationController {
 
-    private final JdbcTemplate jdbcTemplate;
+    private final ReservationService reservationService;
 
-    public ReservationController(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
+    public ReservationController(ReservationService reservationService) {
+        this.reservationService = reservationService;
     }
 
-    private final RowMapper<Reservation> reservationRowMapper = (rs, rowNum) -> new Reservation(
-            rs.getLong("reservation_id"),
-            rs.getString("name"),
-            rs.getString("date"),
-            new Time(rs.getLong("time_id"), rs.getString("time_value"))
-    );
-
     // 예약 관리 페이지
     @GetMapping("/reservation")
     public String reservationPage() {
@@ -43,18 +29,7 @@ public String reservationPage() {
     @GetMapping("/reservations")
     @ResponseBody
     public ResponseEntity<List<Reservation>> getReservations() {
-        String sql = """
-            SELECT 
-                r.id as reservation_id, 
-                r.name, 
-                r.date, 
-                t.id as time_id, 
-                t.time as time_value 
-            FROM reservation as r 
-            INNER JOIN time as t 
-            ON r.time_id = t.id
-        """;
-        List<Reservation> reservations = jdbcTemplate.query(sql, reservationRowMapper);
+        List<Reservation> reservations = reservationService.getReservations();
         return ResponseEntity.ok(reservations);
     }
 
@@ -62,42 +37,14 @@ public ResponseEntity<List<Reservation>> getReservations() {
     @PostMapping("/reservations")
     @ResponseBody
     public ResponseEntity<Reservation> addReservation(@RequestBody ReservationRequest request) {
-        request.validateAndSetTimeId(jdbcTemplate);
-
-        // 예약 추가
-        String sql = "INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)";
-        KeyHolder keyHolder = new GeneratedKeyHolder();
-
-        jdbcTemplate.update(connection -> {
-            PreparedStatement ps = connection.prepareStatement(sql, new String[]{"id"});
-            ps.setString(1, request.getName());
-            ps.setString(2, request.getDate());
-            ps.setLong(3, request.getTimeId());
-            return ps;
-        }, keyHolder);
-
-        Long id = keyHolder.getKey().longValue();
-
-        String timeQuery = "SELECT time FROM time WHERE id = ?";
-        String timeValue = jdbcTemplate.queryForObject(timeQuery, String.class, request.getTime());
-
-        Reservation newReservation = new Reservation(id, request.getName(), request.getDate(),
-                new Time(request.getTimeId(), timeValue));
-
-
-        return ResponseEntity.created(URI.create("/reservations/" + id)).body(newReservation);
+        Reservation newReservation = reservationService.addReservation(request);
+        return ResponseEntity.created(URI.create("/reservations/" + newReservation.getId())).body(newReservation);
     }
 
     // 예약 삭제
     @DeleteMapping("/reservations/{id}")
     public ResponseEntity<Void> deleteReservation(@PathVariable Long id) {
-        String sql = "DELETE FROM reservation WHERE id = ?";
-        int rowsAffected = jdbcTemplate.update(sql, id);
-
-        if (rowsAffected > 0) {
-            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
-        }
-
-        throw new NotFoundReservationException("삭제할 예약이 없습니다.");
+        reservationService.deleteReservation(id);
+        return ResponseEntity.noContent().build();
     }
 }
diff --git a/src/main/java/roomescape/controller/TimeController.java b/src/main/java/roomescape/controller/TimeController.java
index 82110d677..c9c9d1f14 100644
--- a/src/main/java/roomescape/controller/TimeController.java
+++ b/src/main/java/roomescape/controller/TimeController.java
@@ -1,34 +1,23 @@
 package roomescape.controller;
 
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
-import org.springframework.jdbc.core.JdbcTemplate;
-import org.springframework.jdbc.core.RowMapper;
-import org.springframework.jdbc.support.GeneratedKeyHolder;
-import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 import roomescape.model.Time;
+import roomescape.service.TimeService;
 
 import java.net.URI;
-import java.sql.PreparedStatement;
 import java.util.List;
 
 @Controller
 public class TimeController {
 
-    private final JdbcTemplate jdbcTemplate;
+    private final TimeService timeService;
 
-    public TimeController(JdbcTemplate jdbcTemplate) {
-        this.jdbcTemplate = jdbcTemplate;
+    public TimeController(TimeService timeService) {
+        this.timeService = timeService;
     }
 
-    private final RowMapper<Time> timeRowMapper = (rs, rowNum) -> new Time(
-            rs.getLong("id"),
-            rs.getString("time")
-    );
-
     // 시간 관리 페이지
     @GetMapping("/time")
     public String reservationPage() {
@@ -39,39 +28,23 @@ public String reservationPage() {
     @GetMapping("/times")
     @ResponseBody
     public ResponseEntity<List<Time>> getTimes() {
-        String sql = "SELECT id, time FROM time";
-        List<Time> times = jdbcTemplate.query(sql, timeRowMapper);
+        List<Time> times = timeService.getAllTimes();
         return ResponseEntity.ok(times);
     }
 
     // 시간 추가
     @PostMapping("/times")
+    @ResponseBody
     public ResponseEntity<Time> addTime(@RequestBody Time request) {
-        String sql = "INSERT INTO time (time) VALUES (?)";
-        KeyHolder keyHolder = new GeneratedKeyHolder();
-
-        jdbcTemplate.update(connection -> {
-            PreparedStatement ps = connection.prepareStatement(sql, new String[]{"id"});
-            ps.setString(1, request.getTime());
-            return ps;
-        }, keyHolder);
-
-        Long id = keyHolder.getKey().longValue();
-        Time newTime = new Time(id, request.getTime());
-
-        return ResponseEntity.created(URI.create("/times/" + id)).body(newTime);
+        Time newTime = timeService.addTime(request);
+        return ResponseEntity.created(URI.create("/times/" + newTime.getId())).body(newTime);
     }
 
     // 시간 삭제
     @DeleteMapping("/times/{id}")
+    @ResponseBody
     public ResponseEntity<Void> deleteTime(@PathVariable Long id) {
-        String sql = "DELETE FROM time WHERE id = ?";
-        int rowsAffected = jdbcTemplate.update(sql, id);
-
-        if (rowsAffected > 0) {
-            return ResponseEntity.noContent().build();
-        }
-
-        return ResponseEntity.status(HttpStatus.NOT_FOUND).build();
+        timeService.deleteTime(id);
+        return ResponseEntity.noContent().build();
     }
 }
diff --git a/src/main/java/roomescape/dao/ReservationDao.java b/src/main/java/roomescape/dao/ReservationDao.java
new file mode 100644
index 000000000..9ac9ccbcb
--- /dev/null
+++ b/src/main/java/roomescape/dao/ReservationDao.java
@@ -0,0 +1,74 @@
+package roomescape.dao;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Repository;
+import roomescape.model.Reservation;
+import roomescape.model.ReservationRequest;
+import roomescape.model.Time;
+
+import java.sql.PreparedStatement;
+import java.util.List;
+
+@Repository
+public class ReservationDao {
+
+    private final JdbcTemplate jdbcTemplate;
+
+    private final RowMapper<Reservation> reservationRowMapper = (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 ReservationDao(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    public JdbcTemplate getJdbcTemplate() {
+        return jdbcTemplate;
+    }
+
+    public List<Reservation> findAll() {
+        String sql = """
+            SELECT 
+                r.id as reservation_id, 
+                r.name, 
+                r.date, 
+                t.id as time_id, 
+                t.time as time_value 
+            FROM reservation as r 
+            INNER JOIN time as t 
+            ON r.time_id = t.id
+        """;
+        return jdbcTemplate.query(sql, reservationRowMapper);
+    }
+
+    public Reservation save(ReservationRequest request) {
+        String sql = "INSERT INTO reservation (name, date, time_id) VALUES (?, ?, ?)";
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(sql, new String[]{"id"});
+            ps.setString(1, request.getName());
+            ps.setString(2, request.getDate());
+            ps.setLong(3, request.getTimeId());
+            return ps;
+        }, keyHolder);
+
+        Long id = keyHolder.getKey().longValue();
+
+        String timeQuery = "SELECT time FROM time WHERE id = ?";
+        String timeValue = jdbcTemplate.queryForObject(timeQuery, String.class, request.getTimeId());
+
+        return new Reservation(id, request.getName(), request.getDate(), new Time(request.getTimeId(), timeValue));
+    }
+
+    public int deleteById(Long id) {
+        String sql = "DELETE FROM reservation WHERE id = ?";
+        return jdbcTemplate.update(sql, id);
+    }
+}
diff --git a/src/main/java/roomescape/dao/TimeDao.java b/src/main/java/roomescape/dao/TimeDao.java
new file mode 100644
index 000000000..b2381592c
--- /dev/null
+++ b/src/main/java/roomescape/dao/TimeDao.java
@@ -0,0 +1,50 @@
+package roomescape.dao;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Repository;
+import roomescape.model.Time;
+
+import java.sql.PreparedStatement;
+import java.util.List;
+
+@Repository
+public class TimeDao {
+
+    private final JdbcTemplate jdbcTemplate;
+
+    private final RowMapper<Time> timeRowMapper = (rs, rowNum) -> new Time(
+            rs.getLong("id"),
+            rs.getString("time")
+    );
+
+    public TimeDao(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    public List<Time> findAll() {
+        String sql = "SELECT id, time FROM time";
+        return jdbcTemplate.query(sql, timeRowMapper);
+    }
+
+    public Time save(Time time) {
+        String sql = "INSERT INTO time (time) VALUES (?)";
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(sql, new String[]{"id"});
+            ps.setString(1, time.getTime());
+            return ps;
+        }, keyHolder);
+
+        Long id = keyHolder.getKey().longValue();
+        return new Time(id, time.getTime());
+    }
+
+    public int deleteById(Long id) {
+        String sql = "DELETE FROM time WHERE id = ?";
+        return jdbcTemplate.update(sql, id);
+    }
+}
diff --git a/src/main/java/roomescape/exception/GlobalExceptionHandler.java b/src/main/java/roomescape/exception/GlobalExceptionHandler.java
index 33a36a8a2..3284a22f5 100644
--- a/src/main/java/roomescape/exception/GlobalExceptionHandler.java
+++ b/src/main/java/roomescape/exception/GlobalExceptionHandler.java
@@ -11,6 +11,7 @@
 public class GlobalExceptionHandler {
 
     // 특정 예외를 처리하는 메서드를 정의
+
     @ExceptionHandler(NotFoundReservationException.class)
     public ResponseEntity<String> handleNotFoundReservationException(NotFoundReservationException e) {
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
@@ -20,4 +21,9 @@ public ResponseEntity<String> handleNotFoundReservationException(NotFoundReserva
     public ResponseEntity<String> handleInvalidReservationException(InvalidReservationException e) {
         return ResponseEntity.status(HttpStatus.BAD_REQUEST).body(e.getMessage());
     }
+
+    @ExceptionHandler(IllegalArgumentException.class)
+    public ResponseEntity<String> handleIllegalArgumentException(IllegalArgumentException e) {
+        return ResponseEntity.badRequest().body(e.getMessage());
+    }
 }
diff --git a/src/main/java/roomescape/model/Time.java b/src/main/java/roomescape/model/Time.java
index a708416cd..8f65f32cd 100644
--- a/src/main/java/roomescape/model/Time.java
+++ b/src/main/java/roomescape/model/Time.java
@@ -25,6 +25,9 @@ public String getTime() {
     }
 
     public void setTime(String time) {
+        if (time == null || time.trim().isEmpty()) {
+            throw new IllegalArgumentException("시간 값이 비어 있습니다.");
+        }
         this.time = time;
     }
 }
diff --git a/src/main/java/roomescape/service/ReservationService.java b/src/main/java/roomescape/service/ReservationService.java
new file mode 100644
index 000000000..ddfdba093
--- /dev/null
+++ b/src/main/java/roomescape/service/ReservationService.java
@@ -0,0 +1,35 @@
+package roomescape.service;
+
+import org.springframework.stereotype.Service;
+import roomescape.dao.ReservationDao;
+import roomescape.exception.NotFoundReservationException;
+import roomescape.model.Reservation;
+import roomescape.model.ReservationRequest;
+
+import java.util.List;
+
+@Service
+public class ReservationService {
+
+    private final ReservationDao reservationDao;
+
+    public ReservationService(ReservationDao reservationDao) {
+        this.reservationDao = reservationDao;
+    }
+
+    public List<Reservation> getReservations() {
+        return reservationDao.findAll();
+    }
+
+    public Reservation addReservation(ReservationRequest request) {
+        request.validateAndSetTimeId(reservationDao.getJdbcTemplate());
+        return reservationDao.save(request);
+    }
+
+    public void deleteReservation(Long id) {
+        int rowsAffected = reservationDao.deleteById(id);
+        if (rowsAffected == 0) {
+            throw new NotFoundReservationException("삭제할 예약이 없습니다.");
+        }
+    }
+}
diff --git a/src/main/java/roomescape/service/TimeService.java b/src/main/java/roomescape/service/TimeService.java
new file mode 100644
index 000000000..af841e28e
--- /dev/null
+++ b/src/main/java/roomescape/service/TimeService.java
@@ -0,0 +1,35 @@
+package roomescape.service;
+
+import org.springframework.stereotype.Service;
+import roomescape.dao.TimeDao;
+import roomescape.model.Time;
+
+import java.util.List;
+
+@Service
+public class TimeService {
+
+    private final TimeDao timeDao;
+
+    public TimeService(TimeDao timeDao) {
+        this.timeDao = timeDao;
+    }
+
+    public List<Time> getAllTimes() {
+        return timeDao.findAll();
+    }
+
+    public Time addTime(Time time) {
+        if (time.getTime() == null || time.getTime().trim().isEmpty()) {
+            throw new IllegalArgumentException("시간 값이 비어 있습니다.");
+        }
+        return timeDao.save(time);
+    }
+
+    public void deleteTime(Long id) {
+        int rowsAffected = timeDao.deleteById(id);
+        if (rowsAffected == 0) {
+            throw new IllegalArgumentException("삭제할 시간이 없습니다.");
+        }
+    }
+}
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 22bcb798c..ec61ec1c6 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -8,15 +8,11 @@
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.test.annotation.DirtiesContext;
 import roomescape.controller.ReservationController;
-import roomescape.model.Reservation;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 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 static org.hamcrest.Matchers.is;