Merge pull request #15 from Kimjipang/round08

Round08

Author: Kimjipang

apps/commerce-api/build.gradle.kts

@@ -2,6 +2,7 @@ dependencies {
     // add-ons
     implementation(project(":modules:jpa"))
     implementation(project(":modules:redis"))
+    implementation(project(":modules:kafka"))
     implementation(project(":supports:jackson"))
     implementation(project(":supports:logging"))
     implementation(project(":supports:monitoring"))

apps/commerce-api/src/main/java/com/loopers/CommerceApiApplication.java

@@ -6,13 +6,15 @@
 import org.springframework.boot.context.properties.ConfigurationPropertiesScan;
 import org.springframework.cache.annotation.EnableCaching;
 import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.util.TimeZone;
 
 @ConfigurationPropertiesScan
 @SpringBootApplication
 @EnableCaching
 @EnableFeignClients
+@EnableScheduling
 public class CommerceApiApplication {
 
     @PostConstruct

apps/commerce-api/src/main/java/com/loopers/application/event/payment/PaymentEventHandler.java

@@ -0,0 +1,9 @@
+package com.loopers.application.event.payment;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Component;
+
+@Component
+@RequiredArgsConstructor
+public class PaymentEventHandler {
+}

apps/commerce-api/src/main/java/com/loopers/application/order/OrderCreatedEvent.java

@@ -1,4 +1,13 @@
 package com.loopers.application.order;
 
-public record OrderCreatedEvent(Long couponId) {
+import com.loopers.interfaces.api.payment.PaymentV1Dto;
+
+public record OrderCreatedEvent(
+        Long couponId,
+        String orderId,
+        PaymentV1Dto.CardTypeDto cardType,
+        String cardNo,
+        Long amount,
+        String callbackUrl
+) {
 }

apps/commerce-api/src/main/java/com/loopers/application/order/OrderFacade.java

@@ -12,6 +12,7 @@
 import com.loopers.domain.product.ProductRepository;
 import com.loopers.domain.user.UserRepository;
 import com.loopers.interfaces.api.order.OrderV1Dto;
+import com.loopers.interfaces.api.payment.PaymentV1Dto;
 import com.loopers.support.error.CoreException;
 import com.loopers.support.error.ErrorType;
 import lombok.RequiredArgsConstructor;
@@ -91,7 +92,7 @@ public OrderResultInfo createOrder(OrderV1Dto.OrderRequest request) {
                 .multiply(BigDecimal.valueOf(100 - rate))
                 .divide(BigDecimal.valueOf(100));
 
-        publisher.publishEvent(new OrderCreatedEvent(couponId));
+        publisher.publishEvent(new OrderCreatedEvent(couponId, null, null, null, null, null));
 
         Order order = request.toEntity(totalPrice);
         Order saved = orderRepository.save(order);
@@ -103,6 +104,15 @@ public OrderResultInfo createOrder(OrderV1Dto.OrderRequest request) {
                 .map(orderItem -> OrderItemInfo.from(orderItem, orderItem.getOrderPrice()))
                 .toList();
 
+        publisher.publishEvent(new OrderCreatedEvent(
+                couponId,
+                "1351039135",
+                PaymentV1Dto.CardTypeDto.HYUNDAI,
+                "1234-5678-9814-1451",
+                100000L,
+                "http://localhost:8080/api/v1/examples/callback"
+        ));
+
         return new OrderResultInfo(OrderInfo.from(saved), orderItemInfos);
     }
 }

apps/commerce-api/src/main/java/com/loopers/application/payment/PaymentFacade.java

@@ -1,5 +1,7 @@
 package com.loopers.application.payment;
 
+import com.loopers.domain.payment.Payment;
+import com.loopers.domain.payment.PaymentStatus;
 import com.loopers.infrastructure.payment.client.PgClient;
 import com.loopers.interfaces.api.ApiResponse;
 import com.loopers.interfaces.api.payment.PaymentV1Dto;
@@ -11,17 +13,28 @@
 @RequiredArgsConstructor
 public class PaymentFacade {
     private final PgClient pgClient;
+    private final PaymentRepository paymentRepository;
 
     @CircuitBreaker(name = "pgCircuit", fallbackMethod = "fallback")
-    public PaymentV1Dto.TransactionResponse requestPayment(String userId, PaymentV1Dto.PaymentRequest request) {
-        ApiResponse<PaymentV1Dto.TransactionResponse> result = pgClient.requestPayment(userId, request);
+    public PaymentV1Dto.TransactionResponse requestPayment(String userId, PaymentV1Dto.PgPaymentRequest pgPaymentRequest) {
+        ApiResponse<PaymentV1Dto.TransactionResponse> result = pgClient.requestPayment(userId, pgPaymentRequest);
 
         PaymentV1Dto.TransactionResponse response = result.data();
 
+        PaymentV1Dto.PaymentRequest paymentRequest = new PaymentV1Dto.PaymentRequest(
+                userId,
+                pgPaymentRequest.orderId(),
+                response.transactionKey(),
+                PaymentStatus.PENDING
+        );
+
+        Payment payment = Payment.create(paymentRequest);
+        paymentRepository.save(payment);
+
         return response;
     }
 
-    public PaymentV1Dto.TransactionResponse fallback(String userId, PaymentV1Dto.PaymentRequest request, Throwable throwable) {
+    public PaymentV1Dto.TransactionResponse fallback(String userId, PaymentV1Dto.PgPaymentRequest request, Throwable throwable) {
         return new PaymentV1Dto.TransactionResponse(
                 null,
                 PaymentV1Dto.TransactionStatusResponse.FAILED,

apps/commerce-api/src/main/java/com/loopers/application/payment/PaymentRepository.java

@@ -0,0 +1,7 @@
+package com.loopers.application.payment;
+
+import com.loopers.domain.payment.Payment;
+
+public interface PaymentRepository {
+    Payment save(Payment payment);
+}

apps/commerce-api/src/main/java/com/loopers/application/product/ProductFacade.java

@@ -1,16 +1,19 @@
 package com.loopers.application.product;
 
-import com.loopers.domain.actionlog.ActionType;
 import com.loopers.domain.brand.BrandRepository;
+import com.loopers.domain.outbox.AggregateType;
+import com.loopers.domain.outbox.OutboxEvent;
+import com.loopers.domain.outbox.OutboxType;
+import com.loopers.domain.outbox.OutboxRepository;
 import com.loopers.domain.product.Product;
 import com.loopers.domain.product.ProductRepository;
+import com.loopers.infrastructure.product.ProductViewKafkaProducer;
 import com.loopers.interfaces.api.product.ProductV1Dto;
 import com.loopers.support.error.CoreException;
 import com.loopers.support.error.ErrorType;
 import lombok.RequiredArgsConstructor;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
-import org.springframework.context.ApplicationEventPublisher;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -22,8 +25,8 @@
 public class ProductFacade {
     private final ProductRepository productRepository;
     private final BrandRepository brandRepository;
-    private final ApplicationEventPublisher publisher;
-
+    private final OutboxRepository outBoxRepository;
+    private final ProductViewKafkaProducer kafkaProducer;
 
     @Transactional
     public ProductInfo registerProduct(ProductV1Dto.ProductRequest request) {
@@ -49,15 +52,20 @@ public List<ProductInfo> findAllProducts() {
                 .toList();
     }
 
-    @Transactional(readOnly = true)
+    @Transactional
     @Cacheable(value = "product", key = "#id")
     public ProductInfo findProductById(Long id) {
         Product product = productRepository.findById(id).orElseThrow(
                 () -> new CoreException(ErrorType.NOT_FOUND, "찾고자 하는 상품이 존재하지 않습니다.")
         );
 
-        // 유저 ID는 임시로 하드 코딩했습니다. 추후 인증/인가 기능이 추가되면 수정할 예정입니다.
-        publisher.publishEvent(new UserActionEvent(1L, product.getId(), ActionType.PRODUCT_LOOKED_UP));
+        OutboxEvent outBoxEvent = OutboxEvent.of(
+                AggregateType.PRODUCT,
+                product.getId(),
+                OutboxType.PRODUCT_VIEWED
+        );
+
+        outBoxRepository.save(outBoxEvent);
 
         return ProductInfo.from(product);
     }

apps/commerce-api/src/main/java/com/loopers/domain/outbox/AggregateType.java

@@ -0,0 +1,7 @@
+package com.loopers.domain.outbox;
+
+public enum AggregateType {
+    PRODUCT,
+    ORDER,
+    USER
+}

apps/commerce-api/src/main/java/com/loopers/domain/outbox/OutboxEvent.java

@@ -0,0 +1,48 @@
+package com.loopers.domain.outbox;
+
+import com.loopers.domain.BaseEntity;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.Table;
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Entity
+@Table(name = "outbox")
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@Getter
+public class OutboxEvent extends BaseEntity {
+    @Enumerated(EnumType.STRING)
+    @Column(name = "aggregate_type", nullable = false)
+    private AggregateType aggregateType;
+
+    @Column(name = "aggregate_id", nullable = false)
+    private Long aggregateId;
+
+//    @Enumerated(EnumType.STRING)
+    @Column(name = "event_type", nullable = false)
+    private OutboxType eventType;
+
+    @Enumerated(EnumType.STRING)
+    @Column(name = "status", nullable = false)
+    private OutboxStatus status;
+
+    public OutboxEvent(AggregateType aggregateType, Long aggregateId, OutboxType eventType, OutboxStatus status) {
+        this.aggregateType = aggregateType;
+        this.aggregateId = aggregateId;
+        this.eventType = eventType;
+        this.status = status;
+    }
+
+    public static OutboxEvent of(AggregateType aggregateType, Long aggregateId, OutboxType eventType) {
+        return new OutboxEvent(aggregateType, aggregateId, eventType, OutboxStatus.PENDING);
+    }
+
+    public void markAsProcessed() {
+        this.status = OutboxStatus.PROCESSED;
+    }
+
+}