[Spring Data JPA] 김진학 미션 제출합니다.

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

@@ -4,5 +4,13 @@
 import org.springframework.data.repository.CrudRepository;
 
 public interface MemberRepository extends CrudRepository<Member, Long> {
+
+    default Member findByEmailOrThrow(String email) {
+        return findByEmail(email).orElseThrow(
+                () -> new IllegalArgumentException(String.format("Member not found: %s", email)));
+    }
+
+    Optional<Member> findByEmail(String email);
+
     Optional<Member> findByEmailAndPassword(String email, String password);
 }

src/main/java/roomescape/reservation/MyReservationResponse.java

@@ -0,0 +1,33 @@
+package roomescape.reservation;
+
+import roomescape.waiting.Waiting;
+import roomescape.waiting.WaitingWithRank;
+
+public record MyReservationResponse(
+        Long id,
+        String theme,
+        String date,
+        String time,
+        String status
+) {
+    public static MyReservationResponse from(Reservation reservation) {
+        return new MyReservationResponse(
+                reservation.getId(),
+                reservation.getTheme().getName(),
+                reservation.getDate(),
+                reservation.getTime().getValue(),
+                "예약");
+    }
+
+    public static MyReservationResponse from(WaitingWithRank waitingWithRank) {
+        Waiting waiting = waitingWithRank.getWaiting();
+        return new MyReservationResponse(
+                waiting.getId(),
+                waiting.getTheme().getName(),
+                waiting.getDate(),
+                waiting.getTime().getValue(),
+                waitingWithRank.getRank() + 1 + "번째 예약대기"
+        );
+    }
+}
+

src/main/java/roomescape/reservation/Reservation.java

@@ -6,6 +6,7 @@
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.ManyToOne;
+import roomescape.member.Member;
 import roomescape.theme.Theme;
 import roomescape.time.Time;
 
