dao 사용

Author: jeonseohee9

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

@@ -8,6 +8,7 @@
 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.PutMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseStatus;
@@ -46,4 +47,10 @@ public void delete(@PathVariable int id) {
         reservationService.delete(id);
     }
 
+    @PutMapping("/{id}")
+    @ResponseStatus(HttpStatus.OK)
+    public void update(@PathVariable int id, @RequestBody Reservation reservation) {
+        Reservation updated = new Reservation(id, reservation.getName(), reservation.getDate(), reservation.getTime());
+        reservationService.update(updated);
+    }
 }

src/main/java/roomescape/dao/ReservationDAO.java

@@ -26,7 +26,7 @@ public Reservation addReservation(final Reservation reservation) {
                 reservation.getDate().toString(),
                 reservation.getTime().toString());
 
-        final var fetchSql = "SELECT * FROM reservation ORDER BY id DESC LIMIT 1";
+        final var fetchSql = "SELECT * FROM reservation ORDER BY id DESC LIMIT 1"; //방금추가한 최근꺼 다시 반환해줌 -> 이걸로 테스트 확인
         return jdbcTemplate.queryForObject(fetchSql, reservationRowMapper);
     }
 
@@ -36,14 +36,23 @@ public Optional<Reservation> findByID(final int id) {
         return results.stream().findFirst();
     }
 
+    public List<Reservation> findAll() {
+        final var query = "SELECT * FROM reservation";
+        return jdbcTemplate.query(query, reservationRowMapper);
+    }
+
     public void deleteReservation(final int id) {
         final var query = "DELETE FROM reservation WHERE id = ?";
         jdbcTemplate.update(query, id);
     }
 
-    public List<Reservation> findAll() {
-        final var query = "SELECT * FROM reservation";
-        return jdbcTemplate.query(query, reservationRowMapper);
+    public void updateReservation(final Reservation reservation) {
+        final var query = "UPDATE reservation SET name = ?, date = ?, time = ? WHERE id = ?";
+        jdbcTemplate.update(query,
+                reservation.getName(),
+                reservation.getDate().toString(),
+                reservation.getTime().toString(),
+                reservation.getId());
     }
 
     private final RowMapper<Reservation> reservationRowMapper = (resultSet, rowNum) -> new Reservation(

src/main/java/roomescape/service/ReservationService.java

@@ -4,25 +4,23 @@
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
 import org.springframework.stereotype.Service;
+import roomescape.dao.ReservationDAO;
 import roomescape.domain.Reservation;
 import roomescape.exception.InvalidReservationException;
 import roomescape.exception.NotFoundReservationException;
 
 @Service
 public class ReservationService {
 
-    private final List<Reservation> reservations = new ArrayList<>();
+    private final ReservationDAO reservationDAO;
     private final AtomicLong index = new AtomicLong(1);
 
-    public Reservation add(Reservation reservation) {
-        Reservation newReservation = new Reservation(
-                (int) index.getAndIncrement(),
-                reservation.getName(),
-                reservation.getDate(),
-                reservation.getTime()
-        );
+    public ReservationService(ReservationDAO reservationDAO) {
+        this.reservationDAO = reservationDAO;
+    }
 
-        boolean isDuplicate = reservations.stream().anyMatch(r ->
+    public Reservation add(Reservation reservation) {
+        boolean isDuplicate = reservationDAO.findAll().stream().anyMatch(r ->
                 r.getName().equals(reservation.getName()) &&
                         r.getDate().equals(reservation.getDate()) &&
                         r.getTime().equals(reservation.getTime())
@@ -31,18 +29,26 @@ public Reservation add(Reservation reservation) {
             throw new InvalidReservationException("동일한 예약이 이미 존재합니다.");
         }
 
-        reservations.add(newReservation);
-        return newReservation;
+        return reservationDAO.addReservation(reservation);
     }
 
     public List<Reservation> findAll() {
-        return reservations;
+        return reservationDAO.findAll();
     }
 
     public void delete(int id) {
-        boolean removed = reservations.removeIf(r -> r.getId() == id);
-        if (!removed) {
+        boolean exists = reservationDAO.findByID(id).isPresent();
+        if (!exists) {
+            throw new NotFoundReservationException("해당 ID가 없습니다.");
+        }
+        reservationDAO.deleteReservation(id);
+    }
+
+    public void update(Reservation reservation) {
+        boolean exists = reservationDAO.findByID(reservation.getId()).isPresent();
+        if (!exists) {
             throw new NotFoundReservationException("해당 ID가 없습니다.");
         }
+        reservationDAO.updateReservation(reservation);
     }
 }

src/test/java/roomescape/DAOTest.java

@@ -17,7 +17,7 @@
 import roomescape.dao.ReservationDAO;
 import roomescape.domain.Reservation;
 
-@SpringBootTest
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
 public class DAOTest {
 
     @Autowired
@@ -43,9 +43,10 @@ void findReservation() {
         Reservation reservation = new Reservation(1, "전서희", LocalDate.parse("2026-05-12"), LocalTime.parse("19:00"));
         reservationDAO.addReservation(reservation);
 
-        Optional<Reservation> found = reservationDAO.findByID(1);
+        Reservation saved = reservationDAO.addReservation(reservation);
+        Optional<Reservation> found = reservationDAO.findByID(saved.getId());
         assertThat(found).isPresent();
-        assertThat(found.get()).isEqualTo(reservation);
+        assertThat(found.get()).isEqualTo(saved);
     }
 
     @Test
@@ -58,6 +59,22 @@ void deleteReservation() {
         assertThat(result).isEmpty();
     }
 
+    @Test
+    void updateReservation() {
+        LocalDate date = LocalDate.now().plusDays(1);
+        Reservation original = new Reservation(null, "전서희", date, LocalTime.of(19, 0));
+        Reservation saved = reservationDAO.addReservation(original);
+
+        Reservation updated = new Reservation(saved.getId(), "서희전", date.plusDays(1), LocalTime.of(14, 0));
+        reservationDAO.updateReservation(updated);
+
+        Optional<Reservation> result = reservationDAO.findByID(saved.getId());
+        assertThat(result).isPresent();
+        assertThat(result.get().getName()).isEqualTo("서희전");
+        assertThat(result.get().getDate()).isEqualTo(date.plusDays(1));
+        assertThat(result.get().getTime()).isEqualTo(LocalTime.of(14, 0));
+    }
+
     @Test
     void 오단계() {
         try (Connection connection = jdbcTemplate.getDataSource().getConnection()) {
@@ -71,7 +88,9 @@ void deleteReservation() {
 
     @Test
     void 육단계() {
-        jdbcTemplate.update("INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)", "브라운", "2023-08-05", "15:40");
+        LocalDate tomorrow = LocalDate.now().plusDays(1);
+
+        jdbcTemplate.update("INSERT INTO reservation (name, date, time) VALUES (?, ?, ?)", "브라운", tomorrow.toString(), "15:40");
 
         List<Reservation> reservations = RestAssured.given().log().all()
                 .when().get("/reservations")