[Spring Core] 정다영 미션 제출합니다.

README.md

@@ -0,0 +1,24 @@
+# Spring JDBC 
+
+<h3>5단계 요구사항</h3>
+
+h2 데이터베이스를 활용하여 데이터를 저장하도록 수정
+- [x] gradle 의존성 추가
+- [x] 테이블 스키마 정의
+- [x] 데이터베이스 설정
+- [x] 요구 사항 테스트 진행
+
+<h3>6단계 요구사항</h3>
+
+예약 조회 API 처리 로직에서 저장된 예약을 조회할 때 데이터베이스를 활용하도록 수정
+- [x] 데이터를 조회하는 기능을 구현
+  - SQL - SELECT 쿼리 
+  - JdbcTemplate
+- [x] 요구 사항 테스트 추가
+
+<h3>7단계 요구사항</h3>
+데이터 추가/삭제하기
+
+- [x] 예약 추가/취소 API 처리 로직에서 데이터베이스를 활용하도록 수정 
+  - 기존에 사용하던 List 및 AtomicLong 제거
+- [x] 요구 사항 테스트 추가

build.gradle

@@ -13,11 +13,18 @@ repositories {
 }
 
 dependencies {
+    implementation 'org.springframework.boot:spring-boot-starter-web'
+    implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
     implementation 'org.springframework.boot:spring-boot-starter'
+    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+
+    testImplementation 'org.assertj:assertj-core:3.20.2'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:5.3.1'
+
+    runtimeOnly 'com.h2database:h2'
 }
 
 test {
     useJUnitPlatform()
-}
+}

src/main/java/roomescape/DAO/ReservationDAO.java

@@ -0,0 +1,64 @@
+package roomescape.DAO;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Repository;
+import roomescape.domain.Reservation;
+import roomescape.domain.Time;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public class ReservationDAO {
+
+    private final JdbcTemplate jdbcTemplate;
+    private final SimpleJdbcInsert simpleJdbcInsert;
+
+    public ReservationDAO(DataSource dataSource) {
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
+        this.simpleJdbcInsert = new SimpleJdbcInsert(jdbcTemplate)
+                .withTableName("reservation")
+                .usingGeneratedKeyColumns("id");
+    }
+
+    public List<Reservation> findAll() {
+        String sql = "SELECT r.id, r.name, r.date, t.id as time_id, t.time FROM reservation r INNER JOIN time t ON r.time_id = t.id";
+        return jdbcTemplate.query(sql, (rs, rowNum) -> {
+            long id = rs.getLong("id");
+            String name = rs.getString("name");
+            String date = rs.getString("date");
+            Time time = new Time(rs.getLong("time_id"), rs.getString("time"));
+            return new Reservation(id, name, date, time);
+        });
+    }
+
+    public Reservation findById(long id) {
+        String sql = "SELECT r.id, r.name, r.date, t.id as time_id, t.time FROM reservation r INNER JOIN time t ON r.time_id = t.id WHERE r.id = ?";
+        return jdbcTemplate.queryForObject(sql, new Object[]{id}, (rs, rowNum) -> {
+            long reservationId = rs.getLong("id");
+            String name = rs.getString("name");
+            String date = rs.getString("date");
+            Time time = new Time(rs.getLong("time_id"), rs.getString("time"));
+            return new Reservation(reservationId, name, date, time);
+        });
+    }
+
+    public long save(Reservation reservation) {
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("name", reservation.getName());
+        parameters.put("date", reservation.getDate());
+        parameters.put("time_id", reservation.getTime().getId());
+
+        Number key = simpleJdbcInsert.executeAndReturnKey(parameters);
+        return key.longValue();
+    }
+
+    public long deleteById(long id) {
+        String sql = "DELETE FROM reservation WHERE id = ?";
+        int rowsAffected = jdbcTemplate.update(sql, id);
+        return rowsAffected > 0 ? id : -1;
+    }
+}

src/main/java/roomescape/DAO/TimeDAO.java

@@ -0,0 +1,48 @@
+package roomescape.DAO;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Repository;
+import roomescape.domain.Time;
+
+import javax.sql.DataSource;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public class TimeDAO {
+    private final JdbcTemplate jdbcTemplate;
+    private final SimpleJdbcInsert simpleJdbcInsert;
+
+    public TimeDAO(DataSource dataSource) {
+        this.jdbcTemplate = new JdbcTemplate(dataSource);
+        this.simpleJdbcInsert = new SimpleJdbcInsert(jdbcTemplate)
+                .withTableName("time")
+                .usingGeneratedKeyColumns("id");
+    }
+
+    public List<Time> findAll() {
+        String sql = "SELECT id, time FROM time";
+        return jdbcTemplate.query(sql, (rs, rowNum) -> new Time(rs.getLong("id"), rs.getString("time")));
+    }
+
+    public Time findById(long id) {
+        String sql = "SELECT id, time FROM time WHERE id = ?";
+        return jdbcTemplate.queryForObject(sql, new Object[]{id}, (rs, rowNum) -> new Time(rs.getLong("id"), rs.getString("time")));
+    }
+
+    public long save(Time time) {
+        Map<String, Object> parameters = new HashMap<>();
+        parameters.put("time", time.getTime());
+
+        Number key = simpleJdbcInsert.executeAndReturnKey(parameters);
+        return key.longValue();
+    }
+
+    public long deleteById(long id) {
+        String sql = "DELETE FROM time WHERE id = ?";
+        int rowsAffected = jdbcTemplate.update(sql, id);
+        return rowsAffected > 0 ? id : -1;
+    }
+}

