[🌱 JPA 방탈출 예약 대기] 아티(박지영) 미션 제출합니다.

build.gradle

@@ -19,7 +19,8 @@ repositories {
 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-jdbc'
+    implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
     implementation 'org.springframework.boot:spring-boot-starter-validation'
 
     implementation 'io.jsonwebtoken:jjwt-api:0.11.2'

docs/README.md

@@ -275,3 +275,51 @@ ReservationSlot 하나를 기준으로 관리
 1. 모니터링
 https://github.com/woowacourse/spring-roomescape-waiting/pull/510#discussion_r3393603770
 
+------
+
+# 선택 미션
+### 1단계 - JPA 전환
+- [x] build.gradle 설정에 jpa로 수정
+- [x] Time과 Theme의 영속성 관리를 JPA로 전환
+- [x] ReservationSlot과 Reservation의 영속성 관리를 JPA로 전환
+- [x] Reservation과 ReservationSlot을 양방향 매핑으로 수정
+
+### 2단계: 내 예약 목록 조회 기능
+- [x] 사용자 이름으로 예약 조회 기능 추가
+
+### 3단계: 예약 대기 기능
+이미 구현되어있는 대기 기능이라, 이전 미션과 이번 미션의 SQL문 로그 비교에 중점을 두었습니다.
+
+### 4단계 - 예약 대기 관리
+- [x] 동시성 처리에 대한 오류 수정
+
+### 발행 SQL 발췌
+JDBC에서는 제가 직접 SQL을 작성했던 반면, JPA에서는 hibernate가 엔티티 메타 데이터를 분석해서 Insert SQL 쿼리를 생성합니다. 그래서 JDBC는 실행과정(SQL 생성, 파라미터 바인딩, Generated Key 조회 과정 등)이 로그로 잘 드러나는 반면, JPA에서는 hibernate 내부에서 수행되기 때문에 상대적으로 단순한 SQL 로그만 확인할 수 있습니다.
+또한, JDBC에서는 DB에서 생성한 primary key도 개발자가 SimpleJdbcInsert를 사용해서 조회하고 객체에 반영해야했습니다. 반면 JPA에서는 Hibernate가 Insert 후에 생성된 primary key를 조회해서 자동으로 주입해주기 때문에 개발자가 직접 처리할 필요 없습니다.
+
+```
+[JDBC]
+2026-06-22T14:21:43.181+09:00 DEBUG 9599 --- [    Test worker] o.s.jdbc.core.simple.SimpleJdbcInsert    : Compiled insert object: insert string is [INSERT INTO reservation (NAME, RESERVATION_SLOT_ID, STATUS, UPDATED_AT) VALUES(?, ?, ?, ?)]
+2026-06-22T14:21:43.182+09:00 DEBUG 9599 --- [    Test worker] o.s.jdbc.core.simple.SimpleJdbcInsert    : JdbcInsert for table [reservation] compiled
+2026-06-22T14:21:43.182+09:00 DEBUG 9599 --- [    Test worker] o.s.jdbc.core.simple.SimpleJdbcInsert    : The following parameters are used for call INSERT INTO reservation (NAME, RESERVATION_SLOT_ID, STATUS, UPDATED_AT) VALUES(?, ?, ?, ?) with: [김철수, 23, RESERVED, 2026-06-22T14:21:43.136685]
+2026-06-22T14:21:43.182+09:00 DEBUG 9599 --- [    Test worker] o.s.jdbc.core.JdbcTemplate               : Executing SQL update and returning generated keys
+2026-06-22T14:21:43.182+09:00 DEBUG 9599 --- [    Test worker] o.s.jdbc.core.JdbcTemplate               : Executing prepared SQL statement
+2026-06-22T14:21:43.182+09:00 DEBUG 9599 --- [    Test worker] o.s.jdbc.core.simple.SimpleJdbcInsert    : Using generated keys support with array of column names.
+
+[JPA]
+Hibernate:
+insert
+into
+reservation
+(name, reservation_slot_id, status, updated_at, id)
+values
+(?, ?, ?, ?, default)
+```
+
+### 변경사항
+JDBC에서 JPA로 넘어오며 생긴 변경사항입니다.
+1)`@Entity` , `@id`, `@GeneratedValue` 추가
+2)도메인 필드에서 final제거 (JPA에서는 EntityManger가 객체 필드값을 채워주고 수정하기 때문에 final 불가능)
+3)protected 생성자 추가(jpa전용), 기존 사용자 지정에서는 생성자 파라미터에서 id 삭제(이것 역시 JPA가 관리하기 때문에 id는 직접 지정 안함)
+4)JdbcTemplate와 RowMapper 삭제
+5)JpaRepository<T, ID>를 extends하여 제공된 CRUD 기능 사용

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

