켈리 1-6 단계 제출

build.gradle

@@ -13,12 +13,23 @@ repositories {
 }
 
 dependencies {
+    // Spring Boot Starter
     implementation 'org.springframework.boot:spring-boot-starter'
+    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+    // Spring Web
     implementation 'org.springframework.boot:spring-boot-starter-web'
+
+    // Thymeleaf
     implementation 'org.springframework.boot:spring-boot-starter-thymeleaf'
+
+    // JDBC
     implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+
+    // h2
     runtimeOnly 'com.h2database:h2'
-    testImplementation 'org.springframework.boot:spring-boot-starter-test'
+
+    // REST-Assured
     testImplementation 'io.rest-assured:rest-assured:5.3.1'
 }
 

docs/README.md

@@ -0,0 +1,12 @@
+# 웹 페이지 조회
+
+- [X] 어드민 페이지 조회
+- [X] 예약 페이지 조회
+
+# API
+
+- [X] 예약 정보 전체 조회
+- [X] 예약 정보 저장
+    - [X] 예약자 이름 검증
+        - 예약자 이름은 `1`이상 `5`이하 문자열만 허용
+- [X] 예약 정보 삭제

src/main/java/roomescape/config/AppConfig.java

@@ -0,0 +1,22 @@
+package roomescape.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import roomescape.repository.H2ReservationRepository;
+import roomescape.repository.ReservationRepository;
+
+@Configuration
+public class AppConfig {
+
+    private final NamedParameterJdbcTemplate template;
+
+    public AppConfig(final NamedParameterJdbcTemplate template) {
+        this.template = template;
+    }
+
+    @Bean
+    public ReservationRepository reservationRepository() {
+        return new H2ReservationRepository(template);
+    }
+}

src/main/java/roomescape/controller/AdminApiController.java

@@ -0,0 +1,44 @@
+package roomescape.controller;
+
+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.domain.Reservation;
+import roomescape.dto.ReservationResponse;
+import roomescape.dto.SaveReservationRequest;
+import roomescape.repository.ReservationRepository;
+
+import java.util.List;
+
+@RestController
+public class AdminApiController {
+    private final ReservationRepository reservationRepository;
+
+    public AdminApiController(final ReservationRepository reservationRepository) {
+        this.reservationRepository = reservationRepository;
+    }
+
+    @GetMapping("/reservations")
+    public List<ReservationResponse> getReservations() {
+        return reservationRepository.findAll()
+                .stream()
+                .map(ReservationResponse::from)
+                .toList();
+    }
+
+    @PostMapping("/reservations")
+    public ReservationResponse saveReservation(@RequestBody final SaveReservationRequest request) {
+        Reservation reservation = request.toReservation();
+        Reservation savedReservation = reservationRepository.save(reservation);
+
+        return ReservationResponse.from(savedReservation);
+    }
+
+    @DeleteMapping("/reservations/{reservation-id}")
+    public void deleteReservation(@PathVariable("reservation-id") final Long reservationId) {
+        reservationRepository.deleteById(reservationId);
+    }
+}

src/main/java/roomescape/controller/AdminWebController.java

@@ -0,0 +1,18 @@
+package roomescape.controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class AdminWebController {
+
+    @GetMapping("/admin")
+    public String getAdminPage() {
+        return "/admin/index";
+    }
+
+    @GetMapping("/admin/reservation")
+    public String getReservationPage() {
+        return "/admin/reservation-legacy";
+    }
+}

src/main/java/roomescape/domain/ClientName.java

@@ -0,0 +1,22 @@
+package roomescape.domain;
+
+public class ClientName {
+    private static final int MAXIMUM_ENABLE_NAME_LENGTH = 5;
+
+    private final String value;
+
+    public ClientName(final String value) {
+        validateClientName(value);
+        this.value = value;
+    }
+
+    private void validateClientName(final String value) {
+        if (value == null || value.isEmpty() || value.length() > MAXIMUM_ENABLE_NAME_LENGTH) {
+            throw new IllegalArgumentException("예약자 이름은 1글자 이상 5글자 이하여야 합니다.");
+        }
+    }
+
+    public String getValue() {
+        return value;
+    }
+}

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

