[Spring Core] 신지훈 미션 제출합니다.

src/main/java/roomescape/controller/CustomerController.java

@@ -25,7 +25,7 @@ public ResponseEntity<Void> save(@RequestBody Customer customer) {
         return ResponseEntity.ok().build();
     }
 
-    @GetMapping("/customers") // -> customers 라는 파일(경로)을 만든 적이 없는데 코드가 돌아가긴 함..
+    @GetMapping("/customers")
     public ResponseEntity<List<Customer>> list() {
         String sql = "select id, first_name, last_name from customers";
         List<Customer> customers = jdbcTemplate.query(

src/main/java/roomescape/controller/HomeController.java

@@ -10,4 +10,9 @@ public class HomeController {
     public String home() {
         return "home";
     }
+
+    @GetMapping("/time")
+    public String time() {
+        return "time";
+    }
 }

src/main/java/roomescape/controller/ReservationController.java

@@ -4,24 +4,24 @@
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
-import roomescape.model.Reservation;
-import roomescape.model.ReservationRequest;
-import roomescape.model.ReservationService;
+import roomescape.model.reservation.Reservation;
+import roomescape.model.reservation.ReservationDTO;
+import roomescape.model.reservation.ReservationService;
 
 import java.util.List;
 
 @Controller
 public class ReservationController {
 
-    private ReservationService reservationService;
+    private final ReservationService reservationService;
 
     public ReservationController(ReservationService reservationService) {
         this.reservationService = reservationService;
     }
 
     @GetMapping("/reservation")
     public String reservationPage() {
-        return "reservation";
+        return "new-reservation";
     }
 
     @GetMapping("/reservations")
@@ -31,9 +31,9 @@ public List<Reservation> getReservations() {
     }
 
     @PostMapping("/reservations")
-    public ResponseEntity<Reservation> addReservation(@RequestBody ReservationRequest reservationRequest) {
-        Reservation reservation = reservationService.addReservation(reservationRequest);
-        return ResponseEntity.status(HttpStatus.CREATED) // status: 201
+    public ResponseEntity<Reservation> addReservation(@RequestBody ReservationDTO reservationDTO) {
+        Reservation reservation = reservationService.addReservation(reservationDTO);
+        return ResponseEntity.status(HttpStatus.CREATED)
                 .header("Location", "/reservations/" + reservation.getId())
                 .body(reservation);
     }

src/main/java/roomescape/controller/TimeController.java

@@ -0,0 +1,41 @@
+package roomescape.controller;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+import roomescape.model.time.Time;
+import roomescape.model.time.TimeDTO;
+import roomescape.model.time.TimeService;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/times")
+public class TimeController {
+
+    private final TimeService timeService;
+
+    public TimeController(TimeService timeService) {
+        this.timeService = timeService;
+    }
+
+    @GetMapping
+    @ResponseBody
+    public List<Time> getTimes() {
+        return timeService.getAllTimes();
+    }
+
+    @PostMapping
+    public ResponseEntity<Time> addTime(@RequestBody TimeDTO timeDTO) {
+        Time time = timeService.addTime(timeDTO);
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .header("Location", "/times/" + time.getId())
+                .body(time);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteTime(@PathVariable Long id) {
+        timeService.deleteTime(id);
+        return ResponseEntity.noContent().build();
+    }
+}

src/main/java/roomescape/exception/NotFoundTimeException.java

@@ -0,0 +1,7 @@
+package roomescape.exception;
+
+public class NotFoundTimeException extends RuntimeException {
+    public NotFoundTimeException(String message) {
+        super(message);
+    }
+}

src/main/java/roomescape/model/Reservation.java → src/main/java/roomescape/model/reservation/Reservation.java

@@ -1,13 +1,15 @@
-package roomescape.model;
+package roomescape.model.reservation;
+
+import roomescape.model.time.Time;
 
 public class Reservation {
 
     private Long id;
     private String name;
     private String date;
-    private String time;
+    private Time time;
 
-    public Reservation(String name, String date, String time) {
+    public Reservation(String name, String date, Time time) {
         this.name = name;
         this.date = date;
         this.time = time;
@@ -25,11 +27,19 @@ public String getName() {
         return name;
     }
 
+    public void setName(String name) {
+        this.name = name;
+    }
+
     public String getDate() {
         return date;
     }
 
-    public String getTime() {
+    public Time getTime() {
         return time;
     }
+
+    public void setTime(Time time) {
+        this.time = time;
+    }
 }

src/main/java/roomescape/model/reservation/ReservationDAO.java

@@ -0,0 +1,33 @@
+package roomescape.model.reservation;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public class ReservationDAO {
+    private final JdbcTemplate jdbcTemplate;
+
+    public ReservationDAO(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = 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, new ReservationRowMapper());
+    }
+
+    public int deleteById(Long id) {
+        String sql = "DELETE FROM reservation WHERE id = ?";
+        return jdbcTemplate.update(sql, id);
+    }
+}

src/main/java/roomescape/model/reservation/ReservationDTO.java

@@ -0,0 +1,29 @@
+package roomescape.model.reservation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+public class ReservationDTO {
+    private String name;
+    private String date;
+
+    @JsonProperty("time")
+    private Long timeId;
+
+    public ReservationDTO(String name, String date, Long timeId) {
+        this.name = name;
+        this.date = date;
+        this.timeId = timeId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public Long getTimeId() {
+        return timeId;
+    }
+}

src/main/java/roomescape/model/reservation/ReservationRowMapper.java

@@ -0,0 +1,25 @@
+package roomescape.model.reservation;
+
+import org.springframework.jdbc.core.RowMapper;
+import roomescape.model.time.Time;
+
+import java.sql.ResultSet;
+import java.sql.SQLException;
+
+public class ReservationRowMapper implements RowMapper<Reservation> {
+    @Override
+    public Reservation mapRow(ResultSet rs, int rowNum) throws SQLException {
+
+        String timeValue = rs.getString("time_value");
+
+        Time time = new Time(timeValue);
+
+        Reservation reservation = new Reservation(
+                rs.getString("name"),
+                rs.getString("date"),
+                time
+        );
+        reservation.setId(rs.getLong("reservation_id"));
+        return reservation;
+    }
+}

src/main/java/roomescape/model/ReservationService.java → src/main/java/roomescape/model/reservation/ReservationService.java

@@ -1,48 +1,57 @@
-package roomescape.model;
+package roomescape.model.reservation;
 
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.jdbc.support.GeneratedKeyHolder;
 import org.springframework.jdbc.support.KeyHolder;
 import org.springframework.stereotype.Service;
 import roomescape.exception.InvalidReservationParameterException;
 import roomescape.exception.NotFoundReservationException;
+import roomescape.model.time.Time;
+import roomescape.model.time.TimeService;
 
 import java.sql.PreparedStatement;
 import java.util.List;
 
 @Service
 public class ReservationService {
     private final JdbcTemplate jdbcTemplate;
-    private final ReservationRepository reservationRepository;
+    private final ReservationDAO reservationDAO;
+    private final TimeService timeService;
 
-    @Autowired
-    public ReservationService(JdbcTemplate jdbcTemplate, ReservationRepository reservationRepository) {
+    public ReservationService(JdbcTemplate jdbcTemplate, ReservationDAO reservationDAO, TimeService timeService) {
         this.jdbcTemplate = jdbcTemplate;
-        this.reservationRepository = reservationRepository;
+        this.reservationDAO = reservationDAO;
+        this.timeService = timeService;
     }
 
     public List<Reservation> getAllReservations() {
-        return reservationRepository.findAll();
+        return reservationDAO.findAll();
     }
 
-    public Reservation addReservation(ReservationRequest reservationRequest) {
-        if (reservationRequest.getName() == null || reservationRequest.getName().isEmpty() ||
-                reservationRequest.getDate() == null || reservationRequest.getDate().isEmpty() ||
-                reservationRequest.getTime() == null || reservationRequest.getTime().isEmpty()) {
+    public Reservation addReservation(ReservationDTO reservationDTO) {
+        if (reservationDTO.getName() == null || reservationDTO.getName().isEmpty() ||
+                reservationDTO.getDate() == null || reservationDTO.getDate().isEmpty() ||
+                reservationDTO.getTimeId() == null) {
             throw new InvalidReservationParameterException("예약 내용에 누락된 부분이 있습니다.");
         }
 
-        Reservation reservation = new Reservation(reservationRequest.getName(), reservationRequest.getDate(),reservationRequest.getTime());
+        Long timeId = reservationDTO.getTimeId();
+        Time time = timeService.findTimeById(timeId);
 
-        String sql = "INSERT INTO reservation (name,date,time) VALUES (?,?,?)";
+        Reservation reservation = new Reservation(
+                reservationDTO.getName(),
+                reservationDTO.getDate(),
+                time
+        );
+
+        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, reservation.getName());
             ps.setString(2, reservation.getDate());
-            ps.setString(3, reservation.getTime());
+            ps.setLong(3, time.getId());
             return ps;
         }, keyHolder);
 
@@ -54,9 +63,9 @@ public Reservation addReservation(ReservationRequest reservationRequest) {
     }
 
     public void deleteReservation(Long id) {
-        int rowAffected = reservationRepository.deleteById(id);
+        int rowAffected = reservationDAO.deleteById(id);
         if (rowAffected == 0) {
-            throw new NotFoundReservationException("삭제하려는 예약이 없습니다.");
+            throw new NotFoundReservationException("삭제하려는 예약이 존재하지 않습니다.");
         }
     }
 }