@@ -1,23 +1,38 @@
 package roomescape.domain;
 
 import java.time.LocalDateTime;
-import java.util.Objects;
 
+import jakarta.persistence.*;
 import roomescape.exception.CustomException;
 import roomescape.exception.ErrorCode;
 
+@Entity
+@Table(name = "reservation")
 public class Reservation {
-    private final Long id;
-    private final String name;
-    private long reservationSlotId;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    @ManyToOne
+    @JoinColumn(name = "reservation_slot_id")
+    private ReservationSlot reservationSlot;
+
+    @Column(nullable = false)
+    private String name;
+
+    @Enumerated(EnumType.STRING)
+    @Column(nullable = false)
     private Status status;
+
+    @Column(name = "updated_at", nullable = false)
     private LocalDateTime updateAt;
 
-    public Reservation(Long id, String name, Long reservationSlotId, Status status, LocalDateTime updateAt) {
+    protected Reservation(){}
+
+    public Reservation(ReservationSlot reservationSlot, String name, Status status, LocalDateTime updateAt) {
         validateName(name);
-        this.id = id;
+        this.reservationSlot = reservationSlot;
         this.name = name;
-        this.reservationSlotId = reservationSlotId;
         this.status = status;
         this.updateAt = updateAt;
     }
@@ -41,10 +56,17 @@ public void promote() {
         this.status = Status.RESERVED;
     }
 
-    public void update(LocalDateTime now, long reservationSlotId, Status status) {
+    public void update(LocalDateTime now, Status status) {
         validateUpdateAt(now);
         validateNotCanceledStatus();
-        this.reservationSlotId = reservationSlotId;
+        this.status = status;
+        this.updateAt = now;
+    }
+
+    public void moveTo(ReservationSlot reservationSlot, LocalDateTime now, Status status) {
+        validateUpdateAt(now);
+        validateNotCanceledStatus();
+        this.reservationSlot = reservationSlot;
         this.status = status;
         this.updateAt = now;
     }
@@ -82,10 +104,6 @@ public String getName() {
         return name;
     }
 
-    public long getReservationSlotId() {
-        return reservationSlotId;
-    }
-
     public Status getStatus() {
         return status;
     }
@@ -94,15 +112,7 @@ public LocalDateTime getUpdateAt() {
         return updateAt;
     }
 
-    @Override
-    public boolean equals(Object o) {
-        if (o == null || getClass() != o.getClass()) return false;
-        Reservation that = (Reservation) o;
-        return reservationSlotId == that.reservationSlotId && Objects.equals(name, that.name);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(name, reservationSlotId);
+    public ReservationSlot getReservationSlot() {
+        return reservationSlot;
     }
 }

src/main/java/roomescape/domain/ReservationSlot.java

@@ -1,52 +1,84 @@
 package roomescape.domain;
 
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
 
+import jakarta.persistence.*;
 import roomescape.domain.vo.ReservationDeletion;
-import roomescape.domain.vo.ReservationSlotInfo;
-import roomescape.domain.vo.ReservationUpdate;
 import roomescape.exception.CustomException;
 import roomescape.exception.ErrorCode;
 
+@Entity
+@Table(
+        name = "reservation_slot",
+        uniqueConstraints = @UniqueConstraint(columnNames = {"date", "time_id", "theme_id"})
+)
 public class ReservationSlot {
-    private final ReservationSlotInfo slot;
-    private final List<Reservation> reservations;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
 
-    public ReservationSlot(ReservationSlotInfo slot, List<Reservation> reservations) {
-        this.slot = slot;
+    @Column(nullable = false)
+    private LocalDate date;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "time_id", nullable = false)
+    private Time time;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    @JoinColumn(name = "theme_id", nullable = false)
+    private Theme theme;
+
+    @OneToMany(mappedBy = "reservationSlot", cascade = CascadeType.PERSIST)
+    @OrderBy("updateAt ASC, id ASC")
+    private List<Reservation> reservations = new ArrayList<>();
+
+    protected ReservationSlot() {
+    }
+
+    public ReservationSlot(
+            LocalDate date,
+            Time time,
+            Theme theme,
+            List<Reservation> reservations
+    ) {
+        this.date = date;
+        this.time = time;
+        this.theme = theme;
         this.reservations = new ArrayList<>(reservations);
     }
 
     public Reservation reserve(String name, LocalDateTime now) {
         validateUniqueReservation(name);
         validateNotPastReservation(now, ErrorCode.PAST_DATE_RESERVATION);
 
-        Reservation newReservation = new Reservation(null, name, slot.slotId(), calculateStatus(), now);
-        reservations.add(newReservation);
-        return newReservation;
+        Reservation reservation = new Reservation(this, name, calculateStatus(), now);
+        reservations.add(reservation);
+        return reservation;
     }
 
     public Reservation moveIn(Reservation reservation, String name, LocalDateTime now) {
         validateReservationOwner(reservation, name);
         validateUniqueReservation(name);
         validateNotPastReservation(now, ErrorCode.UNALLOWED_UPDATE_PAST_RESERVATION);
 
-        reservation.update(now, slot.slotId(), calculateStatus());
+        reservation.moveTo(this, now, calculateStatus());
         reservations.add(reservation);
         return reservation;
     }
 
-    public ReservationUpdate moveOut(long reservationId, String name, LocalDateTime now) {
+    public Reservation moveOut(long reservationId, String name, LocalDateTime now) {
         Reservation reservation = findReservation(reservationId);
         validateReservationOwner(reservation, name);
         validateNotPastReservation(now, ErrorCode.UNALLOWED_UPDATE_PAST_RESERVATION);
 
-        Optional<Reservation> promotedReservation = promoteReservation(reservation);
+        promoteReservation(reservation);
         reservations.remove(reservation);
-        return new ReservationUpdate(reservation,promotedReservation);
+        return reservation;
     }
 
     private Status calculateStatus() {
@@ -100,7 +132,7 @@ private Reservation findReservation(long reservationId) {
     }
 
     private void validateNotPastReservation(LocalDateTime now, ErrorCode code) {
-        LocalDateTime reservationTime = LocalDateTime.of(slot.date(), slot.time().getStartAt());
+        LocalDateTime reservationTime = LocalDateTime.of(date, time.getStartAt());
         if (reservationTime.isBefore(now)) {
             throw new CustomException(code);
         }
@@ -121,7 +153,23 @@ private void validateUniqueReservation(String name) {
         }
     }
 
-    public ReservationSlotInfo getSlot() {
-        return slot;
+    public Long getId() {
+        return id;
+    }
+
+    public LocalDate getDate() {
+        return date;
+    }
+
+    public Time getTime() {
+        return time;
+    }
+
+    public Theme getTheme() {
+        return theme;
+    }
+
+    public List<Reservation> getReservations() {
+        return Collections.unmodifiableList(reservations);
     }
 }

src/main/java/roomescape/domain/Theme.java

@@ -2,15 +2,37 @@
 
 import java.util.Objects;
 
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
 import roomescape.exception.CustomException;
 import roomescape.exception.ErrorCode;
 
+@Entity
 public class Theme {
-    private final Long id;
-    private final String name;
-    private final String description;
-    private final String thumbnailUrl;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String name;
+    private String description;
+    private String thumbnailUrl;
 
+    // JPA용
+    protected Theme() {
+    }
+
+    // 사용자 생성
+    public Theme(String name, String description, String thumbnailUrl) {
+        validateNameLength(name);
+        validateDescriptionLength(description);
+        validateThumbnailUrlLength(thumbnailUrl);
+        this.name = name;
+        this.description = description;
+        this.thumbnailUrl = thumbnailUrl;
+    }
+
+    // JDBC → JPA 과정에서 깨지는 것을 방지하기 위한 코드로 곧 삭제 예정
     public Theme(Long id, String name, String description, String thumbnailUrl) {
         validateNameLength(name);
         validateDescriptionLength(description);
@@ -21,6 +43,7 @@ public Theme(Long id, String name, String description, String thumbnailUrl) {
         this.thumbnailUrl = thumbnailUrl;
     }
 
+
     private void validateNameLength(String name) {
         if (name.length() > 255) {
             throw new CustomException(ErrorCode.THEME_NAME_TOO_LONG);

src/main/java/roomescape/domain/Time.java

@@ -1,11 +1,24 @@
 package roomescape.domain;
 
+import jakarta.persistence.*;
+
 import java.time.LocalTime;
 
+@Entity
+@Table(name = "reservation_time")
 public class Time {
-    private final Long id;
-    private final LocalTime startAt;
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private LocalTime startAt;
+
+    protected Time(){}
+
+    public Time(LocalTime startAt) {
+        this.startAt = startAt;
+    }
 
+    // JDBC → JPA 과정에서 깨지는 것을 방지하기 위한 코드로 곧 삭제 예정
     public Time(Long id, LocalTime startAt) {
         this.id = id;
         this.startAt = startAt;
@@ -19,3 +32,4 @@ public LocalTime getStartAt() {
         return startAt;
     }
 }
+