[CHORE]: develop 브랜치 최신 변경사항 main 반영

src/main/java/com/eatsfine/eatsfine/domain/booking/controller/BookingController.java

@@ -4,6 +4,7 @@
 import com.eatsfine.eatsfine.domain.booking.dto.response.BookingResponseDTO;
 import com.eatsfine.eatsfine.domain.booking.service.BookingCommandService;
 import com.eatsfine.eatsfine.domain.booking.service.BookingQueryService;
+import com.eatsfine.eatsfine.domain.booking.status.BookingSuccessStatus;
 import com.eatsfine.eatsfine.domain.user.entity.User;
 import com.eatsfine.eatsfine.domain.user.repository.UserRepository;
 import com.eatsfine.eatsfine.global.apiPayload.ApiResponse;
@@ -50,7 +51,7 @@ public ApiResponse<BookingResponseDTO.AvailableTableListDTO> getAvailableTables(
 
     @Operation(summary = "예약 생성" ,
             description = "가게,날짜,시간,인원,테이블 정보를 입력받아 예약을 생성합니다.")
-    @PostMapping("stores/{storeId}/bookings")
+    @PostMapping("/stores/{storeId}/bookings")
     public ApiResponse<BookingResponseDTO.CreateBookingResultDTO> createBooking(
             @PathVariable Long storeId,
             @RequestBody @Valid BookingRequestDTO.CreateBookingDTO dto
@@ -60,15 +61,42 @@ public ApiResponse<BookingResponseDTO.CreateBookingResultDTO> createBooking(
         return ApiResponse.onSuccess(bookingCommandService.createBooking(user, storeId, dto));
     }
 
-    @Operation(summary = "결제 완료 처리",
-            description = "결제 완료 후 결제 정보를 입력받아 예약 상태를 업데이트합니다.")
-    @PatchMapping("/bookings/{bookingId}/payments-confirm")
-    public ApiResponse<BookingResponseDTO.ConfirmPaymentResultDTO> confirmPayment(
-            @PathVariable Long bookingId,
-            @RequestBody @Valid BookingRequestDTO.PaymentConfirmDTO dto
-    ) {
+    //불필요한 api 삭제
+//    @Operation(summary = "예약 완료 처리",
+//            description = "결제 완료 후 결제 정보를 입력받아 예약 상태를 업데이트합니다. 주의) 외부에서 이 API를 호출하지 않고  " +
+//                    "POST /api/v1/payments/confirm API 호출 후 내부적으로 이 API의 로직을 실행합니다.")
+//    @PatchMapping("/bookings/{bookingId}/payments-confirm")
+//    public ApiResponse<BookingResponseDTO.ConfirmPaymentResultDTO> confirmPayment(
+//            @PathVariable Long bookingId,
+//            @RequestBody @Valid BookingRequestDTO.PaymentConfirmDTO dto
+//    ) {
+//
+//        return ApiResponse.onSuccess(bookingCommandService.confirmPayment(bookingId,dto));
+//    }
 
-        return ApiResponse.onSuccess(bookingCommandService.confirmPayment(bookingId,dto));
+    @Operation(summary = "예약 취소",
+    description = "예약을 취소하고 환불을 진행합니다.")
+    @PatchMapping("/bookings/{bookingId}/cancel")
+    public ApiResponse<BookingResponseDTO.CancelBookingResultDTO> cancelBooking(
+        @PathVariable Long bookingId,
+        @RequestBody @Valid BookingRequestDTO.CancelBookingDTO dto
+    ) {
+        return ApiResponse.of(BookingSuccessStatus._BOOKING_CANCELED,
+            bookingCommandService.cancelBooking(bookingId, dto));
     }
 
+
+    @Operation(summary = "예약 내역 조회",
+            description = "마이페이지에서 나의 예약 내역을 조회합니다.")
+    @GetMapping("/users/bookings")
+    public ApiResponse<BookingResponseDTO.BookingPreviewListDTO> getMyBookings(
+            @RequestParam(name = "status", required = false) String status,
+            @RequestParam(name = "page", defaultValue = "1") Integer page
+    ) {
+        User user = userRepository.findById(1L).orElseThrow(); // 임시로 임의의 유저 사용
+
+        // 서비스 호출 시 page - 1을 넘겨서 0-based index로 맞춰줍니다.
+        return ApiResponse.of(BookingSuccessStatus._BOOKING_FOUND,
+                bookingQueryService.getBookingList(user, status, page-1));
+    }
 }

src/main/java/com/eatsfine/eatsfine/domain/booking/converter/BookingConverter.java

@@ -1,4 +1,32 @@
 package com.eatsfine.eatsfine.domain.booking.converter;
 
+import com.eatsfine.eatsfine.domain.booking.dto.response.BookingResponseDTO;
+import com.eatsfine.eatsfine.domain.booking.entity.Booking;
+import com.eatsfine.eatsfine.domain.payment.dto.response.PaymentResponseDTO;
+import com.eatsfine.eatsfine.domain.store.entity.Store;
+
+import java.math.BigDecimal;
+import java.util.List;
+
 public class BookingConverter {
+
+    public static BookingResponseDTO.CreateBookingResultDTO toCreateBookingResultDTO(
+            Booking booking, Store store, BigDecimal totalDeposit,
+            List<BookingResponseDTO.BookingResultTableDTO> resultTableDTOS,
+            PaymentResponseDTO.PaymentRequestResultDTO paymentInfo) {
+
+        return BookingResponseDTO.CreateBookingResultDTO.builder()
+                .bookingId(booking.getId())
+                .storeName(store.getStoreName())
+                .date(booking.getBookingDate())
+                .time(booking.getBookingTime())
+                .partySize(booking.getPartySize())
+                .status(booking.getStatus().name())
+                .totalDeposit(totalDeposit)
+                .createdAt(booking.getCreatedAt())
+                .tables(resultTableDTOS)
+                .paymentId(paymentInfo.paymentId())
+                .orderId(paymentInfo.orderId())
+                .build();
+    }
 }

src/main/java/com/eatsfine/eatsfine/domain/booking/dto/request/BookingRequestDTO.java

@@ -35,12 +35,23 @@ public record CreateBookingDTO(
             @NotNull @DateTimeFormat(pattern = "HH:mm") LocalTime time,
             @NotNull @Min(1) Integer partySize,
             @NotNull List<Long> tableIds,
-            @NotNull boolean isSplitAccepted
+            @NotNull boolean isSplitAccepted,
+            @NotNull List<MenuOrderDto> menuItems
+    ){}
+
+    public record MenuOrderDto(
+            @NotNull Long menuId,
+            @NotNull @Min(1) Integer quantity
     ){}
 
     public record PaymentConfirmDTO(
             @NotBlank String paymentKey, //결제 고유 키
             @NotNull Integer amount //실제 결제 금액
     ){}
 
+    public record CancelBookingDTO(
+            @NotBlank String reason //예약 취소 사유
+
+    ){}
+
 }

src/main/java/com/eatsfine/eatsfine/domain/booking/dto/response/BookingResponseDTO.java

@@ -1,7 +1,9 @@
 package com.eatsfine.eatsfine.domain.booking.dto.response;
 
+import com.eatsfine.eatsfine.domain.booking.enums.BookingStatus;
 import lombok.Builder;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -42,9 +44,11 @@ public record CreateBookingResultDTO(
             LocalDate date,
             LocalTime time,
             Integer partySize,
-            Integer totalDeposit,
+            BigDecimal totalDeposit,
             List<BookingResultTableDTO> tables,
-            LocalDateTime createdAt // 예약 생성 시간
+            LocalDateTime createdAt, // 예약 생성 시간
+            Long paymentId,  // 결제 ID
+            String orderId // 주문 ID
     ){}
 
     @Builder
@@ -61,6 +65,40 @@ public record ConfirmPaymentResultDTO(
             Long bookingId,
             String status,         // CONFIRMED
             String paymentKey,     // PG사 결제 키
-            Integer amount        // 최종 결제 금액
+            BigDecimal amount        // 최종 결제 금액
+    ){}
+
+    @Builder
+    public record CancelBookingResultDTO(
+            Long bookingId,
+            String status,         // CANCELED
+            String cancelReason,   // 취소 사유
+            LocalDateTime canceledAt, // 취소 시간
+            BigDecimal refundAmount    // 환불 금액
+    ){}
+
+    @Builder
+    public record BookingPreviewListDTO(
+            List<BookingPreviewDTO> bookingList,
+            Integer listSize,
+            Integer totalPage,
+            Long totalElements,
+            Boolean isFirst,
+            Boolean isLast
+
+    ){}
+
+    @Builder
+    public record BookingPreviewDTO(
+            Long bookingId,
+            String storeName,
+            String storeAddress,
+            LocalDate bookingDate,
+            LocalTime bookingTime,
+            Integer partySize,
+            String tableNumbers,
+            BigDecimal amount,
+            String paymentMethod,
+            String status
     ){}
 }

