Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
import com.ticketPing.order.domain.model.entity.OrderSeat;
import com.ticketPing.order.domain.model.enums.OrderStatus;
import com.ticketPing.order.domain.repository.OrderRepository;
import com.ticketPing.order.presentation.request.CreateOrderRequest;
import exception.ApplicationException;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
Expand Down Expand Up @@ -36,7 +37,10 @@ public class OrderService {
private final PerformanceClient performanceClient;

@Transactional
public OrderResponse createOrder(UUID scheduleId, UUID seatId, UUID userId) {
public OrderResponse createOrder(CreateOrderRequest createOrderRequest, UUID userId) {
UUID scheduleId = createOrderRequest.scheduleId();
UUID seatId = createOrderRequest.seatId();

validateDuplicateOrder(seatId);
OrderSeatResponse orderData = performanceClient.getOrderInfo(userId, scheduleId, seatId).getBody().getData();
Order order = saveOrderWithOrderSeat(userId, orderData);
Expand Down Expand Up @@ -108,5 +112,4 @@ private void publishForQueueTokenRemoval(UUID userId, UUID performanceId) {
val event = OrderCompletedForQueueTokenRemovalEvent.create(userId, performanceId);
eventApplicationService.publishForQueueTokenRemoval(event);
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.ticketPing.order.application.dtos.OrderResponse;
import com.ticketPing.order.application.service.OrderService;
import org.springframework.data.domain.Page;
import com.ticketPing.order.presentation.request.CreateOrderRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.domain.Slice;
import org.springframework.http.ResponseEntity;
Expand All @@ -11,7 +11,6 @@
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.*;

import java.util.List;
import java.util.UUID;

import static response.CommonResponse.success;
Expand All @@ -27,10 +26,9 @@ public class OrderController {
@Operation(summary = "예매 좌석 생성")
@PostMapping
public ResponseEntity<CommonResponse<OrderResponse>> createOrder(@RequestHeader("X_USER_ID") UUID userId,
@RequestParam("performanceId") UUID performanceId,
@RequestParam("scheduleId") UUID scheduleId,
@RequestParam("seatId") UUID seatId) {
OrderResponse orderResponse = orderService.createOrder(scheduleId, seatId, userId);
@RequestParam("performanceId") UUID performanceId,
@RequestBody CreateOrderRequest createOrderRequest) {
OrderResponse orderResponse = orderService.createOrder(createOrderRequest, userId);
return ResponseEntity
.status(201)
.body(success(orderResponse));
Expand All @@ -49,8 +47,8 @@ public ResponseEntity<CommonResponse<Slice<OrderResponse>>> getUserReservation(@
@Operation(summary = "주문 정보 검증")
@PostMapping("/{orderId}/validate")
public ResponseEntity<CommonResponse<Object>> validateOrder(@RequestHeader("X_USER_ID") UUID userId,
@RequestParam("performanceId") UUID performanceId,
@PathVariable("orderId") UUID orderId) {
@RequestParam("performanceId") UUID performanceId,
@PathVariable("orderId") UUID orderId) {
orderService.validateOrderAndExtendTTL(orderId, userId);
return ResponseEntity
.status(200)
Expand Down
Loading