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

README.md

@@ -0,0 +1,42 @@
+# 🌀 Spring MVC
+
+## 예약
+#### id :식별
+#### name : 예약한 사람 이름
+#### date : 예약한 날짜(방문하는 날짜)
++ 현재보다 이전이면 안 된다 <- 예약 생성 시에만 영향을 받는다
+#### time : 방문하는 시각
+
+## 외부 api 요청
+#### Controller : 요청, 응답 DTO
+#### Service
++ getReservations 예약 조회 메서드
++ createReservation 예약 추가 메서드
+  + MissingParameterException
++ deleteReservation 예약 취소 메서드
+  + NotFoundReservationException
+
+
+# 🌀 Spring JDBC
+## 요구사항
++ 데이터베이스 이름 : DATABASE
++ 테이블 이름 : RESERVATION
+
+## 기능
++ 데이터베이스에서 예약 조회 기능
+  + 생성된 id 값을 활용해서 응답해야 함
++ 데이터베이스에 예약 추가 기능
++ 데이터베이스의 예약 삭제 기능
+
+# 🌀 Spring Core
+## 요구사항
++ 시간 입력 방식 변경 : 직접 입력 -> 선택 입력
+  + 테이블 이름 : TIME
+    + id(PK)
+    + time : 정해진 방탈출 시간표
+
+## 기능
++ 관리자는 정해진 시간표에 따라 선택지 추가, 삭제 가능
++ 사용자는 정해진 방탈출 시간만 예약이 가능함
+
+

build.gradle

@@ -26,6 +26,8 @@ dependencies {
     testAnnotationProcessor 'org.projectlombok:lombok'
 
     implementation 'org.springframework.boot:spring-boot-starter-validation'
+    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    runtimeOnly 'com.h2database:h2'
 }
 
 

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

@@ -8,6 +8,11 @@ public class ReservationController {
 
     @GetMapping("/reservation")
     public String accessReservationPage() {
-        return "reservation";
+        return "new-reservation";
+    }
+
+    @GetMapping("/time")
+    public String showTimeForm() {
+        return "time";
     }
 }

src/main/java/roomescape/controller/ReservationRestController.java

@@ -14,24 +14,24 @@
 import roomescape.service.ReservationService;
 
 import java.net.URI;
-import java.util.Map;
+import java.util.List;
 
-@RequiredArgsConstructor
 @RestController
+@RequiredArgsConstructor
 public class ReservationRestController {
 
     private final ReservationService reservationService;
 
-    @GetMapping("/reservations")
-    public ResponseEntity<Map<Long, ReservationResponse>> getReservations() {
-        return ResponseEntity.ok().body(reservationService.getReservations());
-    }
-
     @PostMapping("/reservations")
     public ResponseEntity<ReservationResponse> createReservation(@RequestBody @Valid ReservationRequest reservationRequest) {
         ReservationResponse newReservation = reservationService.createReservation(reservationRequest);
 
-        return ResponseEntity.created(URI.create("/reservations/" + newReservation.getId())).body(newReservation);
+        return ResponseEntity.created(URI.create("/reservations/" + newReservation.id())).body(newReservation);
+    }
+
+    @GetMapping("/reservations")
+    public ResponseEntity<List<ReservationResponse>> findAllReservations() {
+        return ResponseEntity.ok().body(reservationService.findAllReservations());
     }
 
     @DeleteMapping("/reservations/{id}")
@@ -40,8 +40,6 @@ public ResponseEntity<Void> deleteReservation(@PathVariable Long id) {
 
         return ResponseEntity.noContent().build();
     }
-
-
 }
 
 

src/main/java/roomescape/controller/ReservationTimeController.java

@@ -0,0 +1,43 @@
+package roomescape.controller;
+
+import jakarta.validation.Valid;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+import roomescape.dto.ReservationTimeRequest;
+import roomescape.dto.ReservationTimeResponse;
+import roomescape.service.ReservationTimeService;
+
+import java.net.URI;
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class ReservationTimeController {
+
+    private final ReservationTimeService reservationTimeService;
+
+    @PostMapping("/times")
+    public ResponseEntity<ReservationTimeResponse> createReservationTime(@RequestBody @Valid ReservationTimeRequest reservationTimeRequest) {
+        ReservationTimeResponse newReservationTime = reservationTimeService.createReservationTime(reservationTimeRequest);
+
+        return ResponseEntity.created(URI.create("/times/" + newReservationTime.id())).body(newReservationTime);
+    }
+
+    @GetMapping("/times")
+    public ResponseEntity<List<ReservationTimeResponse>> findAllReservationTimes() {
+        return ResponseEntity.ok().body(reservationTimeService.findAllReservationTimes());
+    }
+
+    @DeleteMapping("/times/{id}")
+    public ResponseEntity<Void> deleteReservation(@PathVariable Long id) {
+        reservationTimeService.deleteReservationTime(id);
+
+        return ResponseEntity.noContent().build();
+    }
+}

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

