[3 - 4단계 방탈출 예약 대기] 카피(김상혁) 미션 제출합니다.

src/main/java/roomescape/RoomescapeApplication.java

@@ -2,8 +2,10 @@
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 @SpringBootApplication
+@EnableJpaAuditing
 public class RoomescapeApplication {
     public static void main(String[] args) {
         SpringApplication.run(RoomescapeApplication.class, args);

src/main/java/roomescape/controller/api/ReservationApiController.java

@@ -13,6 +13,8 @@
 import roomescape.auth.AuthenticatedMember;
 import roomescape.domain.Member;
 import roomescape.domain.Reservation;
+import roomescape.domain.ReservationStatus;
+import roomescape.domain.ReservationWaitingWithRank;
 import roomescape.service.dto.request.ReservationSaveRequest;
 import roomescape.service.dto.response.ReservationResponse;
 import roomescape.service.dto.response.UserReservationResponse;
@@ -51,9 +53,9 @@ public ResponseEntity<List<ReservationResponse>> getReservations() {
 
     @GetMapping("/reservations-mine")
     public ResponseEntity<List<UserReservationResponse>> getUserReservations(@AuthenticatedMember Member member) {
-        List<Reservation> userReservations = reservationFindService.findUserReservations(member.getId());
+        List<ReservationWaitingWithRank> reservationWaitingWithRanks = reservationFindService.findMemberReservations(member.getId());
         return ResponseEntity.ok(
-                userReservations.stream()
+                reservationWaitingWithRanks.stream()
                         .map(UserReservationResponse::new)
                         .toList()
         );
@@ -62,7 +64,7 @@ public ResponseEntity<List<UserReservationResponse>> getUserReservations(@Authen
     @PostMapping("/reservations")
     public ResponseEntity<ReservationResponse> addReservationByUser(@RequestBody @Valid ReservationSaveRequest request,
                                                                     @AuthenticatedMember Member member) {
-        Reservation newReservation = reservationCreateService.createReservation(request, member);
+        Reservation newReservation = reservationCreateService.createReservation(request, member, ReservationStatus.RESERVED);
         return ResponseEntity.created(URI.create("/reservations/" + newReservation.getId()))
                 .body(new ReservationResponse(newReservation));
     }

src/main/java/roomescape/controller/api/ReservationTimeApiController.java

@@ -11,10 +11,10 @@
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import roomescape.domain.ReservationStatus;
+import roomescape.domain.BookingStatus;
 import roomescape.domain.ReservationTime;
 import roomescape.service.dto.request.ReservationTimeSaveRequest;
-import roomescape.service.dto.response.ReservationStatusResponse;
+import roomescape.service.dto.response.BookingStatusResponse;
 import roomescape.service.dto.response.ReservationTimeResponse;
 import roomescape.service.reservationtime.ReservationTimeCreateService;
 import roomescape.service.reservationtime.ReservationTimeDeleteService;
@@ -51,15 +51,15 @@ public ResponseEntity<List<ReservationTimeResponse>> getReservationTimes() {
     }
 
     @GetMapping("/times/available")
-    public ResponseEntity<List<ReservationStatusResponse>> getReservationTimesIsBooked(
+    public ResponseEntity<List<BookingStatusResponse>> getReservationTimesIsBooked(
             @RequestParam LocalDate date,
             @RequestParam @Positive(message = "1 이상의 값만 입력해주세요.") long themeId) {
-        ReservationStatus reservationStatus = reservationTimeFindService.findIsBooked(date, themeId);
+        BookingStatus bookingStatus = reservationTimeFindService.findIsBooked(date, themeId);
         return ResponseEntity.ok(
-                reservationStatus.getReservationStatus()
+                bookingStatus.getReservationStatus()
                         .entrySet()
                         .stream()
-                        .map(status -> new ReservationStatusResponse(
+                        .map(status -> new BookingStatusResponse(
                                         status.getKey(),
                                         status.getValue()
                                 )

src/main/java/roomescape/controller/api/WaitingApiController.java

@@ -0,0 +1,49 @@
+package roomescape.controller.api;
+
+import jakarta.validation.Valid;
+import jakarta.validation.constraints.Positive;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.DeleteMapping;
+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.RestController;
+import roomescape.auth.AuthenticatedMember;
+import roomescape.domain.Member;
+import roomescape.domain.Reservation;
+import roomescape.domain.ReservationStatus;
+import roomescape.service.dto.request.ReservationSaveRequest;
+import roomescape.service.dto.response.ReservationResponse;
+import roomescape.service.reservation.ReservationCreateService;
+import roomescape.service.reservation.ReservationDeleteService;
+
+import java.net.URI;
+
+@RestController
+public class WaitingApiController {
+
+    private final ReservationCreateService reservationCreateService;
+    private final ReservationDeleteService reservationDeleteService;
+
+
+    public WaitingApiController(ReservationCreateService reservationCreateService,
+                                ReservationDeleteService reservationDeleteService) {
+        this.reservationCreateService = reservationCreateService;
+        this.reservationDeleteService = reservationDeleteService;
+    }
+
+    @PostMapping("/waiting")
+    public ResponseEntity<ReservationResponse> addWaiting(@RequestBody @Valid ReservationSaveRequest request,
+                                                          @AuthenticatedMember Member member) {
+        Reservation newReservation = reservationCreateService.createReservation(request, member, ReservationStatus.WAITING);
+        return ResponseEntity.created(URI.create("/waiting/" + newReservation.getId()))
+                .body(new ReservationResponse(newReservation));
+    }
+
+    @DeleteMapping("/waiting/{id}")
+    public ResponseEntity<Void> deleteWaiting(@PathVariable
+                                              @Positive(message = "1 이상의 값만 입력해주세요.") long id) {
+        reservationDeleteService.deleteReservation(id);
+        return ResponseEntity.noContent().build();
+    }
+}

src/main/java/roomescape/controller/api/admin/AdminWaitingApiController.java

@@ -0,0 +1,48 @@
+package roomescape.controller.api.admin;
+
+import jakarta.validation.constraints.Positive;
+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.RestController;
+import roomescape.auth.AuthenticatedMember;
+import roomescape.domain.Member;
+import roomescape.domain.Reservation;
+import roomescape.service.dto.response.WaitingResponse;
+import roomescape.service.reservation.ReservationDeleteService;
+import roomescape.service.reservation.ReservationFindService;
+
+import java.util.List;
+
+@RestController
+public class AdminWaitingApiController {
+
+    private final ReservationFindService reservationFindService;
+    private final ReservationDeleteService reservationDeleteService;
+
+    public AdminWaitingApiController(ReservationFindService reservationFindService,
+                                     ReservationDeleteService reservationDeleteService) {
+        this.reservationFindService = reservationFindService;
+        this.reservationDeleteService = reservationDeleteService;
+    }
+
+    @GetMapping("/admin/waitings")
+    public ResponseEntity<List<WaitingResponse>> getWaiting(@AuthenticatedMember Member member) {
+        List<Reservation> waitings = reservationFindService.findWaitings();
+        return ResponseEntity.ok(
+                waitings.stream()
+                        .map(WaitingResponse::new)
+                        .toList()
+        );
+    }
+
+    @DeleteMapping("/admin/waitings/{id}")
+    public ResponseEntity<Void> deleteReservation(
+            @AuthenticatedMember Member member,
+            @PathVariable
+            @Positive(message = "1 이상의 값만 입력해주세요.") long id) {
+        reservationDeleteService.deleteReservation(id);
+        return ResponseEntity.noContent().build();
+    }
+}

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

@@ -25,4 +25,9 @@ public String reservationAdminPage() {
     public String themeAdminPage() {
         return "admin/theme";
     }
+
+    @GetMapping("/admin/waiting")
+    public String waitingAdminPage() {
+        return "admin/waiting";
+    }
 }

src/main/java/roomescape/domain/BaseTime.java

@@ -0,0 +1,16 @@
+package roomescape.domain;
+
+import jakarta.persistence.EntityListeners;
+import jakarta.persistence.MappedSuperclass;
+import org.springframework.data.annotation.CreatedDate;
+import org.springframework.data.jpa.domain.support.AuditingEntityListener;
+
+import java.time.LocalDateTime;
+
+@MappedSuperclass
+@EntityListeners(AuditingEntityListener.class)
+public abstract class BaseTime {
+
+    @CreatedDate
+    private LocalDateTime createdAt;
+}

src/main/java/roomescape/domain/BookingStatus.java

@@ -0,0 +1,49 @@
+package roomescape.domain;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+public class BookingStatus {
+
+    private final Map<ReservationTime, Boolean> reservationStatus;
+
+    private BookingStatus(Map<ReservationTime, Boolean> reservationStatus) {
+        this.reservationStatus = reservationStatus;
+    }
+
+    public static BookingStatus of(List<ReservationTime> reservedTimes, List<ReservationTime> reservationTimes) {
+        Map<ReservationTime, Boolean> reservationStatus = new HashMap<>();
+        for (ReservationTime reservationTime : reservationTimes) {
+            reservationStatus.put(reservationTime, isReserved(reservedTimes, reservationTime));
+        }
+        return new BookingStatus(reservationStatus);
+    }
+
+    private static boolean isReserved(List<ReservationTime> reservedTimes, ReservationTime reservationTime) {
+        return reservedTimes.stream()
+                .anyMatch(reservedTime -> reservedTime.equals(reservationTime));
+    }
+
+    public Map<ReservationTime, Boolean> getReservationStatus() {
+        return reservationStatus;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        if (this == object) {
+            return true;
+        }
+        if (object == null || getClass() != object.getClass()) {
+            return false;
+        }
+        BookingStatus that = (BookingStatus) object;
+        return Objects.equals(reservationStatus, that.reservationStatus);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(reservationStatus);
+    }
+}

src/main/java/roomescape/domain/Member.java

@@ -11,7 +11,7 @@
 import java.util.Objects;
 
 @Entity
-public class Member {
+public class Member extends BaseTime {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)

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

@@ -1,6 +1,8 @@
 package roomescape.domain;
 
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
@@ -11,7 +13,7 @@
 import java.util.Objects;
 
 @Entity
-public class Reservation {
+public class Reservation extends BaseTime {
 
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
@@ -28,23 +30,30 @@ public class Reservation {
     @ManyToOne(fetch = FetchType.LAZY)
     private Theme theme;
 
-    public Reservation(Long id, Member member, LocalDate date, ReservationTime reservationTime, Theme theme) {
-        validate(member, date, reservationTime, theme);
+    @Enumerated(EnumType.STRING)
+    private ReservationStatus reservationStatus;
+
+    public Reservation(Long id, Member member, LocalDate date, ReservationTime reservationTime,
+                       Theme theme, ReservationStatus reservationStatus) {
+        validate(member, date, reservationTime, theme, reservationStatus);
         this.id = id;
         this.member = member;
         this.date = date;
         this.reservationTime = reservationTime;
         this.theme = theme;
+        this.reservationStatus = reservationStatus;
     }
 
-    public Reservation(Member member, LocalDate date, ReservationTime reservationTime, Theme theme) {
-        this(null, member, date, reservationTime, theme);
+    public Reservation(Member member, LocalDate date, ReservationTime reservationTime,
+                       Theme theme, ReservationStatus reservationStatus) {
+        this(null, member, date, reservationTime, theme, reservationStatus);
     }
 
     protected Reservation() {
     }
 
-    private void validate(Member member, LocalDate date, ReservationTime reservationTime, Theme theme) {
+    private void validate(Member member, LocalDate date, ReservationTime reservationTime,
+                          Theme theme, ReservationStatus reservationStatus) {
         if (member == null) {
             throw new IllegalArgumentException("예약하려는 사용자를 선택해주세요.");
         }
@@ -57,6 +66,17 @@ private void validate(Member member, LocalDate date, ReservationTime reservation
         if (theme == null) {
             throw new IllegalArgumentException("예약하려는 테마를 선택해주세요.");
         }
+        if (reservationStatus == null) {
+            throw new IllegalArgumentException("예약상태가 지정되지 않았습니다.");
+        }
+    }
+
+    public boolean isReserved() {
+        return reservationStatus.isReserved();
+    }
+
+    public void changeWaitingToReserved() {
+        this.reservationStatus = ReservationStatus.RESERVED;
     }
 
     public Long getId() {
@@ -79,6 +99,10 @@ public Theme getTheme() {
         return theme;
     }
 
+    public ReservationStatus getReservationStatus() {
+        return reservationStatus;
+    }
+
     @Override
     public boolean equals(Object object) {
         if (this == object) {