로빈

README.md

@@ -0,0 +1,82 @@
+# 요구사항 문서
+
+- [x] localhost:8080/admin 요청 시 어드민 메인 페이지가 응답할 수 있도록 구현한다.
+- [x] 어드민 메인 페이지는 templates/admin/index.html 파일을 이용한다.
+- [x] localhost:8080/admin/reservation 요청 시 아래 화면과 같이 예약 관리 페이지가 응답할 수 있도록 구현한다.
+- [x] 페이지는 templates/admin/reservation-legacy.html 파일을 이용한다.
+- [x] 예약 조회 API 명세를 따라 예약 관리 페이지 로드 시 호출되는 예약 목록 조회 API를 구현한다.
+- [x] API 명세를 따라 예약 추가 API 와 삭제 API를 구현한다.
+- [x] 예약 추가와 취소가 잘 동작한다.
+- [x] 이상의 요구 사항을 데이터베이스와 연동하도록 한다.
+
+# API 명세
+
+## 예약 조회 API
+
+### Request
+
+> GET /reservations HTTP/1.1
+
+### Response
+
+> HTTP/1.1 200
+>
+> Content-Type: application/json
+
+``` JSON 
+[
+    {
+        "id": 1,
+        "name": "브라운",
+        "date": "2023-01-01",
+        "time": "10:00"
+    },
+    {
+        "id": 2,
+        "name": "브라운",
+        "date": "2023-01-02",
+        "time": "11:00"
+    }
+]
+```
+
+## 예약 추가 API
+
+### Request
+
+> POST /reservations HTTP/1.1
+>
+> content-type: application/json
+
+```JSON
+{
+  "date": "2023-08-05",
+  "name": "브라운",
+  "time": "15:40"
+}
+```
+
+### Response
+
+> HTTP/1.1 200
+>
+> Content-Type: application/json
+
+```JSON
+{
+  "id": 1,
+  "name": "브라운",
+  "date": "2023-08-05",
+  "time": "15:40"
+}
+```
+
+## 예약 취소 API
+
+### Request
+
+> DELETE /reservations/1 HTTP/1.1
+
+### Response
+
+> HTTP/1.1 200

src/main/java/roomescape/RoomescapeApplication.java → src/main/java/roomescape/RoomEscapeApplication.java

@@ -4,9 +4,9 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
 @SpringBootApplication
-public class RoomescapeApplication {
+public class RoomEscapeApplication {
     public static void main(String[] args) {
-        SpringApplication.run(RoomescapeApplication.class, args);
+        SpringApplication.run(RoomEscapeApplication.class, args);
     }
 
 }

src/main/java/roomescape/config/TimeFormatterConfig.java

@@ -0,0 +1,17 @@
+package roomescape.config;
+
+import com.fasterxml.jackson.datatype.jsr310.ser.LocalTimeSerializer;
+import java.time.format.DateTimeFormatter;
+import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class TimeFormatterConfig {
+    private static final String TIME_FORMAT = "HH:mm";
+
+    @Bean
+    public Jackson2ObjectMapperBuilderCustomizer localTimeSerializerCustomizer() {
+        return builder -> builder.serializers(new LocalTimeSerializer(DateTimeFormatter.ofPattern(TIME_FORMAT)));
+    }
+}

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 mainPage() {
+        return "admin/index";
+    }
+
+    @GetMapping("/reservation")
+    public String reservationPage() {
+        return "admin/reservation-legacy";
+    }
+}

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

@@ -0,0 +1,48 @@
+package roomescape.controller;
+
+import java.util.List;
+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.ReservationRequest;
+import roomescape.dto.ReservationResponse;
+import roomescape.repository.ReservationRepository;
+
+@RestController
+@RequestMapping("/reservations")
+public class ReservationController {
+    private final ReservationRepository reservationRepository;
+
+    public ReservationController(ReservationRepository reservationRepository) {
+        this.reservationRepository = reservationRepository;
+    }
+
+    @PostMapping
+    public ReservationResponse saveReservation(@RequestBody ReservationRequest reservationRequest) {
+        Reservation reservation = reservationRepository.save(reservationRequest);
+        return toResponse(reservation);
+    }
+
+    private ReservationResponse toResponse(Reservation reservation) {
+        return new ReservationResponse(reservation.getId(),
+                reservation.getName(), reservation.getDate(), reservation.getTime());
+    }
+
+    @GetMapping
+    public List<ReservationResponse> findAllReservations() {
+        return reservationRepository.findAll()
+                .stream()
+                .map(this::toResponse)
+                .toList();
+    }
+
+    @DeleteMapping("/{reservationId}")
+    public void delete(@PathVariable long reservationId) {
+        reservationRepository.delete(reservationId);
+    }
+}

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

