[1 - 6단계 - 방탈출 예약 관리] 망쵸(김주환) 미션 제출합니다.

.gitignore

@@ -35,3 +35,6 @@ out/
 
 ### VS Code ###
 .vscode/
+
+### Git Commit Template ###
+.gitmessage.txt

docs/README.md

@@ -0,0 +1,11 @@
+# 1단계 기능 요구사항 - 홈 화면
+
+- [x] `/admin` 으로 `GET` 요청 시 어드민 메인 페이지를 응답한다.
+
+# 2단계 기능 요구사항 - 예약 조회
+- [x] `/reservations` 으로 `GET` 요청 시 저장된 예약 정보를 응답한다.
+- [x] `/admin/reservation` 으로 `GET` 요청 시 예약 관리 페이지를 응답한다.
+
+# 3단계 기능 요구사항 - 예약 추가/취소
+- [x] `/reservations` 으로 `POST` 요청 시 예약을 추가한다.
+- [x] `/reservations/{id}` 으로 `DELETE` 요청 시 해당 `id`의 예약을 삭제한다.

src/main/java/roomescape/controller/AdminController.java

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

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

@@ -0,0 +1,56 @@
+package roomescape.controller;
+
+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.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import roomescape.domain.Reservation;
+import roomescape.dto.ReservationRequestDto;
+import roomescape.dto.ReservationResponseDto;
+import roomescape.repository.ReservationRepository;
+
+import java.net.URI;
+import java.util.List;
+
+@RestController
+@RequestMapping("/reservations")
+public class ReservationController {
+    private final ReservationRepository reservationRepository;
+
+    public ReservationController(ReservationRepository reservationRepository) {
+        this.reservationRepository = reservationRepository;
+    }
+
+    @GetMapping
+    public ResponseEntity<List<ReservationResponseDto>> findAll() {
+        List<Reservation> reservations = reservationRepository.findAll();
+        List<ReservationResponseDto> reservationResponseDtos = reservations.stream()
+                .map(ReservationResponseDto::from)
+                .toList();
+
+        return ResponseEntity.ok(reservationResponseDtos);
+    }
+
+    @PostMapping
+    public ResponseEntity<ReservationResponseDto> add(@RequestBody ReservationRequestDto reservationRequestDto) {
+        Reservation savedReservation = reservationRepository.save(new Reservation(
+                reservationRequestDto.name(),
+                reservationRequestDto.date(),
+                reservationRequestDto.time()
+        ));
+
+        return ResponseEntity.created(URI.create("/reservations/" + savedReservation.getId()))
+                .body(ReservationResponseDto.from(savedReservation));
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> delete(@PathVariable(name = "id") long id) {
+        reservationRepository.deleteById(id);
+
+        return ResponseEntity.noContent().build();
+    }
+}

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

@@ -0,0 +1,42 @@
+package roomescape.domain;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+public class Reservation {
+    private final long id;
+    private final String name;
+    private final LocalDate date;
+    private final LocalTime time;
+
+    public Reservation(String name, LocalDate date, LocalTime time) {
+        this(0L, name, date, time);
+    }
+
+    public Reservation(long id, String name, LocalDate date, LocalTime time) {
+        this.id = id;
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
+    public boolean hasId(long id) {
+        return this.id == id;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public LocalTime getTime() {
+        return time;
+    }
+}

src/main/java/roomescape/dto/ReservationRequestDto.java

@@ -0,0 +1,53 @@
+package roomescape.dto;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+import java.util.Objects;
+
+public record ReservationRequestDto(
+        String name,
+        LocalDate date,
+        LocalTime time
+) {
+    private static final int NAME_LENGTH_MIN = 2;
+    private static final int NAME_LENGTH_MAX = 10;
+    private static final int RESERVATION_TIME_MIN = 9;
+    private static final int RESERVATION_TIME_MAX = 20;
+
+    public ReservationRequestDto {
+        validateName(name);
+        validateDate(date);
+        validateTime(time);
+        validateDateTime(date, time);
+    }
+
+    public static void validateName(String name) {
+        Objects.requireNonNull(name);
+        if (name.length() < NAME_LENGTH_MIN || NAME_LENGTH_MAX < name.length()) {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    private void validateDate(LocalDate date) {
+        Objects.requireNonNull(date);
+        if (date.isBefore(LocalDate.now())) {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    private void validateTime(LocalTime time) {
+        Objects.requireNonNull(time);
+        if (time.isBefore(LocalTime.of(RESERVATION_TIME_MIN, 0))
+                || time.isAfter(LocalTime.of(RESERVATION_TIME_MAX, 0))) {
+            throw new IllegalArgumentException();
+        }
+    }
+
+    private void validateDateTime(LocalDate date, LocalTime time) {
+        LocalDateTime localDateTime = LocalDateTime.of(date, time);
+        if (localDateTime.isBefore(LocalDateTime.now())) {
+            throw new IllegalArgumentException();
+        }
+    }
+}

src/main/java/roomescape/dto/ReservationResponseDto.java

@@ -0,0 +1,19 @@
+package roomescape.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import roomescape.domain.Reservation;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+public record ReservationResponseDto(long id, String name, LocalDate date,
+                                     @JsonFormat(pattern = "HH:mm") LocalTime time) {
+    public static ReservationResponseDto from(Reservation reservation) {
+        return new ReservationResponseDto(
+                reservation.getId(),
+                reservation.getName(),
+                reservation.getDate(),
+                reservation.getTime()
+        );
+    }
+}

src/main/java/roomescape/repository/H2ReservationRepositoryImpl.java

@@ -0,0 +1,58 @@
+package roomescape.repository;
+
+import org.springframework.context.annotation.Primary;
+import org.springframework.jdbc.core.JdbcTemplate;
+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.Repository;
+import roomescape.domain.Reservation;
+
+import javax.sql.DataSource;
+import java.util.List;
+
+@Primary
+@Repository
+public class H2ReservationRepositoryImpl implements ReservationRepository {
+    private final JdbcTemplate jdbcTemplate;
+    private final SimpleJdbcInsert jdbcInsert;
+
+    public H2ReservationRepositoryImpl(JdbcTemplate jdbcTemplate, DataSource dataSource) {
+        this.jdbcTemplate = jdbcTemplate;
+        this.jdbcInsert = new SimpleJdbcInsert(dataSource)
+                .withTableName("reservation")
+                .usingGeneratedKeyColumns("id");
+    }
+
+    @Override
+    public List<Reservation> findAll() {
+        String sql = "select * from reservation";
+
+        return jdbcTemplate.query(sql, (resultSet, rowNum) -> new Reservation(
+                resultSet.getLong("id"),
+                resultSet.getString("name"),
+                resultSet.getDate("date").toLocalDate(),
+                resultSet.getTime("time").toLocalTime()
+        ));
+    }
+
+    @Override
+    public Reservation save(Reservation reservation) {
+        SqlParameterSource source = new BeanPropertySqlParameterSource(reservation);
+        long reservationId = jdbcInsert.executeAndReturnKey(source).longValue();
+
+        return new Reservation(
+                reservationId,
+                reservation.getName(),
+                reservation.getDate(),
+                reservation.getTime()
+        );
+    }
+
+    @Override
+    public void deleteById(long id) {
+        String sql = "delete from reservation where id = ?";
+
+        jdbcTemplate.update(sql, id);
+    }
+}

src/main/java/roomescape/repository/InMemoryReservationRepositoryImpl.java

@@ -0,0 +1,41 @@
+package roomescape.repository;
+
+import org.springframework.stereotype.Repository;
+import roomescape.domain.Reservation;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicLong;
+
+@Repository
+public class InMemoryReservationRepositoryImpl implements ReservationRepository {
+    private final List<Reservation> reservations = Collections.synchronizedList(new ArrayList<>());
+    private final AtomicLong index = new AtomicLong(0);
+
+    @Override
+    public List<Reservation> findAll() {
+        return Collections.unmodifiableList(reservations);
+    }
+
+    @Override
+    public Reservation save(final Reservation reservation) {
+        Reservation newReservation = new Reservation(index.incrementAndGet(), reservation.getName(),
+                reservation.getDate(), reservation.getTime());
+        reservations.add(newReservation);
+
+        return newReservation;
+    }
+
+    @Override
+    public void deleteById(final long id) {
+        reservations.stream()
+                .filter(reservation -> reservation.hasId(id))
+                .findFirst()
+                .ifPresent(reservations::remove);
+    }
+
+    void deleteAll() {
+        reservations.clear();
+    }
+}

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 id);
+}

src/main/resources/application.properties

@@ -0,0 +1,3 @@
+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,10 @@
+DROP TABLE IF EXISTS reservation;
+
+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/static/js/reservation-legacy.js

@@ -121,7 +121,7 @@ function requestCreate(reservation) {
 
   return fetch(RESERVATION_API_ENDPOINT, requestOptions)
       .then(response => {
-        if (response.status === 200) return response.json();
+        if (response.status === 201) return response.json();
         throw new Error('Create failed');
       });
 }

src/main/resources/templates/admin/index.html

@@ -22,7 +22,7 @@
   <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>

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

@@ -22,7 +22,7 @@
   <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>

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

@@ -22,7 +22,7 @@
   <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>

src/main/resources/templates/admin/time.html

@@ -22,7 +22,7 @@
   <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>