feat: 예약 추가/취소

- ReservationController속 변수에 값 넣어준 코드 주석처리

Author: haeyoon1

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

@@ -1,12 +1,16 @@
 package roomescape.controller;
 
+import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.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.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import roomescape.dto.Reservation;
 
+import java.net.URI;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicLong;
@@ -17,20 +21,46 @@ public class ReservationController {
     private List<Reservation> reservations = new ArrayList<>();
     private AtomicLong index = new AtomicLong(1);
 
-    public ReservationController() {
-        reservations.add(new Reservation(1L, "브라운", "2023-01-01", "10:00"));
-        reservations.add(new Reservation(2L, "브라운", "2023-01-02", "11:00"));
-        reservations.add(new Reservation(3L, "브라운", "2023-01-03", "12:00"));
-    }
+//    public ReservationController() {
+//        reservations.add(new Reservation(1L, "브라운1", "2023-01-01", "10:00"));
+//        reservations.add(new Reservation(2L, "브라운2", "2023-01-02", "11:00"));
+//        reservations.add(new Reservation(3L, "브라운3", "2023-01-03", "12:00"));
+//    }
 
+    // 홈화면
     @GetMapping("/reservation")
     public String reservationPage(){
         return "reservation";
     }
 
+    //예약 조회
     @ResponseBody
     @GetMapping("/reservations")
-    public List<Reservation> reservationList(){
+    public List<Reservation> list(){
         return reservations;
     }
+
+    //예약 추가
+    @ResponseBody
+    @PostMapping("/reservations")
+    public ResponseEntity<Reservation> create(@RequestBody Reservation newReservation){
+
+        Reservation reservation = new Reservation(index.getAndIncrement(), newReservation.getName(), newReservation.getDate(), newReservation.getTime());
+
+        reservations.add(reservation);
+        return ResponseEntity.created(URI.create("/reservations/" + reservation.getId()))
+                .body(reservation);
+    }
+
+    //예약 삭제
+    @DeleteMapping("/reservations/{id}")
+    public ResponseEntity<Void> delete(@PathVariable Long id){
+        Reservation reservation = reservations.stream()
+                .filter(it -> it.getId().equals(id))
+                .findFirst()
+                .orElseThrow(() -> new RuntimeException("Reservation not found"));
+
+        reservations.remove(reservation);
+        return ResponseEntity.noContent().build();
+    }
 }

src/main/java/roomescape/dto/Reservation.java

@@ -29,4 +29,5 @@ public String getDate() {
     public String getTime() {
         return time;
     }
+
 }

src/main/resources/application.properties

@@ -0,0 +1 @@
+server.port=8080

src/test/java/roomescape/MissionStepTest.java

@@ -1,9 +1,14 @@
 package roomescape;
 
 import io.restassured.RestAssured;
+import io.restassured.http.ContentType;
 import org.junit.jupiter.api.Test;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.annotation.DirtiesContext;
+
+import java.util.HashMap;
+import java.util.Map;
+
 import static org.hamcrest.Matchers.is;
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.DEFINED_PORT)
@@ -32,4 +37,39 @@ public class MissionStepTest {
                 .body("size()", is(3)); // 아직 생성 요청이 없으니 Controller에서 임의로 넣어준 Reservation 갯수 만큼 검증하거나 0개임을 확인하세요.
     }
 
+    @Test
+    void 삼단계() {
+        Map<String, String> params = new HashMap<>();
+        params.put("name", "브라운");
+        params.put("date", "2023-08-05");
+        params.put("time", "15:40");
+
+        RestAssured.given().log().all()
+                .contentType(ContentType.JSON)
+                .body(params)
+                .when().post("/reservations")
+                .then().log().all()
+                .statusCode(201)
+                .header("Location", "/reservations/1")
+                .body("id", is(1));
+
+        RestAssured.given().log().all()
+                .when().get("/reservations")
+                .then().log().all()
+                .statusCode(200)
+                .body("size()", is(1));
+
+        RestAssured.given().log().all()
+                .when().delete("/reservations/1")
+                .then().log().all()
+                .statusCode(204);
+
+        RestAssured.given().log().all()
+                .when().get("/reservations")
+                .then().log().all()
+                .statusCode(200)
+                .body("size()", is(0));
+    }
+
+
 }