@@ -0,0 +1,71 @@
+package roomescape.dao;
+
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Component;
+import roomescape.entity.Reservation;
+import roomescape.entity.ReservationTime;
+import roomescape.exception.NotFoundException;
+import roomescape.repository.ReservationRepository;
+
+import javax.sql.DataSource;
+import java.util.List;
+
+@Component
+public class ReservationDAO implements ReservationRepository {
+
+    private final JdbcTemplate jdbcTemplate;
+    private final SimpleJdbcInsert insertReservation;
+
+    public ReservationDAO(JdbcTemplate jdbcTemplate, DataSource dataSource) {
+        this.jdbcTemplate = jdbcTemplate;
+        this.insertReservation = new SimpleJdbcInsert(dataSource)
+                .withTableName("reservation")   // 테이블 이름 설정
+                .usingGeneratedKeyColumns("id"); // 자동 생성되는 키 컬럼 설정
+    }
+
+    private final RowMapper<Reservation> reservationRowMapper = (resultSet, rowNum) -> {
+        ReservationTime reservationTime = new ReservationTime(resultSet.getLong("time_id"), resultSet.getString("time_value"));
+
+        return new Reservation(
+                resultSet.getLong("id"),
+                resultSet.getString("name"),
+                resultSet.getString("date"),
+                reservationTime
+        );
+    };
+
+
+    public Reservation save(Reservation reservation) {
+        MapSqlParameterSource parameters = new MapSqlParameterSource()
+                .addValue("name", reservation.getName())
+                .addValue("date", reservation.getDate())
+                .addValue("time_id", reservation.getTime().getId());
+
+        Long newId = insertReservation.executeAndReturnKey(parameters).longValue();
+
+        return new Reservation(newId, reservation.getName(), reservation.getDate().getDate(), reservation.getTime());
+    }
+
+    public List<Reservation> findAll() {
+        String sql = "SELECT \n" +
+                "    r.id as reservation_id, \n" +
+                "    r.name, \n" +
+                "    r.date, \n" +
+                "    t.id as time_id, \n" +
+                "    t.time as time_value \n" +
+                "FROM reservation as r inner join time as t on r.time_id = t.id";
+        return jdbcTemplate.query(sql, reservationRowMapper);
+    }
+
+    public void delete(Long id) {
+        String sql = "delete from reservation where id = ?";
+        int rowsAffected = jdbcTemplate.update(sql, id);
+
+        if (rowsAffected == 0) {
+            throw new NotFoundException("예약");
+        }
+    }
+}

src/main/java/roomescape/dao/ReservationTimeDAO.java