@@ -21,24 +22,18 @@ public class Reservation {
     private Time time;
     @ManyToOne(fetch = FetchType.LAZY)
     private Theme theme;
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Member member;
 
-    public Reservation(Long id, String name, String date, Time time, Theme theme) {
-        this.id = id;
-        this.name = name;
-        this.date = date;
-        this.time = time;
-        this.theme = theme;
+    public Reservation() {
     }
 
-    public Reservation(String name, String date, Time time, Theme theme) {
+    public Reservation(String name, String date, Time time, Theme theme, Member member) {
         this.name = name;
         this.date = date;
         this.time = time;
         this.theme = theme;
-    }
-
-    public Reservation() {
-
+        this.member = member;
     }
 
     public Long getId() {
@@ -60,4 +55,8 @@ public Time getTime() {
     public Theme getTheme() {
         return theme;
     }
+
+    public Member getMember() {
+        return member;
+    }
 }

src/main/java/roomescape/reservation/ReservationController.java

@@ -25,12 +25,16 @@ public List<ReservationResponse> list() {
         return reservationService.findAll();
     }
 
+    @GetMapping("/reservations-mine")
+    public ResponseEntity<List<MyReservationResponse>> readAllByMember(LoginMember loginMember) {
+        List<MyReservationResponse> response = reservationService.readAllByMember(loginMember.email());
+        return ResponseEntity.ok(response);
+    }
+
     @PostMapping("/reservations")
     public ResponseEntity create(@RequestBody ReservationRequest reservationRequest, LoginMember loginMember) {
-        reservationRequest.checkName(loginMember.name());
-        ReservationResponse reservation = reservationService.save(reservationRequest);
-
-        return ResponseEntity.created(URI.create("/reservations/" + reservation.getId())).body(reservation);
+        ReservationResponse reservation = reservationService.save(reservationRequest, loginMember.email());
+        return ResponseEntity.created(URI.create("/reservations/" + reservation.id())).body(reservation);
     }
 
     @DeleteMapping("/reservations/{id}")

src/main/java/roomescape/reservation/ReservationRepository.java

@@ -1,12 +1,23 @@
 package roomescape.reservation;
 
 import java.util.List;
-import org.springframework.data.jpa.repository.Query;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.EntityGraph;
 import org.springframework.data.repository.CrudRepository;
+import roomescape.member.Member;
+import roomescape.theme.Theme;
+import roomescape.time.Time;
 
 public interface ReservationRepository extends CrudRepository<Reservation, Long> {
-    @Query("SELECT r FROM Reservation r JOIN FETCH r.theme JOIN FETCH r.time")
+
+    @EntityGraph(attributePaths = {"member"})
+    Optional<Reservation> findWithMemberByDateAndTimeAndTheme(String date, Time time, Theme theme);
+
+    @EntityGraph(attributePaths = {"time", "theme"})
     List<Reservation> findAll();
 
+    @EntityGraph(attributePaths = {"time", "theme"})
+    List<Reservation> findByMember(Member member);
+
     List<Reservation> findByDateAndThemeId(String date, Long themeId);
 }

src/main/java/roomescape/reservation/ReservationRequest.java

@@ -1,43 +1,17 @@
 package roomescape.reservation;
 
-public class ReservationRequest {
-    private String name;
-    private String date;
-    private Long theme;
-    private Long time;
-
-    public ReservationRequest(String name, String date, Long theme, Long time) {
+public record ReservationRequest(
+        String name,
+        String date,
+        Long theme,
+        Long time
+) {
+    public ReservationRequest {
         validateDate(date);
         validateTheme(theme);
         validateTime(time);
-        this.name = name;
-        this.date = date;
-        this.theme = theme;
-        this.time = time;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getDate() {
-        return date;
-    }
-
-    public Long getTheme() {
-        return theme;
     }
-
-    public Long getTime() {
-        return time;
-    }
-
-    public void checkName(String name) {
-        if (this.name == null) {
-            this.name = name;
-        }
-    }
-
+
     private void validateDate(String date) {
         if (date == null) {
             throw new IllegalArgumentException("Invalid date");

src/main/java/roomescape/reservation/ReservationResponse.java

@@ -1,37 +1,19 @@
 package roomescape.reservation;
 
-public class ReservationResponse {
-    private Long id;
-    private String name;
-    private String theme;
-    private String date;
-    private String time;
-
-    public ReservationResponse(Long id, String name, String theme, String date, String time) {
-        this.id = id;
-        this.name = name;
-        this.theme = theme;
-        this.date = date;
-        this.time = time;
-    }
-
-    public Long getId() {
-        return id;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getTheme() {
-        return theme;
-    }
-
-    public String getDate() {
-        return date;
-    }
-
-    public String getTime() {
-        return time;
+public record ReservationResponse(
+        Long id,
+        String name,
+        String theme,
+        String date,
+        String time
+) {
+    public static ReservationResponse from(Reservation reservation) {
+        return new ReservationResponse(
+                reservation.getId(),
+                reservation.getName(),
+                reservation.getTheme().getName(),
+                reservation.getDate(),
+                reservation.getTime().getValue()
+        );
     }
 }

src/main/java/roomescape/reservation/ReservationService.java

@@ -1,36 +1,56 @@
 package roomescape.reservation;
 
 import java.util.List;
+import java.util.Optional;
+import java.util.stream.Stream;
 import org.springframework.stereotype.Service;
+import roomescape.member.Member;
+import roomescape.member.MemberRepository;
 import roomescape.theme.Theme;
 import roomescape.theme.ThemeRepository;
 import roomescape.time.Time;
 import roomescape.time.TimeRepository;
+import roomescape.waiting.WaitingRepository;
 
 @Service
 public class ReservationService {
     private final ReservationRepository reservationRepository;
     private final TimeRepository timeRepository;
     private final ThemeRepository themeRepository;
+    private final MemberRepository memberRepository;
+    private final WaitingRepository waitingRepository;
 
     public ReservationService(ReservationRepository reservationRepository, TimeRepository timeRepository,
-                              ThemeRepository themeRepository) {
+                              ThemeRepository themeRepository, MemberRepository memberRepository,
+                              WaitingRepository waitingRepository) {
         this.reservationRepository = reservationRepository;
         this.timeRepository = timeRepository;
         this.themeRepository = themeRepository;
+        this.memberRepository = memberRepository;
+        this.waitingRepository = waitingRepository;
     }
 
-    public ReservationResponse save(ReservationRequest reservationRequest) {
-        Time time = timeRepository.findByIdOrThrow(reservationRequest.getTime());
-        Theme theme = themeRepository.findByIdOrThrow(reservationRequest.getTime());
-        Reservation reservation = new Reservation(reservationRequest.getName(), reservationRequest.getDate(), time,
-                theme);
+    public List<MyReservationResponse> readAllByMember(String email) {
+        Member member = memberRepository.findByEmailOrThrow(email);
+        List<MyReservationResponse> reservations = reservationRepository.findByMember(member).stream()
+                .map(MyReservationResponse::from).toList();
+        List<MyReservationResponse> waitings = waitingRepository.findAllWithRankByMemberId(member.getId()).stream()
+                .map(MyReservationResponse::from).toList();
+        return List.copyOf(Stream.concat(reservations.stream(), waitings.stream()).toList());
+    }
+
+    public ReservationResponse save(ReservationRequest reservationRequest, String email) {
+        Member member = memberRepository.findByEmailOrThrow(email);
+        Time time = timeRepository.findByIdOrThrow(reservationRequest.time());
+        Theme theme = themeRepository.findByIdOrThrow(reservationRequest.theme());
+
+        Reservation reservation = new Reservation(
+                Optional.ofNullable(reservationRequest.name()).orElse(member.getName()), reservationRequest.date(),
+                time, theme, member);
 
         Reservation savedReservation = reservationRepository.save(reservation);
 
-        return new ReservationResponse(savedReservation.getId(), savedReservation.getName(),
-                savedReservation.getTheme().getName(), savedReservation.getDate(),
-                savedReservation.getTime().getValue());
+        return ReservationResponse.from(savedReservation);
     }
 
     public void deleteById(Long id) {
@@ -39,8 +59,7 @@ public void deleteById(Long id) {
 
     public List<ReservationResponse> findAll() {
         return reservationRepository.findAll().stream()
-                .map(it -> new ReservationResponse(it.getId(), it.getName(), it.getTheme().getName(), it.getDate(),
-                        it.getTime().getValue()))
+                .map(ReservationResponse::from)
                 .toList();
     }
 }

src/main/java/roomescape/waiting/Waiting.java

@@ -0,0 +1,57 @@
+package roomescape.waiting;
+
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.ManyToOne;
+import roomescape.member.Member;
+import roomescape.theme.Theme;
+import roomescape.time.Time;
+
+@Entity
+public class Waiting {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+    private String name;
+    private String date;
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Time time;
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Theme theme;
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Member member;
+
+    public Waiting() {
+    }
+
+    public Waiting(String name, String date, Time time, Theme theme, Member member) {
+        this.name = name;
+        this.date = date;
+        this.time = time;
+        this.theme = theme;
+        this.member = member;
+    }
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getDate() {
+        return date;
+    }
+
+    public Time getTime() {
+        return time;
+    }
+
+    public Theme getTheme() {
+        return theme;
+    }
+}