Merge branch 'jeonseohee9' into jeonseohee92

Author: jeonseohee9

src/main/java/roomescape/Controller/PageController.java

@@ -0,0 +1,18 @@
+package roomescape.Controller;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.GetMapping;
+
+@Controller
+public class PageController {
+
+    @GetMapping("/")
+    public String home() {
+        return "home";
+    }
+
+    @GetMapping("/reservation")
+    public String reservationPage() {
+        return "reservation";
+    }
+}

src/main/java/roomescape/Controller/ReservationController.java

@@ -0,0 +1,26 @@
+package roomescape.Controller;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.ArrayList;
+import java.util.List;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+import roomescape.Domain.Reservation;
+
+@RestController
+public class ReservationController {
+
+    private final List<Reservation> reservations = new ArrayList<>();
+
+    public ReservationController() {
+        reservations.add(new Reservation(1, "브라운", LocalDate.parse("2023-01-01"), LocalTime.parse("10:00")));
+        reservations.add(new Reservation(2, "브라운", LocalDate.parse("2023-01-02"), LocalTime.parse("10:00")));
+        reservations.add(new Reservation(3, "브라운", LocalDate.parse("2023-01-03"), LocalTime.parse("10:00")));
+    }
+
+    @GetMapping("/reservations")
+    public List<Reservation> findAll() {
+        return reservations;
+    }
+}

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 Integer id;
+    private final String name;
+    private final LocalDate date;
+    private final LocalTime time;
+
+    public Reservation(Integer id, String name, LocalDate date, LocalTime time) {
+        this.id = id;
+        this.name = name;
+        this.date = date;
+        this.time = time;
+    }
+
+    public Reservation() {
+        this.id = null;
+        this.name = null;
+        this.date = null;
+        this.time = null;
+    }
+
+    public Integer getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public LocalTime getTime() {
+        return time;
+    }
+}

src/main/java/roomescape/service/ReservationService.java

@@ -19,7 +19,7 @@ public ReservationService(ReservationDAO reservationDAO) {
         this.reservationDAO = reservationDAO;
     }
 
-    public Reservation add(Reservation reservation) {
+public Reservation add(Reservation reservation) {
         boolean isDuplicate = reservationDAO.findAll().stream().anyMatch(r ->
                 r.getName().equals(reservation.getName()) &&
                         r.getDate().equals(reservation.getDate()) &&
@@ -51,4 +51,6 @@ public void update(Reservation reservation) {
         }
         reservationDAO.updateReservation(reservation);
     }
+
+  
 }

src/test/java/roomescape/MissionStepTest.java

@@ -129,5 +129,6 @@ public class MissionStepTest {
         Integer count = jdbcTemplate.queryForObject("SELECT count(1) from reservation", Integer.class);
 
         assertThat(reservations.size()).isEqualTo(count);
+
     }
 }