@@ -0,0 +1,85 @@
+package roomescape.dao;
+
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.namedparam.BeanPropertySqlParameterSource;
+import org.springframework.jdbc.core.namedparam.SqlParameterSource;
+import org.springframework.jdbc.core.simple.SimpleJdbcInsert;
+import org.springframework.stereotype.Component;
+import roomescape.entity.ReservationTime;
+import roomescape.exception.NotFoundException;
+import roomescape.repository.ReservationTimeRepository;
+
+import javax.sql.DataSource;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+
+@Component
+public class ReservationTimeDAO implements ReservationTimeRepository {
+
+    private final JdbcTemplate jdbcTemplate;
+    private final SimpleJdbcInsert insertReservationTime;
+
+    public ReservationTimeDAO(JdbcTemplate jdbcTemplate, DataSource dataSource) {
+        this.jdbcTemplate = jdbcTemplate;
+        this.insertReservationTime = new SimpleJdbcInsert(dataSource)
+                .withTableName("time")   // 테이블 이름 설정
+                .usingGeneratedKeyColumns("id"); // 자동 생성되는 키 컬럼 설정
+    }
+
+    private final RowMapper<ReservationTime> reservationTimeRowMapper = (resultSet, rowNum) -> {
+        String timeStr = resultSet.getString("time");
+        LocalTime time = LocalTime.parse(timeStr, DateTimeFormatter.ofPattern("HH:mm:ss"));
+        String formattedTime = time.format(DateTimeFormatter.ofPattern("HH:mm"));
+
+        ReservationTime reservationTime = new ReservationTime(
+                resultSet.getLong("id"),
+                formattedTime
+        );
+
+        return reservationTime;
+    };
+
+    public ReservationTime save(ReservationTime reservationTime) {
+        SqlParameterSource parameters = new BeanPropertySqlParameterSource(reservationTime);
+        Long newId = insertReservationTime.executeAndReturnKey(parameters).longValue();
+
+        return new ReservationTime(newId, reservationTime.getTime().toString());
+    }
+
+    public List<ReservationTime> findAll() {
+        String sql = "select id, time from time";
+        return jdbcTemplate.query(sql, reservationTimeRowMapper);
+    }
+
+    public ReservationTime findById(Long id) {
+        String sql = "SELECT id, time FROM time WHERE id = ?";
+
+        try {
+            return jdbcTemplate.queryForObject(sql, reservationTimeRowMapper, id);
+        } catch (EmptyResultDataAccessException e) {
+            throw new NotFoundException("예약 시간");
+        }
+    }
+
+    public void delete(Long id) {
+        String sql = "delete from time where id = ?";
+        int rowsAffected = jdbcTemplate.update(sql, id);
+
+        if (rowsAffected == 0) {
+            throw new NotFoundException("예약 시간");
+        }
+    }
+
+    @Override
+    public boolean existsByTime(LocalTime time) {
+        String sql = "SELECT count(*) FROM time WHERE time = ?";
+
+        String formattedTime = time.format(DateTimeFormatter.ofPattern("HH:mm"));
+        Integer count = jdbcTemplate.queryForObject(sql, new Object[]{formattedTime}, Integer.class);
+
+        return count != null && count > 0;
+    }
+}

src/main/java/roomescape/dto/ReservationRequest.java

@@ -2,15 +2,15 @@
 
 
 import jakarta.validation.constraints.NotBlank;
-import lombok.Getter;
+import roomescape.entity.Reservation;
+import roomescape.entity.ReservationTime;
 
-@Getter
-public class ReservationRequest {
-
-    @NotBlank(message = "name 값이 누락되었습니다.")
-    private String name;
-    @NotBlank(message = "date 값이 누락되었습니다.")
-    private String date;
-    @NotBlank(message = "time 값이 누락되었습니다.")
-    private String time;
+public record ReservationRequest(
+        @NotBlank(message = "name 값이 누락되었습니다.") String name,
+        @NotBlank(message = "date 값이 누락되었습니다.") String date,
+        @NotBlank(message = "time 값이 누락되었습니다.") Long time
+) {
+    public Reservation toEntity(ReservationTime time) {
+        return new Reservation(null, this.name, this.date, time);
+    }
 }

src/main/java/roomescape/dto/ReservationResponse.java

@@ -1,24 +1,19 @@
 package roomescape.dto;
 
+import roomescape.entity.Reservation;
 
-import lombok.Getter;
-
-@Getter
-public class ReservationResponse {
-
-    private Long id;
-    private String name;
-    private String date;
-    private String time;
-
-    public ReservationResponse(Long id, String name, String date, String time) {
-        this.id = id;
-        this.name = name;
-        this.date = date;
-        this.time = time;
-    }
-
-    public static ReservationResponse toEntity(Long id, ReservationRequest reservationRequest) {
-        return new ReservationResponse(id, reservationRequest.getName(), reservationRequest.getDate(), reservationRequest.getTime());
+public record ReservationResponse(
+        Long id,
+        String name,
+        String date,
+        ReservationTimeResponse time // ReservationTime -> ReservationTimeResponse
+) {
+    public static ReservationResponse fromReservation(Reservation reservation) {
+        return new ReservationResponse(
+                reservation.getId(),
+                reservation.getName(),
+                reservation.getDate().toString(),
+                ReservationTimeResponse.fromReservationTime(reservation.getTime())
+        );
     }
 }