-
Notifications
You must be signed in to change notification settings - Fork 3
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
54 changed files
with
838 additions
and
488 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
37 changes: 37 additions & 0 deletions
37
src/main/java/com/woowa/woowakit/domain/order/domain/OrderPayService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
package com.woowa.woowakit.domain.order.domain; | ||
|
||
import org.springframework.stereotype.Component; | ||
|
||
import com.woowa.woowakit.domain.order.exception.InvalidPayRequestException; | ||
import com.woowa.woowakit.domain.order.exception.OrderNotFoundException; | ||
import com.woowa.woowakit.domain.order.exception.PayFailedException; | ||
|
||
import io.micrometer.core.annotation.Counted; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
import reactor.core.scheduler.Schedulers; | ||
|
||
@Slf4j | ||
@Component | ||
@RequiredArgsConstructor | ||
public class OrderPayService { | ||
|
||
private final PaymentClient paymentClient; | ||
private final OrderRepository orderRepository; | ||
private final PayResultHandler payResultHandler; | ||
|
||
@Counted("order.payment.request") | ||
public void pay(final Long orderId, final String paymentKey) { | ||
log.info("결제 요청 subscribe event: {}", paymentKey); | ||
|
||
Order order = orderRepository.findById(orderId).orElseThrow(OrderNotFoundException::new); | ||
|
||
paymentClient.validatePayment(paymentKey, order.getUuid(), order.getTotalPrice()) | ||
.publishOn(Schedulers.boundedElastic()) | ||
.doOnSuccess(ignore -> payResultHandler.save(orderId, paymentKey)) | ||
.doOnError(error -> payResultHandler.rollback(orderId, error)) | ||
.onErrorMap(IllegalArgumentException.class, InvalidPayRequestException::new) | ||
.onErrorMap(IllegalStateException.class, PayFailedException::new) | ||
.block(); | ||
} | ||
} |
62 changes: 62 additions & 0 deletions
62
src/main/java/com/woowa/woowakit/domain/order/domain/OrderPlaceService.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,62 @@ | ||
package com.woowa.woowakit.domain.order.domain; | ||
|
||
import java.util.List; | ||
|
||
import org.springframework.stereotype.Service; | ||
import org.springframework.transaction.annotation.Transactional; | ||
|
||
import com.woowa.woowakit.domain.auth.domain.AuthPrincipal; | ||
import com.woowa.woowakit.domain.cart.domain.CartItemRepository; | ||
import com.woowa.woowakit.domain.order.exception.OrderNotFoundException; | ||
import com.woowa.woowakit.domain.product.domain.product.Product; | ||
import com.woowa.woowakit.domain.product.domain.product.ProductRepository; | ||
|
||
import io.micrometer.core.annotation.Counted; | ||
import lombok.RequiredArgsConstructor; | ||
import lombok.extern.slf4j.Slf4j; | ||
|
||
@Service | ||
@RequiredArgsConstructor | ||
@Slf4j | ||
public class OrderPlaceService { | ||
|
||
private final OrderRepository orderRepository; | ||
private final CartItemRepository cartItemRepository; | ||
private final ProductRepository productRepository; | ||
|
||
@Transactional | ||
@Counted("order.order") | ||
public void place(final AuthPrincipal authPrincipal, final Long orderId) { | ||
log.info("주문 수량 확보 및 장바구니 삭제 memberId: {} orderId: {}", authPrincipal.getId(), orderId); | ||
Order order = getOrderById(authPrincipal.getId(), orderId); | ||
|
||
order.place(); | ||
subtractProductQuantity(order); | ||
deleteCartItems(order); | ||
} | ||
|
||
private void deleteCartItems(final Order order) { | ||
List<Long> productIds = order.collectProductIds(); | ||
cartItemRepository.deleteAllByProductIdAndMemberId(order.getMemberId(), productIds); | ||
log.info("장바구니 상품 삭제 memberId: {} productIds: {}", order.getMemberId(), productIds); | ||
} | ||
|
||
private void subtractProductQuantity(final Order order) { | ||
List<Product> products = productRepository.findByIdsWithPessimistic(order.collectProductIds()); | ||
QuantityOfProducts quantityData = QuantityOfProducts.from(order); | ||
|
||
for (Product product : products) { | ||
log.info("상품 {}의 수량을 {}만큼 감소시킵니다. 현재 상품 수량: {}", | ||
product.getId(), quantityData.getFrom(product), product.getQuantity().getValue()); | ||
|
||
product.subtractQuantity(quantityData.getFrom(product)); | ||
|
||
log.info("상품 {}의 수량이 {}로 변경되었습니다.", product.getId(), product.getQuantity().getValue()); | ||
} | ||
} | ||
|
||
private Order getOrderById(final Long memberId, final Long orderId) { | ||
return orderRepository.findByIdAndMemberId(orderId, memberId) | ||
.orElseThrow(OrderNotFoundException::new); | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -4,5 +4,5 @@ | |
|
||
@Getter | ||
public enum OrderStatus { | ||
ORDERED, | ||
ORDERED, PLACED, CANCELED, PAYED, | ||
} |
Oops, something went wrong.