[🌱 JPA 방탈출 예약 대기] 피즈 미션 제출합니다.

README.md

@@ -197,10 +197,10 @@
 - 예약/대기 추가
     - Http Method: POST
     - URL: /reservations
-    - Request
+    - Request Header: `Member-Id: {memberId}`
+    - Request Body
         ```text
         {
-            "name": "fizz",
             "date": "2026-05-02",
             "timeId": 1,
             "themeId": 1
@@ -211,7 +211,10 @@
           ```text
           {
               "id": 1,
-              "name": "fizz",
+              "member": {
+                  "id": 1,
+                  "name": "fizz"
+              },
               "date": "2026-05-02",
               "time": {
                   "id": 1,
@@ -231,7 +234,10 @@
           ```text
           {
               "id": 1,
-              "name": "fizz",
+              "member": {
+                  "id": 1,
+                  "name": "fizz"
+              },
               "date": "2026-05-02",
               "time": {
                   "id": 1,
@@ -303,6 +309,65 @@
           }
           ```
 
+- 내 예약/대기 조회
+    - Http Method: GET
+    - URL: /reservations/mine
+    - Request Header: `Member-Id: {memberId}`
+    - Response
+        - [x] 정상적으로 조회된 경우: `Http Status: 200 OK`
+          ```text
+          {
+              "reservations": {
+                  "items": [
+                      {
+                          "id": 1,
+                          "member": {
+                              "id": 1,
+                              "name": "예약자01"
+                          },
+                          "date": "2026-05-01",
+                          "time": {
+                              "id": 1,
+                              "startAt": "10:00:00"
+                          },
+                          "theme": {
+                              "id": 1,
+                              "name": "잃어버린 왕국",
+                              "description": "사라진 고대 왕국의 비밀을 추적하는 모험 테마",
+                              "thumbnailUrl": "https://example.com/images/lost-kingdom.jpg"
+                          },
+                          "status": "CONFIRMED"
+                      }
+                  ]
+              },
+              "waits": {
+                  "items": [
+                      {
+                          "id": 1,
+                          "member": {
+                              "id": 1,
+                              "name": "예약자01"
+                          },
+                          "date": "2026-05-02",
+                          "time": {
+                              "id": 2,
+                              "startAt": "11:00:00"
+                          },
+                          "theme": {
+                              "id": 1,
+                              "name": "잃어버린 왕국",
+                              "description": "사라진 고대 왕국의 비밀을 추적하는 모험 테마",
+                              "thumbnailUrl": "https://example.com/images/lost-kingdom.jpg"
+                          },
+                          "status": "WAITING",
+                          "order": 1,
+                          "createdAt": "2026-05-01T09:00:00"
+                      }
+                  ]
+              }
+          }
+          ```
+
 - 사용자 이름으로 예약/대기 조회
     - Http Method: GET
     - URL: /reservations?name={name}
@@ -314,7 +379,10 @@
                   "items": [
                       {
                           "id": 1,
-                          "name": "예약자01",
+                          "member": {
+                              "id": 1,
+                              "name": "예약자01"
+                          },
                           "date": "2026-05-01",
                           "time": {
                               "id": 1,
@@ -334,7 +402,10 @@
                   "items": [
                       {
                           "id": 1,
-                          "name": "예약자01",
+                          "member": {
+                              "id": 1,
+                              "name": "예약자01"
+                          },
                           "date": "2026-05-02",
                           "time": {
                               "id": 2,
@@ -366,7 +437,10 @@
                   "items": [
                       {
                           "id": 1,
-                          "name": "예약자01",
+                          "member": {
+                              "id": 1,
+                              "name": "예약자01"
+                          },
                           "date": "2026-05-01",
                           "time": {
                               "id": 1,
@@ -386,7 +460,10 @@
                   "items": [
                       {
                           "id": 1,
-                          "name": "예약자02",
+                          "member": {
+                              "id": 2,
+                              "name": "예약자02"
+                          },
                           "date": "2026-05-02",
                           "time": {
                               "id": 2,

build.gradle

@@ -22,7 +22,7 @@ dependencies {
 
     implementation 'org.springframework.boot:spring-boot-starter'
     implementation 'org.springframework.boot:spring-boot-starter-web'
-    implementation 'org.springframework.boot:spring-boot-starter-jdbc'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
     testImplementation 'org.springframework.boot:spring-boot-starter-test'

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

@@ -7,6 +7,7 @@
 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.RequestHeader;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
@@ -27,13 +28,22 @@ public ReservationController(ReservationFacade reservationFacade) {
 
     @PostMapping
     public ResponseEntity<ReservationWaitResponse> save(
+            @RequestHeader("Member-Id") Long memberId,
             @RequestBody ReservationCreateRequest request) {
-        ReservationWaitResponse response = reservationFacade.save(request);
+        ReservationWaitResponse response = reservationFacade.save(request, memberId);
         return ResponseEntity.
                 status(HttpStatus.CREATED)
                 .body(response);
     }
 
+    @GetMapping("/mine")
+    public ResponseEntity<ReservationWaitListResponse> findByMemberId(
+            @RequestHeader("Member-Id") Long memberId
+    ) {
+        ReservationWaitListResponse response = reservationFacade.findByMemberId(memberId);
+        return ResponseEntity.ok(response);
+    }
+
     @GetMapping(params = "name")
     public ResponseEntity<ReservationWaitListResponse> findByName(
             @RequestParam("name") String name

src/main/java/roomescape/controller/dto/request/ReservationCreateRequest.java

@@ -2,6 +2,7 @@
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import roomescape.domain.Member;
 import roomescape.domain.Reservation;
 import roomescape.domain.ReservationTime;
 import roomescape.domain.Slot;
@@ -10,28 +11,24 @@
 import roomescape.exception.custom.InvalidRequestArgumentException;
 
 public record ReservationCreateRequest(
-        String name,
         LocalDate date,
         Long timeId,
         Long themeId
 ) {
 
     public ReservationCreateRequest {
-        validate(name, date, timeId, themeId);
+        validate(date, timeId, themeId);
     }
 
-    public Reservation toReservation(ReservationTime reservationTime, Theme theme) {
-        return new Reservation(name, new Slot(date, reservationTime, theme));
+    public Reservation toReservation(Member member, ReservationTime reservationTime, Theme theme) {
+        return new Reservation(member, new Slot(date, reservationTime, theme));
     }
 
-    public Wait toWait(LocalDateTime createdAt, ReservationTime reservationTime, Theme theme) {
-        return new Wait(createdAt, name, new Slot(date, reservationTime, theme));
+    public Wait toWait(LocalDateTime createdAt, Member member, ReservationTime reservationTime, Theme theme) {
+        return new Wait(createdAt, member, new Slot(date, reservationTime, theme));
     }
 
-    private void validate(String name, LocalDate date, Long timeId, Long themeId) {
-        if (name == null || name.isBlank()) {
-            throw new InvalidRequestArgumentException("예약자 이름은 비어 있을 수 없습니다.");
-        }
+    private void validate(LocalDate date, Long timeId, Long themeId) {
         if (date == null) {
             throw new InvalidRequestArgumentException("예약 날짜는 비어 있을 수 없습니다.");
         }

src/main/java/roomescape/controller/dto/response/MemberResponse.java

@@ -0,0 +1,15 @@
+package roomescape.controller.dto.response;
+
+import roomescape.domain.Member;
+
+public record MemberResponse(
+        Long id,
+        String name
+) {
+    public static MemberResponse from(Member member) {
+        return new MemberResponse(
+                member.getId(),
+                member.getName()
+        );
+    }
+}

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

@@ -6,7 +6,7 @@
 
 public record ReservationResponse(
         Long id,
-        String name,
+        MemberResponse member,
         LocalDate date,
         ReservationTimeResponse time,
         ThemeResponse theme,
@@ -16,7 +16,7 @@ public record ReservationResponse(
     public static ReservationResponse from(Reservation reservation) {
         return new ReservationResponse(
                 reservation.getId(),
-                reservation.getName(),
+                MemberResponse.from(reservation.getMember()),
                 reservation.getDate(),
                 ReservationTimeResponse.from(reservation.getTime()),
                 ThemeResponse.from(reservation.getTheme()),

src/main/java/roomescape/controller/dto/response/WaitResponse.java

@@ -7,7 +7,7 @@
 
 public record WaitResponse(
         Long id,
-        String name,
+        MemberResponse member,
         LocalDate date,
         ReservationTimeResponse time,
         ThemeResponse theme,
@@ -19,7 +19,7 @@ public record WaitResponse(
     public static WaitResponse of(Wait wait, Long order) {
         return new WaitResponse(
                 wait.getId(),
-                wait.getName(),
+                MemberResponse.from(wait.getMember()),
                 wait.getReservationDate(),
                 ReservationTimeResponse.from(wait.getTime()),
                 ThemeResponse.from(wait.getTheme()),

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

@@ -0,0 +1,59 @@
+package roomescape.domain;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import java.util.Objects;
+import roomescape.exception.custom.InvalidDomainValueException;
+
+@Entity
+public class Member {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private String name;
+
+    public Member() {
+    }
+
+    public Member(Long id, String name) {
+        validate(name);
+        this.id = id;
+        this.name = name;
+    }
+
+    public Member(String name) {
+        this(null, name);
+    }
+
+    private void validate(String name) {
+        if (name == null || name.isBlank()) {
+            throw new InvalidDomainValueException("회원 이름은 비어 있을 수 없습니다.");
+        }
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    @Override
+    public boolean equals(Object object) {
+        if (object == null || getClass() != object.getClass()) {
+            return false;
+        }
+        Member member = (Member) object;
+        return Objects.equals(id, member.id);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hashCode(id);
+    }
+}