src/main/java/com/eatsfine/eatsfine/domain/booking/entity/Booking.java

@@ -1,15 +1,20 @@
 package com.eatsfine.eatsfine.domain.booking.entity;
 
+import com.eatsfine.eatsfine.domain.booking.entity.mapping.BookingMenu;
 import com.eatsfine.eatsfine.domain.booking.entity.mapping.BookingTable;
 import com.eatsfine.eatsfine.domain.booking.enums.BookingStatus;
 import com.eatsfine.eatsfine.domain.payment.entity.Payment;
+import com.eatsfine.eatsfine.domain.payment.enums.PaymentStatus;
+import com.eatsfine.eatsfine.domain.payment.exception.PaymentException;
+import com.eatsfine.eatsfine.domain.payment.status.PaymentErrorStatus;
 import com.eatsfine.eatsfine.domain.store.entity.Store;
 import com.eatsfine.eatsfine.domain.storetable.entity.StoreTable;
 import com.eatsfine.eatsfine.domain.user.entity.User;
 import com.eatsfine.eatsfine.global.entity.BaseEntity;
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.math.BigDecimal;
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.ArrayList;
@@ -60,8 +65,20 @@ public class Booking extends BaseEntity {
     private LocalTime bookingTime;
 
     @Enumerated(EnumType.STRING)
+    @Column(name = "status", length = 20, nullable = false)
     private BookingStatus status;
 
+    @Builder.Default
+    @OneToMany(mappedBy = "booking", cascade = CascadeType.ALL, orphanRemoval = true)
+    private List<BookingMenu> bookingMenus = new ArrayList<>();
+
+    public void addBookingMenu(BookingMenu bookingMenu) {
+        this.bookingMenus.add(bookingMenu);
+        if (bookingMenu.getBooking() != this) {
+            bookingMenu.confirmBooking(this);
+        }
+    }
+
     public void addBookingTable(StoreTable storeTable) {
         BookingTable bookingTable = BookingTable.builder()
                 .booking(this)
@@ -70,10 +87,30 @@ public void addBookingTable(StoreTable storeTable) {
         this.bookingTables.add(bookingTable);
     }
 
-    private Integer depositAmount;
+    private BigDecimal depositAmount;
+
+    private String cancelReason;
 
     public void confirm() {
         this.status = BookingStatus.CONFIRMED;
     }
 
+    public void cancel(String cancelReason)
+    {
+        this.status = BookingStatus.CANCELED;
+        this.cancelReason = cancelReason;
+    }
+
+    //예약과 관련된 결제 중 결제 완료된 결제키 조회
+    public String getSuccessPaymentKey() {
+        return this.payments.stream()
+                .filter(p -> p.getPaymentStatus() == PaymentStatus.COMPLETED)
+                .map(Payment::getPaymentKey)
+                .findFirst()
+                .orElseThrow(() -> new PaymentException(PaymentErrorStatus._PAYMENT_NOT_FOUND));
+    }
+
+    public void setDepositAmount(BigDecimal totalDeposit) {
+        this.depositAmount = totalDeposit;
+    }
 }

src/main/java/com/eatsfine/eatsfine/domain/booking/entity/mapping/BookingMenu.java

@@ -0,0 +1,34 @@
+package com.eatsfine.eatsfine.domain.booking.entity.mapping;
+
+import com.eatsfine.eatsfine.domain.booking.entity.Booking;
+import com.eatsfine.eatsfine.domain.menu.entity.Menu;
+import jakarta.persistence.*;
+import lombok.*;
+
+import java.math.BigDecimal;
+
+@Entity
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor
+@Getter
+@Builder
+public class BookingMenu {
+
+    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long id;
+
+    private Integer quantity;
+
+    private BigDecimal price;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Booking booking;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    private Menu menu;
+
+    public void confirmBooking(Booking booking) {
+        this.booking = booking;
+    }
+
+}

src/main/java/com/eatsfine/eatsfine/domain/booking/enums/BookingStatus.java

@@ -2,5 +2,5 @@
 
 public enum BookingStatus {
 
-    PENDING, CONFIRMED, COMPLETED, CANCELLED, NOSHOW
+    PENDING, CONFIRMED, COMPLETED, CANCELED, NOSHOW
 }

src/main/java/com/eatsfine/eatsfine/domain/booking/repository/BookingRepository.java

@@ -1,14 +1,20 @@
 package com.eatsfine.eatsfine.domain.booking.repository;
 
 import com.eatsfine.eatsfine.domain.booking.entity.Booking;
+import com.eatsfine.eatsfine.domain.booking.enums.BookingStatus;
+import com.eatsfine.eatsfine.domain.user.entity.User;
+import org.springframework.data.domain.Page;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.repository.query.Param;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Query;
+import org.springframework.stereotype.Repository;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.List;
 
+@Repository
 public interface BookingRepository extends JpaRepository<Booking, Long> {
 
 
@@ -34,4 +40,19 @@ public interface BookingRepository extends JpaRepository<Booking, Long> {
             "AND b.bookingTime = :time " +
             "AND b.status IN ('CONFIRMED', 'PENDING')")
     boolean existsBookingByTableAndDateTime(@Param("tableId") Long tableId, @Param("date") LocalDate date, @Param("time") LocalTime time);
+
+
+    // 1. 특정 유저의 모든 예약을 최신순으로 페이징 조회
+    @Query("select b from Booking b join fetch b.store where b.user = :user")
+    Page<Booking> findAllByUser(@Param("user") User user, Pageable pageable);
+
+    @Query("Select b from Booking b join fetch b.store where b.user = :user and b.status = :status")
+    Page<Booking> findAllByUserAndStatus(@Param("user") User user, @Param("status") BookingStatus status, Pageable pageable);
+    @Query("SELECT COUNT(bt) > 0 FROM BookingTable bt " +
+            "JOIN bt.booking b " +
+            "WHERE bt.storeTable.id = :tableId " +
+            "AND (b.bookingDate > :currentDate " +
+            "     OR (b.bookingDate = :currentDate AND b.bookingTime >= :currentTime)) " +
+            "AND b.status IN ('CONFIRMED', 'PENDING')")
+    boolean existsFutureBookingByTable(@Param("tableId") Long tableId, @Param("currentDate") LocalDate currentDate, @Param("currentTime") LocalTime currentTime);
 }

src/main/java/com/eatsfine/eatsfine/domain/booking/service/BookingCommandService.java

@@ -14,4 +14,7 @@ public interface BookingCommandService {
     BookingResponseDTO.CreateBookingResultDTO createBooking(User user, Long storeId, BookingRequestDTO.CreateBookingDTO dto);
 
     BookingResponseDTO.ConfirmPaymentResultDTO confirmPayment(Long BookingId, BookingRequestDTO.PaymentConfirmDTO dto);
+
+    BookingResponseDTO.CancelBookingResultDTO cancelBooking(Long bookingId, BookingRequestDTO.CancelBookingDTO dto);
+
 }