@@ -0,0 +1,53 @@
+package roomescape.domain;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+public class Reservation {
+    private static final Long DEFAULT_ID_VALUE = 0L;
+
+    private final Long id;
+    private final ClientName clientName;
+    private final LocalDate date;
+    private final LocalTime time;
+
+    public Reservation(final ClientName clientName, final LocalDate date, final LocalTime time) {
+        this(DEFAULT_ID_VALUE, clientName, date, time);
+    }
+
+    public Reservation(final Long id, final ClientName clientName, final LocalDate date, final LocalTime time) {
+        validateReservationDateAndTime(date, time);
+        this.id = id;
+        this.clientName = clientName;
+        this.date = date;
+        this.time = time;
+    }
+
+    private void validateReservationDateAndTime(final LocalDate date, final LocalTime time) {
+        LocalDateTime reservationLocalDateTime = LocalDateTime.of(date, time);
+        if (reservationLocalDateTime.isBefore(LocalDateTime.now())) {
+            throw new IllegalArgumentException("현재 날짜보다 이전 날짜를 예약할 수 없습니다.");
+        }
+    }
+
+    public Reservation initializeIndex(final Long reservationId) {
+        return new Reservation(reservationId, clientName, date, time);
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public ClientName getClientName() {
+        return clientName;
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public LocalTime getTime() {
+        return time;
+    }
+}

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

@@ -0,0 +1,17 @@
+package roomescape.dto;
+
+import roomescape.domain.Reservation;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+public record ReservationResponse(Long id, String name, LocalDate date, LocalTime time) {
+    public static ReservationResponse from(final Reservation reservation) {
+        return new ReservationResponse(
+                reservation.getId(),
+                reservation.getClientName().getValue(),
+                reservation.getDate(),
+                reservation.getTime()
+        );
+    }
+}

src/main/java/roomescape/dto/SaveReservationRequest.java

@@ -0,0 +1,17 @@
+package roomescape.dto;
+
+import roomescape.domain.ClientName;
+import roomescape.domain.Reservation;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+public record SaveReservationRequest(LocalDate date, String name, LocalTime time) {
+    public Reservation toReservation() {
+        return new Reservation(
+                new ClientName(name),
+                date,
+                time
+        );
+    }
+}

src/main/java/roomescape/exception/ErrorResponse.java

@@ -0,0 +1,4 @@
+package roomescape.exception;
+
+public record ErrorResponse(String message) {
+}

src/main/java/roomescape/exception/ReservationExceptionHandler.java

@@ -0,0 +1,21 @@
+package roomescape.exception;
+
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+import org.springframework.web.bind.annotation.RestControllerAdvice;
+
+import java.util.NoSuchElementException;
+
+@RestControllerAdvice
+public class ReservationExceptionHandler {
+
+    @ExceptionHandler
+    protected ResponseEntity<ErrorResponse> handleIllegalArgumentException(IllegalArgumentException e) {
+        return ResponseEntity.badRequest().body(new ErrorResponse(e.getMessage()));
+    }
+
+    @ExceptionHandler
+    protected ResponseEntity<ErrorResponse> handleNoSuchElementException(NoSuchElementException e) {
+        return ResponseEntity.badRequest().body(new ErrorResponse(e.getMessage()));
+    }
+}

src/main/java/roomescape/repository/H2ReservationRepository.java

@@ -0,0 +1,62 @@
+package roomescape.repository;
+
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.core.namedparam.MapSqlParameterSource;
+import org.springframework.jdbc.core.namedparam.NamedParameterJdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Repository;
+import roomescape.domain.ClientName;
+import roomescape.domain.Reservation;
+
+import java.util.List;
+import java.util.Map;
+
+@Repository
+public class H2ReservationRepository implements ReservationRepository {
+    private final NamedParameterJdbcTemplate template;
+
+    public H2ReservationRepository(final NamedParameterJdbcTemplate template) {
+        this.template = template;
+    }
+
+    @Override
+    public List<Reservation> findAll() {
+        String sql = "SELECT id, name, date, time FROM reservation";
+
+        List<Reservation> reservations = template.query(sql, itemRowMapper());
+        return reservations;
+    }
+
+    private RowMapper<Reservation> itemRowMapper() {
+        return ((rs, rowNum) -> new Reservation(
+                rs.getLong("id"),
+                new ClientName(rs.getString("name")),
+                rs.getDate("date").toLocalDate(),
+                rs.getTime("time").toLocalTime()
+        ));
+    }
+
+    @Override
+    public Reservation save(final Reservation reservation) {
+        String sql = "INSERT INTO reservation(name, date, time) VALUES (:name, :date, :time)";
+        MapSqlParameterSource param = new MapSqlParameterSource()
+                .addValue("name", reservation.getClientName().getValue())
+                .addValue("date", reservation.getDate())
+                .addValue("time", reservation.getTime());
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        template.update(sql, param, keyHolder);
+
+        long savedReservationId = keyHolder.getKey().longValue();
+
+        return reservation.initializeIndex(savedReservationId);
+    }
+
+    @Override
+    public void deleteById(final Long reservationId) {
+        String sql = "DELETE FROM reservation WHERE id = :id";
+        Map<String, Long> param = Map.of("id", reservationId);
+
+        template.update(sql, param);
+    }
+}

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

@@ -0,0 +1,13 @@
+package roomescape.repository;
+
+import roomescape.domain.Reservation;
+
+import java.util.List;
+
+public interface ReservationRepository {
+    List<Reservation> findAll();
+
+    Reservation save(Reservation reservation);
+
+    void deleteById(Long reservationId);
+}

src/main/resources/application.properties

@@ -0,0 +1,2 @@
+spring.h2.console.enabled=true
+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/main/resources/templates/admin/index.html

@@ -4,9 +4,8 @@
   <meta charset="UTF-8">
   <meta name="viewport" content="width=device-width, initial-scale=1.0">
   <title>방탈출 어드민</title>
-  <!-- Bootstrap CSS -->
-  <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
-  <link rel="stylesheet" href="/css/style.css">
+    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.5.2/css/bootstrap.min.css">
+    <link rel="stylesheet" href="/css/style.css">
 </head>
 <body>
 
@@ -22,10 +21,10 @@
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav ml-auto">
       <li class="nav-item">
-        <a class="nav-link" href="/reservation">Reservation</a>
+        <a class="nav-link" href="/admin/reservation">Reservation</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" href="/time">Time</a>
+        <a class="nav-link" href="/admin/time">Time</a>
       </li>
     </ul>
   </div>

src/main/resources/templates/admin/reservation-legacy.html

@@ -22,10 +22,10 @@
   <div class="collapse navbar-collapse" id="navbarSupportedContent">
     <ul class="navbar-nav ml-auto">
       <li class="nav-item">
-        <a class="nav-link" href="/reservation">Reservation</a>
+        <a class="nav-link" href="/admin/reservation">Reservation</a>
       </li>
       <li class="nav-item">
-        <a class="nav-link" href="/time">Time</a>
+        <a class="nav-link" href="/admin/time">Time</a>
       </li>
     </ul>
   </div>