[그리디] 정명준 Spring Data JPA 6단계 제출합니다.

src/main/java/roomescape/auth/repository/RefreshTokenRepository.java

@@ -1,18 +1,17 @@
 package roomescape.auth.repository;
 
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 import roomescape.auth.entity.RefreshToken;
 
 import java.util.Optional;
 
-public interface RefreshTokenRepository {
-
-    void save(RefreshToken refreshToken);
+@Repository
+public interface RefreshTokenRepository extends JpaRepository<RefreshToken, Long> {
 
     Optional<RefreshToken> findByToken(String token);
 
     Optional<RefreshToken> findByMemberId(Long memberId);
 
     void deleteByMemberId(Long memberId);
-
-    void flush();
 }

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

@@ -1,15 +1,13 @@
 package roomescape.member.repository;
 
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
 import roomescape.member.entity.Member;
 
 import java.util.Optional;
 
-public interface MemberRepository {
-
-    Member save(Member member);
-
-    Optional<Member> findById(Long memberId);
-
+@Repository
+public interface MemberRepository extends JpaRepository<Member, Long> {
     Optional<Member> findByEmailAndPassword(String email, String password);
 
     Optional<Member> findByName(String name);

src/main/java/roomescape/member/service/MemberService.java

@@ -11,7 +11,7 @@
 @Service
 @Transactional(readOnly = true)
 public class MemberService {
-    private MemberRepository memberRepository;
+    private final MemberRepository memberRepository;
 
     public MemberService(MemberRepository memberRepository) {
         this.memberRepository = memberRepository;

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

@@ -14,17 +14,21 @@
 import roomescape.reservation.dto.ReservationRequest;
 import roomescape.reservation.dto.ReservationResponse;
 import roomescape.reservation.service.ReservationService;
+import roomescape.waiting.service.WaitingService;
 
 import java.net.URI;
 import java.util.List;
+import java.util.stream.Stream;
 
 @RestController
 public class ReservationController {
 
     private final ReservationService reservationService;
+    private final WaitingService waitingService;
 
-    public ReservationController(ReservationService reservationService) {
+    public ReservationController(ReservationService reservationService, WaitingService waitingService) {
         this.reservationService = reservationService;
+        this.waitingService = waitingService;
     }
 
     @GetMapping("/reservations")
@@ -34,9 +38,13 @@ public List<ReservationResponse> list() {
 
     @GetMapping("/reservations-mine")
     public ResponseEntity<List<MyReservationResponse>> getUserReservations(@Login LoginMember loginMember) {
-        List<MyReservationResponse> responseList = reservationService.findReservationsByMember(loginMember);
-
-        return ResponseEntity.ok(responseList);
+        List<MyReservationResponse> responses = Stream.concat(
+                reservationService.findReservationsByMember(loginMember)
+                        .stream(),
+                waitingService.findWaitingsByMember(loginMember)
+                        .stream()
+        ).toList();
+        return ResponseEntity.ok(responses);
     }
 
     @PostMapping("/reservations")

src/main/java/roomescape/reservation/exception/ReservationErrorCode.java

@@ -0,0 +1,27 @@
+package roomescape.reservation.exception;
+
+import org.springframework.http.HttpStatus;
+import roomescape.exception.ErrorCode;
+
+public enum ReservationErrorCode implements ErrorCode {
+
+    DUPLICATE_RESERVATION(HttpStatus.CONFLICT, "해당 시간에 이미 예약이 존재합니다.");
+
+    private HttpStatus httpStatus;
+    private String message;
+
+    ReservationErrorCode(HttpStatus httpStatus, String message) {
+        this.httpStatus = httpStatus;
+        this.message = message;
+    }
+
+    @Override
+    public HttpStatus getHttpStatus() {
+        return httpStatus;
+    }
+
+    @Override
+    public String getMessage() {
+        return message;
+    }
+}

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

@@ -1,19 +1,37 @@
 package roomescape.reservation.repository;
 
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
 import roomescape.reservation.entity.Reservation;
+import roomescape.theme.entity.Theme;
+import roomescape.time.entity.Time;
 
 import java.time.LocalDate;
 import java.util.List;
 
-public interface ReservationRepository {
+@Repository
+public interface ReservationRepository extends JpaRepository<Reservation, Long> {
 
+    @Override
+    @Query("SELECT r FROM reservation r " +
+            "JOIN FETCH r.member " +
+            "JOIN FETCH r.time " +
+            "JOIN FETCH r.theme")
     List<Reservation> findAll();
 
-    List<Reservation> findAllByMemberId(Long memberId);
+    @Query("SELECT r FROM reservation r " +
+            "JOIN FETCH r.time " +
+            "JOIN FETCH r.theme " +
+            "WHERE r.member.id = :memberId")
+    List<Reservation> findAllByMemberId(@Param("memberId") Long memberId);
 
     List<Reservation> findByDateAndThemeId(LocalDate date, Long themeId);
 
-    Reservation save(Reservation reservation);
-
-    void deleteById(Long id);
+    boolean existsByDateAndTimeAndTheme(
+            @Param("date") LocalDate date,
+            @Param("time") Time time,
+            @Param("theme") Theme theme
+    );
 }

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

@@ -11,6 +11,7 @@
 import roomescape.reservation.dto.ReservationRequest;
 import roomescape.reservation.dto.ReservationResponse;
 import roomescape.reservation.entity.Reservation;
+import roomescape.reservation.exception.ReservationErrorCode;
 import roomescape.reservation.repository.ReservationRepository;
 import roomescape.theme.entity.Theme;
 import roomescape.theme.repository.ThemeRepository;
@@ -23,6 +24,7 @@
 @Service
 @Transactional(readOnly = true)
 public class ReservationService {
+
     private final ReservationRepository reservationRepository;
     private final MemberRepository memberRepository;
     private final TimeRepository timeRepository;
@@ -37,12 +39,14 @@ public ReservationService(ReservationRepository reservationRepository, MemberRep
 
     @Transactional
     public ReservationResponse create(ReservationRequest request, LoginMember loginMember) {
-        Member member = resolveMember(request, loginMember);
         LocalDate date = LocalDate.parse(request.getDate());
         Time time = timeRepository.findById(request.getTime())
                 .orElseThrow();
         Theme theme = themeRepository.findById(request.getTheme())
                 .orElseThrow();
+        validateDuplicateReservation(date, time, theme);
+
+        Member member = resolveMember(request, loginMember);
 
         Reservation reservation = new Reservation(member, date, time, theme);
         Reservation savedReservation = reservationRepository.save(reservation);
@@ -95,4 +99,10 @@ private Member resolveMember(ReservationRequest reservationRequest, LoginMember
         return memberRepository.findById(loginMember.id())
                 .orElseThrow(() -> new ApplicationException(MemberErrorCode.MEMBER_NOT_FOUND));
     }
+
+    private void validateDuplicateReservation(LocalDate date, Time time, Theme theme) {
+        if (reservationRepository.existsByDateAndTimeAndTheme(date, time, theme)) {
+            throw new ApplicationException(ReservationErrorCode.DUPLICATE_RESERVATION);
+        }
+    }
 }

src/main/java/roomescape/theme/entity/Theme.java

@@ -32,6 +32,10 @@ public Theme(String name, String description) {
         this.description = description;
     }
 
+    public void markDeleted() {
+        this.deleted = true;
+    }
+
     public Long getId() {
         return id;
     }