From c2655f262a286cdec991e373766ef919e3152812 Mon Sep 17 00:00:00 2001
From: seobbang <seobbangway@naver.com>
Date: Thu, 30 May 2024 16:13:13 +0900
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20step=208=20-=20=EC=8B=9C=EA=B0=84?=
 =?UTF-8?q?=20=EA=B4=80=EB=A6=AC=20=EA=B8=B0=EB=8A=A5=20=EA=B5=AC=ED=98=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/roomescape/Time.java            | 29 ++++++++++
 src/main/java/roomescape/TimeController.java  | 50 +++++++++++++++++
 src/main/java/roomescape/TimeQueryingDAO.java | 53 +++++++++++++++++++
 src/main/java/roomescape/TimeRequestDto.java  | 17 ++++++
 src/main/resources/schema.sql                 |  7 +++
 src/test/java/roomescape/MissionStepTest.java | 25 +++++++++
 6 files changed, 181 insertions(+)
 create mode 100644 src/main/java/roomescape/Time.java
 create mode 100644 src/main/java/roomescape/TimeController.java
 create mode 100644 src/main/java/roomescape/TimeQueryingDAO.java
 create mode 100644 src/main/java/roomescape/TimeRequestDto.java

diff --git a/src/main/java/roomescape/Time.java b/src/main/java/roomescape/Time.java
new file mode 100644
index 000000000..6e1095ccd
--- /dev/null
+++ b/src/main/java/roomescape/Time.java
@@ -0,0 +1,29 @@
+package roomescape;
+
+
+public class Time {
+    private long id;
+//    @NotBlank(message = "시간은 필수 입력 값입니다.")
+    private String time;
+
+    public Time(long id, String time) {
+        this.id = id;
+        this.time = time;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    //    public Time(long id, String name, String date, String time) {
+//        this.id = id;
+//        this.name = name;
+//        this.date = date;
+//        this.time = time;
+//    }
+
+}
diff --git a/src/main/java/roomescape/TimeController.java b/src/main/java/roomescape/TimeController.java
new file mode 100644
index 000000000..ac995ed27
--- /dev/null
+++ b/src/main/java/roomescape/TimeController.java
@@ -0,0 +1,50 @@
+package roomescape;
+
+import org.slf4j.ILoggerFactory;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.net.URI;
+import java.util.List;
+
+@Controller
+public class TimeController {
+    private TimeQueryingDAO queryingDAO;
+    public TimeController(TimeQueryingDAO queryingDAO) {
+        this.queryingDAO = queryingDAO;
+    }
+
+    @GetMapping("/times")
+    public ResponseEntity<List<Time>> read() {
+        return ResponseEntity.ok(queryingDAO.getTimes());
+    }
+
+    @PostMapping("/times")
+    public ResponseEntity<ResponseDto> create (@RequestBody TimeRequestDto request) {
+
+        String time = request.getTime();
+        long id = queryingDAO.createTime(time);
+
+        URI location = URI.create("/times/" + id);
+        Time newTime = new Time(id, time);
+
+        ResponseDto response = new ResponseDto(HttpStatus.CREATED.value(), "시간이 성공적으로 추가되었습니다.", newTime);
+        return ResponseEntity.created(location).body(response);
+    }
+
+    @DeleteMapping("/times/{id}")
+    public ResponseEntity<Void> delete (@PathVariable Long id) {
+        int rowsAffected = queryingDAO.deleteTimeById(id);
+
+        if(rowsAffected > 0){
+            return new ResponseEntity<>(HttpStatus.NO_CONTENT);
+        }else {
+            throw new NotFoundReservationException("Time with id " + id + " not found." );
+        }
+    }
+}
+
+
diff --git a/src/main/java/roomescape/TimeQueryingDAO.java b/src/main/java/roomescape/TimeQueryingDAO.java
new file mode 100644
index 000000000..a781c8f38
--- /dev/null
+++ b/src/main/java/roomescape/TimeQueryingDAO.java
@@ -0,0 +1,53 @@
+package roomescape;
+
+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 java.sql.PreparedStatement;
+import java.sql.Statement;
+import java.util.List;
+
+@Repository
+public class TimeQueryingDAO {
+    private JdbcTemplate jdbcTemplate;
+    private final RowMapper<Time> actorRowMapper = (resultSet, rowNum) -> {
+        Time time = new Time(
+                resultSet.getLong("id"),
+                resultSet.getString("time")
+        );
+        return time;
+    };
+    public TimeQueryingDAO(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    public List<Time> getTimes() {
+        String sql = "SELECT id, time FROM time";
+        return jdbcTemplate.query(sql, actorRowMapper);
+    }
+    public long createTime(String time) {
+        String sql = "INSERT INTO time (time) VALUES (?)";
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+            ps.setString(1, time);
+            return ps;
+        }, keyHolder);
+
+        return keyHolder.getKey().longValue();
+    }
+
+    /**
+     *
+     * @param id
+     * @return delete된 id값
+     */
+
+    public int deleteTimeById(long id) {
+        String sql = "DELETE FROM time WHERE id = ?";
+        return jdbcTemplate.update(sql, id);
+    }
+}
diff --git a/src/main/java/roomescape/TimeRequestDto.java b/src/main/java/roomescape/TimeRequestDto.java
new file mode 100644
index 000000000..5b525e203
--- /dev/null
+++ b/src/main/java/roomescape/TimeRequestDto.java
@@ -0,0 +1,17 @@
+package roomescape;
+
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import org.thymeleaf.util.StringUtils;
+
+public class TimeRequestDto {
+    private String time;
+    @JsonCreator
+    public TimeRequestDto(@JsonProperty("time") String time) {
+        this.time = time;
+    }
+
+    public String getTime() {
+        return time;
+    }
+}
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index f5ef3d5f5..59ca829e5 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -5,4 +5,11 @@ CREATE TABLE reservation
     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)
 );
