[Spring Core] 김서현 미션 제출합니다.

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;
     }
 }

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);

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);
 

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;
     }
 

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;
+//    }
+
+}

src/main/java/roomescape/TimeController.java

@@ -0,0 +1,54 @@
+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("/time")
+    public void time () {
+
+    }
+    @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." );
+        }
+    }
+}
+
+

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);
+    }
+}

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;
+    }
+}

src/main/resources/schema.sql

@@ -1,8 +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 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)
+    );