feat: 7단계 - 데이터 추가/삭제하기

- 예약 추가/취소 API 처리 로직에서 데이터베이스를 활용하도록 수정

Author: haeyoon1

build.gradle

@@ -19,6 +19,9 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter-web'
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+
+    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    runtimeOnly 'com.h2database:h2'
 }
 
 test {

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

@@ -11,6 +11,7 @@
 import roomescape.dto.Reservation;
 import roomescape.exception.InvalidValueException;
 import roomescape.exception.NotFoundReservationException;
+import roomescape.repository.ReservationRepository;
 
 import java.net.URI;
 import java.util.ArrayList;
@@ -20,14 +21,11 @@
 @Controller
 public class ReservationController {
 
-    private List<Reservation> reservations = new ArrayList<>();
-    private AtomicLong index = new AtomicLong(1);
-// 이단계
-//    public ReservationController() {
-//        reservations.add(new Reservation(1L, "브라운1", "2023-01-01", "10:00"));
-//        reservations.add(new Reservation(2L, "브라운2", "2023-01-02", "11:00"));
-//        reservations.add(new Reservation(3L, "브라운3", "2023-01-03", "12:00"));
-//    }
+    private final ReservationRepository reservationRepository;
+
+    public ReservationController(ReservationRepository repository) {
+        this.reservationRepository = repository;
+    }
 
     // 홈화면
     @GetMapping("/reservation")
@@ -39,7 +37,7 @@ public String reservationPage() {
     @ResponseBody
     @GetMapping("/reservations")
     public List<Reservation> list() {
-        return reservations;
+        return reservationRepository.findAll();
     }
 
     //예약 추가
@@ -52,8 +50,7 @@ public ResponseEntity<Reservation> create(@RequestBody Reservation newReservatio
             throw new InvalidValueException("예약 추가에 필요한 인자값이 비어있습니다.");
         }
 
-        Reservation reservation = new Reservation(index.getAndIncrement(), newReservation.getName(), newReservation.getDate(), newReservation.getTime());
-        reservations.add(reservation);
+        Reservation reservation = reservationRepository.insert(newReservation);
 
         return ResponseEntity.created(URI.create("/reservations/" + reservation.getId()))
                 .body(reservation);
@@ -62,12 +59,10 @@ public ResponseEntity<Reservation> create(@RequestBody Reservation newReservatio
     //예약 삭제
     @DeleteMapping("/reservations/{id}")
     public ResponseEntity<Void> delete(@PathVariable Long id) {
-        Reservation reservation = reservations.stream()
-                .filter(it -> it.getId().equals(id))
-                .findFirst()
-                .orElseThrow(() -> new NotFoundReservationException("예약을 찾을 수 없습니다."));
+// 수정예정       Reservation reservation = reservationRepository.fin
+//                .orElseThrow(() -> new NotFoundReservationException("예약을 찾을 수 없습니다."));
 
-        reservations.remove(reservation);
+        reservationRepository.delete(id);
         return ResponseEntity.noContent().build();
     }
 }

src/main/java/roomescape/repository/ReservationRepository.java

@@ -0,0 +1,54 @@
+package roomescape.repository;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.stereotype.Repository;
+import roomescape.dto.Reservation;
+
+import java.util.List;
+
+@Repository
+public class ReservationRepository {
+
+    private final JdbcTemplate jdbcTemplate;
+
+    public ReservationRepository(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    //예약 조회
+    public List<Reservation> findAll() {
+        String sql = "SELECT id, name, date, time FROM reservation";
+
+        return jdbcTemplate.query(
+                sql, (resultSet, rowNum) -> new Reservation(
+                        resultSet.getLong("id"),
+                        resultSet.getString("name"),
+                        resultSet.getString("date"),
+                        resultSet.getString("time")
+                ));
+    }
+
+    //예약 추가
+    public Reservation insert(Reservation reservation) {
+        try {
+            String sql = "INSERT INTO reservation(name, date, time) VALUES (?, ?, ?)";
+            jdbcTemplate.update(sql, reservation.getName(), reservation.getDate(), reservation.getTime());
+
+            String query = "SELECT id FROM reservation ORDER BY id DESC LIMIT 1";
+            Long id = jdbcTemplate.queryForObject(query, Long.class);
+
+            return new Reservation(id, reservation.getName(), reservation.getDate(), reservation.getTime());
+        } catch (Exception ex) {
+            throw new RuntimeException("오류가 발생하였습니다.");
+        }
+    }
+
+    //예약 삭제
+    public ResponseEntity<Object> delete(Long id) {
+        String sql = "DELETE FROM reservation WHERE id = ?";
+        jdbcTemplate.update(sql, Long.valueOf(id));
+        return ResponseEntity.noContent().build();
+    }
+}
+

src/main/resources/application.properties

@@ -1 +1,4 @@
 server.port=8080
+spring.h2.console.enabled=true
+spring.h2.console.path=/h2-console
+spring.datasource.url=jdbc:h2:mem:database

src/main/resources/schema.sql

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

src/test/java/roomescape/MissionStepTest.java

@@ -92,4 +92,6 @@ public class MissionStepTest {
                 .then().log().all()
                 .statusCode(400);
     }
+
+
 }

src/test/java/roomescape/MissionStepTest2.java

@@ -0,0 +1,80 @@
+package roomescape;
+
+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.jdbc.core.JdbcTemplate;
+import org.springframework.test.annotation.DirtiesContext;
+import roomescape.dto.Reservation;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static org.assertj.core.api.AssertionsForClassTypes.assertThat;
+import static org.hamcrest.Matchers.is;
+
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
+@DirtiesContext(classMode = DirtiesContext.ClassMode.BEFORE_EACH_TEST_METHOD)
+public class MissionStepTest2 {
+
+    @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);
+    }
+}