\ No newline at end of file
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index d94a81afc..8e32f203c 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -154,4 +154,29 @@ void CREATE_AND_DELETE_RESERVATION() {
         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 4075a7c321ca7a1ea0216a55259bb6b5748d513a Mon Sep 17 00:00:00 2001
From: seobbang <seobbangway@naver.com>
Date: Thu, 30 May 2024 16:44:20 +0900
Subject: [PATCH 2/3] =?UTF-8?q?feat:=20step=209=20-=20=EA=B8=B0=EC=A1=B4?=
 =?UTF-8?q?=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

---
 src/main/java/roomescape/Reservation.java     |  6 +-
 .../roomescape/ReservationController.java     |  7 +-
 .../roomescape/ReservationQueryingDAO.java    | 17 ++--
 .../roomescape/ReservationRequestDto.java     | 12 +--
 src/main/resources/schema.sql                 | 19 ++---
 src/test/java/roomescape/MissionStepTest.java | 79 ++++++++++++++-----
 6 files changed, 91 insertions(+), 49 deletions(-)

diff --git a/src/main/java/roomescape/Reservation.java b/src/main/java/roomescape/Reservation.java
index 309ce1189..dfff836dc 100644
--- a/src/main/java/roomescape/Reservation.java
+++ b/src/main/java/roomescape/Reservation.java
@@ -10,9 +10,9 @@ public class Reservation {
     @NotBlank(message = "날짜는 필수 입력 값입니다.")
     private String date;
     @NotBlank(message = "시간은 필수 입력 값입니다.")
-    private String time;
+    private Time time;
 
-    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;
@@ -31,7 +31,7 @@ public String getName() {
         return name;
     }
 
-    public String getTime() {
+    public Time getTime() {
         return time;
     }
 }
diff --git a/src/main/java/roomescape/ReservationController.java b/src/main/java/roomescape/ReservationController.java
index d9674ca11..91ea3ff6c 100644
--- a/src/main/java/roomescape/ReservationController.java
+++ b/src/main/java/roomescape/ReservationController.java
@@ -18,7 +18,7 @@ public ReservationController(ReservationQueryingDAO queryingDAO) {
         this.queryingDAO = queryingDAO;
     }
 
-    @GetMapping("/reservation")
+    @GetMapping("/new-reservation")
     public void reservation () {
     }
 
@@ -34,13 +34,12 @@ public ResponseEntity<List<Reservation>> read() {
     public ResponseEntity<ResponseDto> create (@RequestBody ReservationRequestDto request) {
         String name = request.getName();
         String date = request.getDate();
-        String time = request.getTime();
-
+        Long time = request.getTime();
 
         long id = queryingDAO.createReservation(name, date, time);
 
         URI location = URI.create("/reservations/" + id);
-        Reservation newReservation = new Reservation(id, name, date, time);
+        ReservationRequestDto newReservation = new ReservationRequestDto(id, name, date, time);
 
         ResponseDto response = new ResponseDto(HttpStatus.CREATED.value(), "예약이 성공적으로 추가되었습니다.", newReservation);
         return ResponseEntity.created(location).body(response);
diff --git a/src/main/java/roomescape/ReservationQueryingDAO.java b/src/main/java/roomescape/ReservationQueryingDAO.java
index 259dcda00..fc07c9979 100644
--- a/src/main/java/roomescape/ReservationQueryingDAO.java
+++ b/src/main/java/roomescape/ReservationQueryingDAO.java
@@ -15,11 +15,16 @@ public class ReservationQueryingDAO {
     private JdbcTemplate jdbcTemplate;
 
     private final RowMapper<Reservation> actorRowMapper = (resultSet, rowNum) -> {
+        Time time = new Time(
+                resultSet.getLong("time_id"),
+                resultSet.getString("time_value")
+        );
+
         Reservation reservation = new Reservation(
-                resultSet.getLong("id"),
+                resultSet.getLong("reservation_id"),
                 resultSet.getString("name"),
                 resultSet.getString("date"),
-                resultSet.getString("time")
+                time
         );
         return reservation;
     };
@@ -30,18 +35,18 @@ public ReservationQueryingDAO(JdbcTemplate jdbcTemplate) {
 
 
     public List<Reservation> getReservations() {
-        String sql = "SELECT id, name, date, time FROM reservation";
+        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, actorRowMapper);
     }
 
-    public long createReservation(String name, String date, String time) {
-        String sql = "INSERT INTO reservation(name, date, time) VALUES (?, ?, ?)";
+    public long createReservation(String name, String date, Long time) {
+        String sql = "INSERT INTO reservation(name, date, time_id) VALUES (?, ?, ?)";
         KeyHolder keyHolder = new GeneratedKeyHolder();
         jdbcTemplate.update(connection -> {
             PreparedStatement ps = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
             ps.setString(1, name);
             ps.setString(2, date);
-            ps.setString(3, time);
+            ps.setObject(3, time);
             return ps;
         }, keyHolder);
 
diff --git a/src/main/java/roomescape/ReservationRequestDto.java b/src/main/java/roomescape/ReservationRequestDto.java
index caae45799..4e9977a02 100644
--- a/src/main/java/roomescape/ReservationRequestDto.java
+++ b/src/main/java/roomescape/ReservationRequestDto.java
@@ -3,26 +3,26 @@
 import org.thymeleaf.util.StringUtils;
 
 public class ReservationRequestDto {
+    private Long id;
     private String name;
     private String date;
-    private String time;
+    private Long time;
 
-    public ReservationRequestDto(String name, String date, String time) {
+    public ReservationRequestDto(Long id, String name, String date, Long time) {
         if (StringUtils.isEmpty(name)) {
             throw new BadRequestCreateReservationException("The 'name' field is missing.");
         }
         if (StringUtils.isEmpty(date)) {
             throw new BadRequestCreateReservationException("The 'date' field is missing.");
         }
-        if (StringUtils.isEmpty(time)) {
-            throw new BadRequestCreateReservationException("The 'time' field is missing.");
-        }
+        this.id = id;
         this.name = name;
         this.date = date;
         this.time = time;
     }
+    public Long getId() {return id;}
 
-    public String getTime() {
+    public Long getTime() {
         return time;
     }
 
diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 59ca829e5..bb886084e 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -1,15 +1,16 @@
-CREATE TABLE reservation
+CREATE TABLE time
 (
-    id      BIGINT       NOT NULL AUTO_INCREMENT,
-    name    VARCHAR(255) NOT NULL,
-    date    VARCHAR(255) NOT NULL,
-    time    VARCHAR(255) NOT NULL,
+    id   BIGINT       NOT NULL AUTO_INCREMENT,
+    time VARCHAR(255) NOT NULL,
     PRIMARY KEY (id)
 );
 
-CREATE TABLE time
+CREATE TABLE reservation
 (
     id   BIGINT       NOT NULL AUTO_INCREMENT,
-    time VARCHAR(255) NOT NULL,
-    PRIMARY KEY (id)
-);
\ No newline at end of file
+    name VARCHAR(255) NOT NULL,
+    date VARCHAR(255) NOT NULL,
+    time_id BIGINT,
+    PRIMARY KEY (id),
+    FOREIGN KEY (time_id) REFERENCES time(id)
+    );
\ No newline at end of file
diff --git a/src/test/java/roomescape/MissionStepTest.java b/src/test/java/roomescape/MissionStepTest.java
index 8e32f203c..6d93c4e39 100644
--- a/src/test/java/roomescape/MissionStepTest.java
+++ b/src/test/java/roomescape/MissionStepTest.java
@@ -2,25 +2,29 @@
 
 import io.restassured.RestAssured;
 import io.restassured.http.ContentType;
-import org.junit.jupiter.api.Test;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.test.annotation.DirtiesContext;
-import org.springframework.jdbc.core.JdbcTemplate;
-
+import io.restassured.response.Response;
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.assertj.core.api.Assertions;
+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;
 
-import static org.hamcrest.Matchers.*;
 @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()
@@ -28,7 +32,6 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(200);
     }
-
     @Test
     void 이단계() {
         RestAssured.given().log().all()
@@ -40,15 +43,22 @@ public class MissionStepTest {
                 .when().get("/reservations")
                 .then().log().all()
                 .statusCode(200)
-                .body("size()",is(0)); // 아직 생성 요청이 없으니 Controller에서 임의로 넣어준 Reservation 갯수 만큼 검증하거나 0개임을 확인하세요
+                .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", "15:40");
+        params.put("time", locations[1]);
 
         RestAssured.given().log().all()
                 .contentType(ContentType.JSON)
@@ -99,11 +109,8 @@ public class MissionStepTest {
                 .statusCode(400);
     }
 
-    @Autowired
-    private JdbcTemplate jdbcTemplate;
-
     @Test
-    void CHECK_DATABASE_CONNECTION() {
+    void 오단계() {
         try (Connection connection = jdbcTemplate.getDataSource().getConnection()) {
             assertThat(connection).isNotNull();
             assertThat(connection.getCatalog()).isEqualTo("DATABASE");
@@ -114,26 +121,40 @@ void CHECK_DATABASE_CONNECTION() {
     }
 
     @Test
-    void GET_RESERVATION() {
-        jdbcTemplate.update("INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)", "브라운", "2023-08-05", "15:40");
+    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]);
 
-        List<Reservation> reservations = RestAssured.given().log().all()
+        int size = RestAssured.given().log().all()
                 .when().get("/reservations")
                 .then().log().all()
                 .statusCode(200).extract()
-                .jsonPath().getList(".", Reservation.class);
+                .jsonPath().getList(".").size();
 
         Integer count = jdbcTemplate.queryForObject("SELECT count(1) from reservation", Integer.class);
 
-        assertThat(reservations.size()).isEqualTo(count);
+        assertThat(size).isEqualTo(count);
     }
 
     @Test
-    void CREATE_AND_DELETE_RESERVATION() {
+    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", "10:00");
+        params.put("time", locations[1]);
 
         RestAssured.given().log().all()
                 .contentType(ContentType.JSON)
@@ -179,4 +200,20 @@ void CREATE_AND_DELETE_RESERVATION() {
                 .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 cec762ccece905d8644f58c334f7b864bbe3a46a Mon Sep 17 00:00:00 2001
From: seobbang <seobbangway@naver.com>
Date: Thu, 30 May 2024 16:53:33 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=C3=AC=C2=98feat:=20time.html=20=EC=97=B0?=
 =?UTF-8?q?=EA=B2=B0=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/src/main/java/roomescape/TimeController.java b/src/main/java/roomescape/TimeController.java
index ac995ed27..d931978eb 100644
--- a/src/main/java/roomescape/TimeController.java
+++ b/src/main/java/roomescape/TimeController.java
@@ -13,10 +13,14 @@
 @Controller
 public class TimeController {
     private TimeQueryingDAO queryingDAO;
+
     public TimeController(TimeQueryingDAO queryingDAO) {
         this.queryingDAO = queryingDAO;
     }
+    @GetMapping("/time")
+    public void time () {
 
+    }
     @GetMapping("/times")
     public ResponseEntity<List<Time>> read() {
         return ResponseEntity.ok(queryingDAO.getTimes());