@@ -0,0 +1,50 @@
+package roomescape.domain;
+
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.time.LocalTime;
+
+public class Reservation implements Comparable<Reservation> {
+    private final long id;
+    private final String name;
+    private final LocalDateTime dateTime;
+
+    public Reservation(long id, Reservation reservationBeforeSave) {
+        this(id, reservationBeforeSave.name, reservationBeforeSave.dateTime);
+    }
+
+    public Reservation(long id, String name, LocalDateTime dateTime) {
+        this.id = id;
+        this.name = name;
+        this.dateTime = dateTime;
+    }
+
+    public Reservation(long id, String name, LocalDate date, LocalTime time) {
+        this(id, name, LocalDateTime.of(date, time));
+    }
+
+    @Override
+    public int compareTo(Reservation other) {
+        return dateTime.compareTo(other.dateTime);
+    }
+
+    public boolean hasSameId(long id) {
+        return this.id == id;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public LocalDate getDate() {
+        return dateTime.toLocalDate();
+    }
+
+    public LocalTime getTime() {
+        return dateTime.toLocalTime();
+    }
+}

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

@@ -0,0 +1,7 @@
+package roomescape.dto;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+public record ReservationRequest(LocalDate date, String name, LocalTime time) {
+}

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

@@ -0,0 +1,7 @@
+package roomescape.dto;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+
+public record ReservationResponse(long id, String name, LocalDate date, LocalTime time) {
+}

src/main/java/roomescape/repository/JdbcTemplateReservationRepository.java

@@ -0,0 +1,62 @@
+package roomescape.repository;
+
+import java.sql.Date;
+import java.sql.PreparedStatement;
+import java.sql.Time;
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.List;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.support.GeneratedKeyHolder;
+import org.springframework.jdbc.support.KeyHolder;
+import org.springframework.stereotype.Repository;
+import roomescape.domain.Reservation;
+import roomescape.dto.ReservationRequest;
+
+@Repository
+public class JdbcTemplateReservationRepository implements ReservationRepository {
+    private final JdbcTemplate jdbcTemplate;
+
+    public JdbcTemplateReservationRepository(JdbcTemplate jdbcTemplate) {
+        this.jdbcTemplate = jdbcTemplate;
+    }
+
+    @Override
+    public Reservation save(ReservationRequest reservationRequest) {
+        KeyHolder keyHolder = new GeneratedKeyHolder();
+        Reservation reservation = fromRequest(reservationRequest);
+        jdbcTemplate.update(con -> {
+            PreparedStatement preparedStatement = con.prepareStatement(
+                    "insert into reservation (name, date,time) values ( ?,?,? )", new String[]{"id"});
+            preparedStatement.setString(1, reservation.getName());
+            preparedStatement.setDate(2, Date.valueOf(reservation.getDate()));
+            preparedStatement.setTime(3, Time.valueOf(reservation.getTime()));
+            return preparedStatement;
+        }, keyHolder);
+        return new Reservation(keyHolder.getKey().longValue(), reservation);
+    }
+
+    @Override
+    public List<Reservation> findAll() {
+        return jdbcTemplate.query("select * from reservation", (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);
+        });
+    }
+
+    @Override
+    public void delete(long reservationId) {
+        jdbcTemplate.update("delete from reservation where id = ?", reservationId);
+    }
+
+    private Reservation fromRequest(ReservationRequest reservationRequest) {
+        long id = 1L;
+        String name = reservationRequest.name();
+        LocalDate date = reservationRequest.date();
+        LocalTime time = reservationRequest.time();
+        return new Reservation(id, name, date, time);
+    }
+}

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

@@ -0,0 +1,13 @@
+package roomescape.repository;
+
+import java.util.List;
+import roomescape.domain.Reservation;
+import roomescape.dto.ReservationRequest;
+
+public interface ReservationRepository {
+    Reservation save(ReservationRequest reservationRequest);
+
+    List<Reservation> findAll();
+
+    void delete(long reservationId);
+}

src/main/resources/application.properties

@@ -0,0 +1,2 @@
+spring.h2.console.enabled=true
+spring.datasource.url=jdbc:h2:mem:product

src/main/resources/schema.sql

@@ -0,0 +1,8 @@
+CREATE TABLE IF NOT EXISTS 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

@@ -1,4 +1,3 @@
-<!DOCTYPE html>
 <html lang="ko">
 <head>
   <meta charset="UTF-8">
@@ -15,17 +14,17 @@
     <img src="/image/admin-logo.png" alt="LOGO" style="height: 40px;">
   </a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
-          aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
 
   <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.html

@@ -15,17 +15,17 @@
     <img src="/image/admin-logo.png" alt="LOGO" style="height: 40px;">
   </a>
   <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarSupportedContent"
-          aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+      aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
     <span class="navbar-toggler-icon"></span>
   </button>
 
   <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>