src/main/java/roomescape/RoomescapeApplication.java

@@ -8,5 +8,4 @@ public class RoomescapeApplication {
     public static void main(String[] args) {
         SpringApplication.run(RoomescapeApplication.class, args);
     }
-
-}
+}

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

@@ -0,0 +1,13 @@
+package roomescape.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class HomeController {
+
+    @GetMapping("/")
+    public String home() {
+        return "home";
+    }
+}

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

@@ -0,0 +1,60 @@
+package roomescape.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import roomescape.domain.Reservation;
+import roomescape.DAO.ReservationDAO;
+import roomescape.exception.NotFoundReservationException;
+import roomescape.service.ReservationService;
+
+import javax.sql.DataSource;
+import java.net.URI;
+import java.util.List;
+
+@Controller
+public class ReservationController {
+    private final String NOT_FOUND_RESERVATION_MESSAGE = "삭제할 예약을 찾을 수 없습니다.";
+    private final ReservationService reservationService;
+
+    @Autowired
+    public ReservationController(ReservationService reservationService) {
+        this.reservationService = reservationService;
+    }
+
+    @GetMapping("/reservation")
+    public String newReservation() {
+        return "new-reservation";
+    }
+
+    @GetMapping("/reservations")
+    public ResponseEntity<List<Reservation>> getReservations() {
+        List<Reservation> reservationList = reservationService.findAll();
+        return ResponseEntity.ok(reservationList);
+    }
+
+    @PostMapping("/reservations")
+    public ResponseEntity<Reservation> addReservation(@RequestBody Reservation request) {
+
+        long id = reservationService.save(request);
+        Reservation reservation = reservationService.findById(id);
+        URI location = URI.create("/reservations/" + id);
+
+        return ResponseEntity.created(location).body(reservation);
+    }
+
+    @DeleteMapping("/reservations/{id}")
+    public ResponseEntity<Void> cancelReservation(@PathVariable long id) {
+        long deletedId = reservationService.deleteById(id);
+
+        if (deletedId == -1) {
+            throw new NotFoundReservationException(NOT_FOUND_RESERVATION_MESSAGE);
+        }
+
+        URI location = URI.create("/reservations/" + deletedId);
+        ResponseEntity.noContent().location(location).build();
+
+        return ResponseEntity.noContent().build();
+    }
+}

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

@@ -0,0 +1,51 @@
+package roomescape.controller;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+import roomescape.domain.Time;
+import roomescape.service.TimeService;
+
+import javax.sql.DataSource;
+import java.net.URI;
+import java.util.List;
+
+@Controller
+public class TimeController {
+    private final TimeService timeService;
+
+    @Autowired
+    public TimeController(TimeService timeService) {
+        this.timeService = timeService;
+    }
+
+    @GetMapping("/time")
+    public String times() {
+        return "time";
+    }
+
+    @PostMapping("/times")
+    public ResponseEntity<Time> addTime(@RequestBody Time request) {
+        long id = timeService.save(request);
+        Time time = timeService.findById(id);
+        URI location = URI.create("/times/" + id);
+
+        return ResponseEntity.created(location).body(time);
+    }
+
+    @GetMapping("/times")
+    public ResponseEntity<List<Time>> getTimes() {
+        List<Time> timeList = timeService.findAll();
+        return ResponseEntity.ok(timeList);
+    }
+
+    @DeleteMapping("/times/{id}")
+    public ResponseEntity<Void> deleteTime(@PathVariable long id) {
+        long deletedId = timeService.deleteById(id);
+        if (deletedId == -1) {
+            return ResponseEntity.notFound().build();
+        }
+        return ResponseEntity.noContent().build();
+    }
+}

src/main/java/roomescape/domain/Reservation.java

@@ -0,0 +1,65 @@
+package roomescape.domain;
+
+import roomescape.exception.InvalidRequestException;
+
+public class Reservation {
+    private Long id;
+    private String name;
+    private String date;
+    private Time time;
+
+    private final String INVALID_NAME_REQUEST_MESSAGE = "이름 정보가 공백입니다.";
+    private final String INVALID_DATE_REQUEST_MESSAGE = "날짜 정보가 공백입니다.";
+    private final String INVALID_TIME_REQUEST_MESSAGE = "시간 정보가 공백입니다.";
+
+    public Reservation(long id, String name, String date, Time time) {
+        this.id = id;
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public Time getTime() {
+        return time;
+    }
+
+    public void Validate(){
+        nameValidate();
+        dateValidate();
+        timeValidate();
+    }
+
+    public void nameValidate() {
+        if (isBlank(name)) {
+            throw new InvalidRequestException(INVALID_NAME_REQUEST_MESSAGE);
+        }
+    }
+
+    public void dateValidate() {
+        if (isBlank(date)) {
+            throw new InvalidRequestException(INVALID_DATE_REQUEST_MESSAGE);
+        }
+    }
+
+    public void timeValidate() {
+        if (isBlank(time.getTime())) {
+            throw new InvalidRequestException(INVALID_TIME_REQUEST_MESSAGE);
+        }
+    }
+
+    private boolean isBlank(String str) {
+        return str == null || str.trim().isEmpty();
+    }
+}

src/main/java/roomescape/domain/Time.java

@@ -0,0 +1,27 @@
+package roomescape.domain;
+
+public class Time {
+    private Long id;
+    private String time;
+
+    public Time(Long id, String time) {
+        this.id = id;
+        this.time = time;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+}