[1 - 6단계 - 방탈출 예약 관리] 리비(이근희) 미션 제출합니다.

README.md

@@ -0,0 +1,21 @@
+# 방탈출 API
+
+| Method | Endpoint             | Description  |
+|--------|----------------------|--------------|
+| GET    | `/admin`             | 어드민 페이지 요청   |
+| GET    | `/admin/reservation` | 예약 관리 페이지 요청 |
+| GET    | `/reservations`      | 예약 정보        |
+| POST   | `/reservations`      | 예약 추가        |
+| DELETE | `/reservations/{id}` | 예약 취소        |
+
+# 방탈출 예약 도메인 명세
+
+## Name
+
+- [x] 예약자 이름은 null이거나 빈 문자열일 수 없다.
+- [x] 예약자 이름은 1~5사이의 길이를 가져야 한다.
+
+## ReservationTime
+
+- [x] 예약하려는 시간에 다른 예약이 존재한다면 예약이 불가능하다.
+- [x] 예약 시간은 예약 시작 시간으로부터 한 시간의 길이를 가진다.

build.gradle

@@ -20,6 +20,7 @@ dependencies {
     runtimeOnly 'com.h2database:h2'
     testImplementation 'org.springframework.boot:spring-boot-starter-test'
     testImplementation 'io.rest-assured:rest-assured:5.3.1'
+    testImplementation 'org.mockito:mockito-core:3.6.28'
 }
 
 test {

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/AdminViewController.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;
+
+@RequestMapping("/admin")
+@Controller
+public class AdminViewController {
+    @GetMapping()
+    public String showAdminMainPage() {
+        return "admin/index";
+    }
+
+    @GetMapping("/reservation")
+    public String showAdminReservationPage() {
+        return "admin/reservation-legacy";
+    }
+}

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

@@ -0,0 +1,46 @@
+package roomescape.controller;
+
+import java.util.List;
+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.controller.dto.ReservationRequest;
+import roomescape.controller.dto.ReservationResponse;
+import roomescape.entity.Reservation;
+import roomescape.service.ReservationService;
+
+@RequestMapping("/reservations")
+@RestController
+public class ReservationController {
+    private final ReservationService reservationService;
+
+    public ReservationController(ReservationService reservationService) {
+        this.reservationService = reservationService;
+    }
+
+    @GetMapping()
+    public ResponseEntity<List<ReservationResponse>> readAllReservations() {
+        List<ReservationResponse> reservations = reservationService.readAll()
+                .stream()
+                .map(ReservationResponse::from)
+                .toList();
+        return ResponseEntity.ok().body(reservations);
+    }
+
+    @PostMapping()
+    public ResponseEntity<ReservationResponse> createReservation(@RequestBody ReservationRequest reservationRequest) {
+        Reservation savedReservation = reservationService.saveReservation(reservationRequest.toEntity());
+        return ResponseEntity.ok().body(ReservationResponse.from(savedReservation));
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<Void> deleteReservationById(@PathVariable("id") long id) {
+        reservationService.deleteReservation(id);
+        return ResponseEntity.ok().build();
+    }
+}

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

@@ -0,0 +1,36 @@
+package roomescape.controller.dto;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import roomescape.entity.Reservation;
+
+public class ReservationRequest {
+    private String name;
+    private LocalDate date;
+    private LocalTime time;
+
+    public ReservationRequest() {
+    }
+
+    public ReservationRequest(String name, LocalDate date, LocalTime time) {
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
+    public Reservation toEntity() {
+        return new Reservation(name, date, time);
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public LocalTime getTime() {
+        return time;
+    }
+}

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

@@ -0,0 +1,43 @@
+package roomescape.controller.dto;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import roomescape.entity.Reservation;
+
+public class ReservationResponse {
+    private final Long id;
+    private final String name;
+    private final LocalDate date;
+    private final LocalTime time;
+
+    public ReservationResponse(long id, String name, LocalDate date, LocalTime time) {
+        this.id = id;
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
+    public static ReservationResponse from(Reservation reservation) {
+        return new ReservationResponse(
+                reservation.getId(),
+                reservation.getName(),
+                reservation.getStartDate(),
+                reservation.getStartTime());
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public LocalTime getTime() {
+        return time;
+    }
+}

src/main/java/roomescape/entity/Name.java

@@ -0,0 +1,35 @@
+package roomescape.entity;
+
+public class Name {
+    private static final int MIN_LENGTH = 1;
+    private static final int MAX_LENGTH = 5;
+
+    private final String name;
+
+    public Name(String name) {
+        validate(name);
+        this.name = name;
+    }
+
+    private void validate(String name) {
+        validateNonNull(name);
+        validateLength(name);
+    }
+
+    private void validateNonNull(String name) {
+        if (name == null) {
+            throw new NullPointerException("예약자 이름은 Null이 될 수 없습니다");
+        }
+    }
+
+    private void validateLength(String name) {
+        if (MAX_LENGTH < name.length() || name.length() < MIN_LENGTH) {
+            throw new IllegalArgumentException(
+                    "예약자 이름은 " + MIN_LENGTH + "자 이상, " + MAX_LENGTH + "자 미만이어야 합니다: " + name);
+        }
+    }
+
+    public String getName() {
+        return name;
+    }
+}

src/main/java/roomescape/entity/Reservation.java

@@ -0,0 +1,45 @@
+package roomescape.entity;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+public class Reservation {
+    private final Long id;
+    private final Name name;
+    private final ReservationTime time;
+
+    public Reservation(Long id, String name, LocalDate reservationDate, LocalTime reservationStartTime) {
+        this.id = id;
+        this.name = new Name(name);
+        this.time = new ReservationTime(LocalDateTime.of(reservationDate, reservationStartTime));
+    }
+
+    public Reservation(String name, LocalDate reservationDate, LocalTime reservationStartTime) {
+        this(null, name, reservationDate, reservationStartTime);
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name.getName();
+    }
+
+    public LocalDateTime getStartDateTime() {
+        return time.getStartDateTime();
+    }
+
+    public LocalDateTime getEndDateTime() {
+        return time.getEndDateTime();
+    }
+
+    public LocalDate getStartDate() {
+        return time.getStartDate();
+    }
+
+    public LocalTime getStartTime() {
+        return time.getStart();
+    }
+}

src/main/java/roomescape/entity/ReservationTime.java

@@ -0,0 +1,38 @@
+package roomescape.entity;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+public class ReservationTime {
+    public static final int RESERVATION_DURATION_HOUR = 1;
+
+    private final LocalDateTime start;
+
+    public ReservationTime(LocalDateTime start) {
+        validateNonNull(start);
+        this.start = start;
+    }
+
+    private void validateNonNull(LocalDateTime startTime) {
+        if (startTime == null) {
+            throw new NullPointerException("예약 시간은 Null이 될 수 없습니다");
+        }
+    }
+
+    public LocalDateTime getStartDateTime() {
+        return start;
+    }
+
+    public LocalDateTime getEndDateTime() {
+        return start.plusHours(RESERVATION_DURATION_HOUR);
+    }
+
+    public LocalDate getStartDate() {
+        return start.toLocalDate();
+    }
+
+    public LocalTime getStart() {
+        return start.toLocalTime();
+    }
+}

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

@@ -0,0 +1,90 @@
+package roomescape.repository;
+
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.Statement;
+import java.sql.Time;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.time.format.DateTimeFormatter;
+import java.util.List;
+import java.util.Optional;
+import org.springframework.dao.EmptyResultDataAccessException;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Repository;
+import roomescape.entity.Reservation;
+import roomescape.entity.ReservationTime;
+
+@Repository
+public class ReservationRepository {
+    private final JdbcTemplate jdbcTemplate;
+
+    public ReservationRepository(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    public List<Reservation> readAll() {
+        String sql = "select * from reservation";
+        return jdbcTemplate.query(sql, reservationRowMapper());
+    }
+
+    public Reservation save(Reservation reservation) {
+        String sql = "insert into reservation (name, date, time) values(?, ?, ?)";
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+
+        jdbcTemplate.update(connection -> {
+            PreparedStatement ps = connection.prepareStatement(sql, Statement.RETURN_GENERATED_KEYS);
+            ps.setString(1, reservation.getName());
+            ps.setDate(2, Date.valueOf(reservation.getStartDate()));
+            ps.setTime(3, Time.valueOf(reservation.getStartTime()));
+            return ps;
+        }, keyHolder);
+        long savedId = keyHolder.getKey().longValue();
+        return new Reservation(savedId, reservation.getName(), reservation.getStartDate(), reservation.getStartTime());
+    }
+
+    public Optional<Reservation> findById(long id) {
+        String sql = "select * from reservation where id=?";
+        try {
+            return Optional.of(jdbcTemplate.queryForObject(sql, new Object[]{id}, reservationRowMapper()));
+        } catch (EmptyResultDataAccessException ex) {
+            return Optional.empty();
+        }
+    }
+
+    public void deleteById(long id) {
+        String sql = "delete from reservation where id=?";
+        jdbcTemplate.update(sql, id);
+    }
+
+    public boolean isAnyReservationConflictWith(Reservation reservation) {
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+        String startDateTime = reservation.getStartDateTime().format(formatter);
+        String endDateTime = reservation.getEndDateTime().format(formatter);
+
+        String sql = "select exists (" +
+                "    select 1 " +
+                "    from reservation " +
+                "    where ? between (date || ' ' || time) and dateadd('HOUR', ?, (date || ' ' || time)) " +
+                "    or ? between (date || ' ' || time) and dateadd('HOUR', ?, (date || ' ' || time)) " +
+                ") as exists_overlap;";
+
+        boolean conflict = jdbcTemplate.queryForObject(sql, Boolean.class, endDateTime,
+                ReservationTime.RESERVATION_DURATION_HOUR, startDateTime, ReservationTime.RESERVATION_DURATION_HOUR);
+        return conflict;
+    }
+
+    private RowMapper<Reservation> reservationRowMapper() {
+        return (rs, rowNum) -> {
+            long id = rs.getLong("id");
+            String name = rs.getString("name");
+            LocalDate date = rs.getDate("date").toLocalDate();
+            LocalTime time = rs.getTime("time").toLocalTime();
+
+            return new Reservation(id, name, date, time);
+        };
+    }
+}