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

build.gradle

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

src/main/java/roomescape/common/GlobalExceptionHandler.java

@@ -4,6 +4,7 @@
 import org.slf4j.LoggerFactory;
 import org.springframework.dao.DataAccessException;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ProblemDetail;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
@@ -44,6 +45,15 @@ public ProblemDetail httpRequestMethodNotSupportedExceptionHandle(HttpRequestMet
         return ProblemDetail.forStatusAndDetail(HttpStatus.BAD_REQUEST, e.getMessage());
     }
 
+    @ExceptionHandler(InvalidDataAccessApiUsageException.class)
+    public ProblemDetail invalidDataAccessApiUsageExceptionHandle(InvalidDataAccessApiUsageException e) {
+        if (e.getCause() instanceof RoomEscapeException roomEscapeException) {
+            return roomEscapeExceptionHandle(roomEscapeException);
+        }
+        log.error("데이터베이스 관련 오류가 발생했습니다", e);
+        return ProblemDetail.forStatusAndDetail(HttpStatus.INTERNAL_SERVER_ERROR, DATABASE_ERROR);
+    }
+
     @ExceptionHandler(DataIntegrityViolationException.class)
     public ProblemDetail dataIntegrityViolationExceptionHandle(DataIntegrityViolationException e) {
         log.info("데이터 무결성 위반 오류가 발생했습니다.", e);

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

@@ -16,12 +16,14 @@
 import roomescape.controller.dto.response.ReservationResponse;
 import roomescape.controller.dto.response.ReservationResponses;
 import roomescape.domain.reservation.Reservation;
+import roomescape.domain.reservation.ReservationWithRank;
 import roomescape.domain.reservation.Reservations;
 import roomescape.service.ReservationCreateCommand;
 import roomescape.service.ReservationService;
 import roomescape.service.ReservationUpdateCommand;
 
 import java.net.URI;
+import java.util.List;
 
 @RestController
 public class ReservationController {
@@ -46,24 +48,30 @@ public ResponseEntity<ReservationResponse> create(
 
     @GetMapping("/reservations")
     public ResponseEntity<ReservationResponses> findList(
-            @RequestParam(required = false) String name
+            @RequestParam(required = false) Long memberId
     ) {
-        Reservations reservations = reservationService.findAll(name);
+        Reservations reservations = reservationService.findAll(memberId);
         return ResponseEntity.ok(ReservationResponses.toDto(reservations));
     }
 
     @GetMapping("/reservations/{id}")
     public ResponseEntity<ReservationResponse> find(@PathVariable long id) {
-        Reservation reservation = reservationService.find(id);
-        return ResponseEntity.ok(ReservationResponse.toDto(reservation));
+        ReservationWithRank reservationWithRank = reservationService.find(id);
+        return ResponseEntity.ok(ReservationResponse.toDto(reservationWithRank));
+    }
+
+    @GetMapping("/reservations-mine")
+    public ResponseEntity<ReservationResponses> findMine(@RequestParam Long memberId) {
+        List<ReservationWithRank> reservations = reservationService.findMine(memberId);
+        return ResponseEntity.ok(ReservationResponses.toDtoWithRank(reservations));
     }
 
     @DeleteMapping("/reservations/{id}")
     public ResponseEntity<Void> delete(
             @PathVariable long id,
-            @RequestParam String name
+            @RequestParam Long memberId
     ) {
-        reservationService.cancel(id, name);
+        reservationService.cancel(id, memberId);
         return ResponseEntity.noContent().build();
     }
 
@@ -72,7 +80,7 @@ public ResponseEntity<ReservationResponse> update(
             @Valid @RequestBody ReservationUpdateRequest request,
             @PathVariable long id
     ) {
-        Reservation updated = reservationService.update(ReservationUpdateCommand.from(request), id);
+        ReservationWithRank updated = reservationService.update(ReservationUpdateCommand.from(request), id);
         return ResponseEntity.ok(ReservationResponse.toDto(updated));
     }
 }

src/main/java/roomescape/controller/TestController.java

@@ -0,0 +1,40 @@
+package roomescape.controller;
+
+import org.springframework.web.bind.annotation.RestController;
+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.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import roomescape.domain.reservation.Slot;
+import roomescape.domain.reservation.SlotRepository;
+
+import java.time.LocalTime;
+
+
+/***
+ * 양방향 매핑 테스트 컨트롤러
+ *
+ * 1단계 이후 삭제할 예정
+ */
+@RestController
+public class TestController {
+
+    private final TestService service;
+
+    public TestController(TestService service) {
+        this.service = service;
+    }
+
+    @GetMapping("/test1")
+    public ResponseEntity<Slot> getTest1() {
+        return ResponseEntity.ok(service.test1());
+    }
+
+    @GetMapping("/test2")
+    public ResponseEntity<LocalTime> getTest2() {
+        return ResponseEntity.ok(service.test2());
+    }
+}

src/main/java/roomescape/controller/TestService.java

@@ -0,0 +1,36 @@
+package roomescape.controller;
+
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+import roomescape.domain.reservation.Reservation;
+import roomescape.domain.reservation.Slot;
+import roomescape.domain.reservation.SlotRepository;
+
+import java.time.LocalTime;
+import java.util.List;
+
+
+/***
+ * 양방향 매핑 테스트 서비스
+ *
+ * 1단계 이후 삭제할 예정
+ */
+
+@Service
+@Transactional(readOnly = true)
+public class TestService {
+
+    private final SlotRepository repository;
+
+    public TestService(SlotRepository repository) {
+        this.repository = repository;
+    }
+
+    public Slot test1() {
+        return repository.getById(1L);
+    }
+
+    public LocalTime test2() {
+        return repository.getById(1L).getTime().getStartAt();
+    }
+}

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

@@ -6,8 +6,9 @@
 import java.time.LocalDate;
 
 public class ReservationCreateRequest {
-    @NotNull(message = "이름은 필수로 입력해야 합니다")
-    private final String name;
+    @NotNull(message = "회원 ID는 필수로 입력해야 합니다.")
+    @Positive(message = "회원 ID는 양수여야 합니다.")
+    private final Long memberId;
 
     @NotNull(message = "날짜는 필수로 입력해야 합니다")
     private final LocalDate date;
@@ -20,15 +21,15 @@ public class ReservationCreateRequest {
     @Positive(message = "Theme ID는 양수여야 합니다.")
     private final Long themeId;
 
-    public ReservationCreateRequest(String name, LocalDate date, Long timeId, Long themeId) {
-        this.name = name;
+    public ReservationCreateRequest(Long memberId, LocalDate date, Long timeId, Long themeId) {
+        this.memberId = memberId;
         this.date = date;
         this.timeId = timeId;
         this.themeId = themeId;
     }
 
-    public String getName() {
-        return name;
+    public Long getMemberId() {
+        return memberId;
     }
 
     public LocalDate getDate() {

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

@@ -6,8 +6,9 @@
 import java.time.LocalDate;
 
 public class ReservationUpdateRequest {
-    @NotNull(message = "이름은 필수로 입력해야 합니다")
-    private final String name;
+    @NotNull(message = "회원 ID는 필수로 입력해야 합니다.")
+    @Positive(message = "회원 ID는 양수여야 합니다.")
+    private final Long memberId;
 
     @NotNull(message = "날짜는 필수로 입력해야 합니다")
     private final LocalDate date;
@@ -20,15 +21,15 @@ public class ReservationUpdateRequest {
     @Positive(message = "Theme ID는 양수여야 합니다.")
     private final Long themeId;
 
-    public ReservationUpdateRequest(String name, LocalDate date, Long timeId, Long themeId) {
-        this.name = name;
+    public ReservationUpdateRequest(Long memberId, LocalDate date, Long timeId, Long themeId) {
+        this.memberId = memberId;
         this.date = date;
         this.timeId = timeId;
         this.themeId = themeId;
     }
 
-    public String getName() {
-        return name;
+    public Long getMemberId() {
+        return memberId;
     }
 
     public LocalDate getDate() {

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

@@ -1,6 +1,7 @@
 package roomescape.controller.dto.response;
 
 import roomescape.domain.reservation.Reservation;
+import roomescape.domain.reservation.ReservationWithRank;
 import roomescape.domain.reservation.Slot;
 
 import java.time.LocalDate;
@@ -27,13 +28,25 @@ public ReservationResponse(long id, String name, LocalDate date, String state, L
 
     public static ReservationResponse toDto(Reservation reservation) {
         Slot slot = reservation.getSlot();
-        Long rank = reservation.getRank() != null ? reservation.getRank().getValue() : null;
         return new ReservationResponse(
                 reservation.getId(),
-                reservation.getName().getValue(),
+                reservation.getMember().getName(),
                 slot.getDate().getDate(),
                 reservation.getStatus().getKoreanName(),
-                rank,
+                null,
+                ReservationTimeResponse.toDto(slot.getTime()),
+                ThemeResponse.toDto(slot.getTheme()));
+    }
+
+    public static ReservationResponse toDto(ReservationWithRank reservationWithRank) {
+        Reservation reservation = reservationWithRank.reservation();
+        Slot slot = reservation.getSlot();
+        return new ReservationResponse(
+                reservation.getId(),
+                reservation.getMember().getName(),
+                slot.getDate().getDate(),
+                reservation.getStatus().getKoreanName(),
+                reservationWithRank.rank(),
                 ReservationTimeResponse.toDto(slot.getTime()),
                 ThemeResponse.toDto(slot.getTheme()));
     }

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

@@ -1,5 +1,6 @@
 package roomescape.controller.dto.response;
 
+import roomescape.domain.reservation.ReservationWithRank;
 import roomescape.domain.reservation.Reservations;
 
 import java.util.List;
@@ -18,6 +19,12 @@ public static ReservationResponses toDto(Reservations reservations) {
                 .toList());
     }
 
+    public static ReservationResponses toDtoWithRank(List<ReservationWithRank> reservations) {
+        return new ReservationResponses(reservations.stream()
+                .map(ReservationResponse::toDto)
+                .toList());
+    }
+
     public List<ReservationResponse> getReservations() {
         return reservations;
     }

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

@@ -0,0 +1,38 @@
+package roomescape.domain.member;
+
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+
+@Entity
+public class Member {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @Column(nullable = false)
+    private String name;
+
+    protected Member() {
+    }
+
+    public Member(Long id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    public static Member create(String name) {
+        return new Member(null, name);
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+}

src/main/java/roomescape/domain/member/MemberRepository.java

@@ -0,0 +1,14 @@
+package roomescape.domain.member;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import roomescape.domain.RoomEscapeException;
+
+import static roomescape.domain.DomainErrorCode.RESOURCE_NOT_FOUND;
+
+public interface MemberRepository extends JpaRepository<Member, Long> {
+
+    default Member getById(Long id) {
+        return findById(id)
+                .orElseThrow(() -> new RoomEscapeException(RESOURCE_NOT_FOUND, "해당 회원을 찾을 수 없습니다. : " + id));
+    }
+}

src/main/java/roomescape/domain/reservation/Rank.java

@@ -1,7 +1,10 @@
 package roomescape.domain.reservation;
 
 public class Rank {
-    private final long value;
+    private long value;
+
+    protected Rank(){
+    }
 
     public Rank(long value) {
         this.value = value;