release: 1.0.2

.gitignore

@@ -50,3 +50,7 @@ src/main/resources/application.yaml
 
 # P6Spy log
 spy.log
+
+### claude ###
+/claudedocs
+/CLAUDE.md

README.md

@@ -30,13 +30,7 @@
 
 <br>
 
-# 📋 API spec
-
-[**[바로(BARO) Swagger]**](https://api.s-baro.shop/swagger-ui/index.html#/)
-
-<br>
-
-# 📈 기술적 목표
+# 📈 목표 성능
 MAU 5만명, DAU 5,000명(DAU/MAU 비율 10%) 기준
 
 동시 접속자 수 : 500명(DAU/10)
@@ -45,7 +39,7 @@ MAU 5만명, DAU 5,000명(DAU/MAU 비율 10%) 기준
 
 <br>
 
-# 🤔 기술적 Issue
+# 🤔 Technical Issue
 [**[Part 1] JWT는 정말 괜찮은 방법일까? (Ft. 세션저장소 선택 이유)**](https://chobo-backend.tistory.com/50)
 
 [**[Part 2] 확장성과 성능을 고려한 ERD 설계하기**](https://chobo-backend.tistory.com/51)
@@ -54,6 +48,10 @@ MAU 5만명, DAU 5,000명(DAU/MAU 비율 10%) 기준
 
 [**[Part 4] 반복되는 인증,인가 처리 없애버리기(Ft. AOP & ArgumentResolver)**](https://chobo-backend.tistory.com/53)
 
-[**[Part 5] 주문 API 성능 개선 삽질기 (Ft. 목표 TPS 1666 vs 현실 187.4)**](https://chobo-backend.tistory.com/54)
+[**[Part 5] 단일 주문 기능 개선 삽질기 (Ft. TPS 54.9% 개선)**](https://chobo-backend.tistory.com/54)
 
 [**[Part 6] DeadLock 범인 찾기 (Ft. 위험한 FK?)**](https://chobo-backend.tistory.com/55)
+
+[**[Part 7] 일괄 주문 기능 74.6% 개선 (Ft. Eventual Consistency)**](https://chobo-backend.tistory.com/56)
+
+[**[Part 8] Redis의 Lua Script는 Atomic 하지 않다..?**](https://chobo-backend.tistory.com/57)

src/main/kotlin/com/dh/baro/core/ErrorMessage.kt

@@ -10,7 +10,7 @@ enum class ErrorMessage(val message: String) {
     URL_PARAMETER_ERROR("요청 URL 파라미터 검증에 실패했습니다."),
     MISSING_REQUEST_HEADER("필수 요청 헤더가 누락되었습니다"),
     METHOD_ARGUMENT_TYPE_MISMATCH("요청 파라미터 타입이 올바르지 않습니다."),
-    ALREADY_DISCONNECTED("클라이언트 연결이 중단되었습니다."),
+    ALREADY_DISCONNECTED("클라이언트 연결이 중단되었습니다.")  ,
     NO_RESOURCE_FOUND("요청한 리소스를 찾을 수 없습니다."),
     METHOD_NOT_SUPPORTED("허용되지 않은 메서드입니다."),
     MEDIA_TYPE_NOT_SUPPORTED("허용되지 않은 미디어 타입입니다."),
@@ -27,6 +27,7 @@ enum class ErrorMessage(val message: String) {
     INVALID_POPULAR_PRODUCT_CURSOR("cursorLikes와 cursorId는 함께 지정하거나 함께 생략해야 합니다."),
     OUT_OF_STOCK("재고가 모두 소진되었습니다.[id = %d]"),
     INSUFFICIENT_STOCK("일부 상품의 재고가 부족합니다."),
+    INVALID_STOCK_AMOUNT("잘못된 형식의 재고 수량입니다."),
     PRODUCT_NOT_FOUND_FOR_DEDUCTION("재고 차감할 상품을 찾을 수 없습니다: %d"),
     INVENTORY_RESTORE_ERROR("Redis 재고 복원 중 오류 발생: orderId=%d"),
     INVENTORY_RETRY_EXCEEDED("재고 초기화 재시도 횟수 초과: maxRetry=%d"),
@@ -41,6 +42,8 @@ enum class ErrorMessage(val message: String) {
 
     // Order
     ORDER_NOT_FOUND("주문을 찾을 수 없습니다: %d"),
+    ORDER_CONFIRM_INVALID_STATUS("주문 확정은 PENDING 상태에서만 가능합니다. 현재 상태: %s"),
+    ORDER_CONFIRM_NO_ITEMS("주문 항목이 없어 주문을 확정할 수 없습니다."),
 
     // Look
     LOOK_NOT_FOUND("룩을 찾을 수 없습니다: %d"),

src/main/kotlin/com/dh/baro/core/outbox/OutboxMessageScheduler.kt

@@ -8,7 +8,7 @@ class OutboxMessageScheduler(
     private val outboxBatchJob: OutboxBatchJob,
 ) {
 
-    @Scheduled(fixedDelay = 60_000) // 1분
+//    @Scheduled(fixedDelay = 60_000) // 1분
     fun runOutboxJob() {
         outboxBatchJob.run()
     }

src/main/kotlin/com/dh/baro/order/application/OrderFacade.kt

@@ -2,8 +2,8 @@ package com.dh.baro.order.application
 
 import com.dh.baro.identity.domain.service.UserService
 import com.dh.baro.order.domain.Order
-import com.dh.baro.order.domain.OrderQueryService
-import com.dh.baro.order.domain.OrderService
+import com.dh.baro.order.domain.service.OrderQueryService
+import com.dh.baro.order.domain.service.OrderService
 import com.dh.baro.order.domain.service.OrderServiceV2
 import com.dh.baro.order.presentation.dto.OrderCreateRequest
 import com.dh.baro.product.domain.InventoryItem

src/main/kotlin/com/dh/baro/order/domain/Order.kt

@@ -1,6 +1,7 @@
 package com.dh.baro.order.domain
 
 import com.dh.baro.core.BaseTimeEntity
+import com.dh.baro.core.ErrorMessage
 import com.dh.baro.core.IdGenerator
 import com.dh.baro.core.annotation.AggregateRoot
 import jakarta.persistence.*
@@ -26,7 +27,7 @@ class Order(
 
     @Enumerated(EnumType.STRING)
     @Column(name = "order_status", nullable = false, length = 20)
-    var status: OrderStatus = OrderStatus.ORDERED,
+    var status: OrderStatus = OrderStatus.PENDING,
 
     @OneToMany(
         mappedBy = "order",
@@ -49,6 +50,18 @@ class Order(
             .setScale(0, RoundingMode.HALF_UP)
     }
 
+    fun confirmOrder() {
+        if (status != OrderStatus.PENDING) {
+            throw IllegalStateException(ErrorMessage.ORDER_CONFIRM_INVALID_STATUS.format(status))
+        }
+
+        if (items.isEmpty()) {
+            throw IllegalStateException(ErrorMessage.ORDER_CONFIRM_NO_ITEMS.message)
+        }
+
+        status = OrderStatus.ORDERED
+    }
+
     companion object {
         fun newOrder(
             userId: Long,
@@ -59,7 +72,7 @@ class Order(
                 userId = userId,
                 totalPrice = BigDecimal.ZERO,
                 shippingAddress = shippingAddress,
-                status = OrderStatus.ORDERED,
+                status = OrderStatus.PENDING,
             )
     }
 }

src/main/kotlin/com/dh/baro/order/domain/OrderStatus.kt

@@ -1,6 +1,7 @@
 package com.dh.baro.order.domain
 
 enum class OrderStatus {
+    PENDING,
     ORDERED,
     PAID,
     SHIPPED,

src/main/kotlin/com/dh/baro/order/domain/OrderQueryService.kt → src/main/kotlin/com/dh/baro/order/domain/service/OrderQueryService.kt

@@ -1,6 +1,8 @@
-package com.dh.baro.order.domain
+package com.dh.baro.order.domain.service
 
 import com.dh.baro.core.ErrorMessage
+import com.dh.baro.order.domain.Order
+import com.dh.baro.order.domain.OrderRepository
 import org.springframework.data.domain.PageRequest
 import org.springframework.data.domain.Slice
 import org.springframework.stereotype.Service

src/main/kotlin/com/dh/baro/order/domain/OrderService.kt → src/main/kotlin/com/dh/baro/order/domain/service/OrderService.kt

@@ -1,9 +1,13 @@
-package com.dh.baro.order.domain
+package com.dh.baro.order.domain.service
 
 import com.dh.baro.core.ErrorMessage
 import com.dh.baro.core.exception.ConflictException
 import com.dh.baro.order.application.OrderCreateCommand
+import com.dh.baro.order.domain.Order
+import com.dh.baro.order.domain.OrderItem
+import com.dh.baro.order.domain.OrderRepository
 import com.dh.baro.product.domain.repository.ProductRepository
+import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 
@@ -54,4 +58,10 @@ class OrderService(
         )
         order.addItem(orderItem)
     }
+
+    fun confirmOrder(orderId: Long) {
+        val order = orderRepository.findByIdOrNull(orderId)
+            ?: throw IllegalArgumentException(ErrorMessage.ORDER_NOT_FOUND.format(orderId))
+        order.confirmOrder()
+    }
 }

src/main/kotlin/com/dh/baro/order/infra/InventoryEventBeforeListener.kt

@@ -0,0 +1,26 @@
+package com.dh.baro.order.infra
+
+import com.dh.baro.core.ErrorMessage
+import com.dh.baro.product.infra.event.InventoryDeductionRequestedEvent
+import com.dh.baro.product.infra.redis.InventoryRedisRepository
+import org.slf4j.LoggerFactory
+import org.springframework.stereotype.Component
+import org.springframework.transaction.event.TransactionPhase
+import org.springframework.transaction.event.TransactionalEventListener
+
+@Component
+class InventoryEventBeforeListener(
+    private val inventoryRedisRepository: InventoryRedisRepository,
+) {
+
+    private val log = LoggerFactory.getLogger(javaClass)
+
+//    @TransactionalEventListener(phase = TransactionPhase.AFTER_ROLLBACK)
+//    fun restoreInventoryOnRollback(event: InventoryDeductionRequestedEvent) {
+//        runCatching {
+//            inventoryRedisRepository.restoreStocks(event.items)
+//        }.onFailure { ex ->
+//            log.error(ErrorMessage.INVENTORY_RESTORE_ERROR.format(event.orderId), ex)
+//        }
+//    }
+}

src/main/kotlin/com/dh/baro/product/domain/service/InventoryService.kt

@@ -1,6 +1,7 @@
 package com.dh.baro.product.domain.service
 
 import com.dh.baro.core.ErrorMessage
+import com.dh.baro.core.exception.ConflictException
 import com.dh.baro.product.domain.InventoryItem
 import com.dh.baro.product.domain.repository.ProductRepository
 import com.dh.baro.product.infra.redis.InventoryRedisRepository
@@ -22,10 +23,10 @@ class InventoryService(
      */
     @Transactional
     fun deductStockFromDB(productId: Long, quantity: Int) {
-        val product = productRepository.findById(productId)
-            .orElseThrow { IllegalArgumentException(ErrorMessage.PRODUCT_NOT_FOUND_FOR_DEDUCTION.format(productId)) }
+        val updated = productRepository.deductStock(productId, quantity)
 
-        product.deductStock(quantity)
-        productRepository.save(product)
+        if (updated == 0) {
+            throw ConflictException(ErrorMessage.OUT_OF_STOCK.format(productId))
+        }
     }
 }

src/main/kotlin/com/dh/baro/product/infra/event/InventoryEventAfterListener.kt

@@ -0,0 +1,25 @@
+package com.dh.baro.product.infra.event
+
+import com.dh.baro.core.config.AsyncConfig.Companion.EVENT_ASYNC_TASK_EXECUTOR
+import com.dh.baro.order.domain.service.OrderService
+import com.dh.baro.product.domain.service.InventoryService
+import org.springframework.scheduling.annotation.Async
+import org.springframework.stereotype.Component
+import org.springframework.transaction.event.TransactionPhase
+import org.springframework.transaction.event.TransactionalEventListener
+
+@Component
+class InventoryEventAfterListener(
+    private val orderService: OrderService,
+    private val inventoryService: InventoryService,
+) {
+
+    @Async(EVENT_ASYNC_TASK_EXECUTOR)
+    @TransactionalEventListener(phase = TransactionPhase.AFTER_COMMIT)
+    fun handleInventoryDeductionEvent(event: InventoryDeductionRequestedEvent) {
+        event.items.forEach { item ->
+            inventoryService.deductStockFromDB(item.productId, item.quantity)
+        }
+        orderService.confirmOrder(event.orderId)
+    }
+}