주문서버에 사전예약 리스너 빈 등록

service/order/dto/src/main/java/dto/OrderCreateRequest.java

@@ -0,0 +1,18 @@
+package dto;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.List;
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderCreateRequest {
+  private String orderType;
+  private List<OrderProductInfo> orderProductInfos = new ArrayList<>();
+  private BigDecimal pointPrice;
+  private Long addressId;
+}

service/order/dto/src/main/java/dto/OrderProductInfo.java

@@ -0,0 +1,14 @@
+package dto;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
+@Getter
+@AllArgsConstructor
+@NoArgsConstructor
+public class OrderProductInfo {
+  private String productId;
+  private int quantity;
+  private Long userCouponId;
+}

service/order/server/build.gradle

@@ -34,6 +34,7 @@ dependencies {
     implementation project(':service:product:product_dto')
     implementation project(':service:auth:auth_dto')
     implementation project(':service:payment:payment_dto')
+    implementation project(':service:order:dto')
 
     implementation 'org.springframework.boot:spring-boot-starter-validation'
     implementation 'mysql:mysql-connector-java:8.0.33'

service/order/server/src/main/java/com/sparta/order/server/infrastructure/messaging/PreOrderConsumer.java

@@ -0,0 +1,29 @@
+package com.sparta.order.server.infrastructure.messaging;
+
+import com.sparta.common.domain.entity.KafkaTopicConstant;
+import com.sparta.order.server.application.service.OrderCreateService;
+import dto.OrderCreateRequest;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.kafka.annotation.KafkaListener;
+import org.springframework.messaging.handler.annotation.Header;
+import org.springframework.messaging.handler.annotation.Payload;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+@Service
+@RequiredArgsConstructor
+@Transactional
+@Slf4j(topic = "PreOrderConsumer")
+public class PreOrderConsumer {
+  public final OrderCreateService orderCreateService;
+
+  @KafkaListener(topics = KafkaTopicConstant.PROCESS_PREORDER, groupId = "product")
+  public void consume(
+      @Payload OrderCreateRequest request,
+      @Header(name = "kafka_receivedMessageKey") String userId) {
+    log.info("preorder by {}", userId);
+    orderCreateService.createOrder(Long.parseLong(userId), request);
+    log.info("process preorder : {}", request.getOrderProductInfos().get(0).getProductId());
+  }
+}

service/product/server/src/main/java/com/sparta/product/application/preorder/PreOrderFacadeService.java

@@ -6,7 +6,7 @@
 import com.sparta.product.infrastructure.messaging.PreOrderProducer;
 import com.sparta.product.presentation.exception.ProductErrorCode;
 import com.sparta.product.presentation.exception.ProductServerException;
-import dto.OrderDto.OrderCreateRequest;
+import dto.OrderCreateRequest;
 import java.time.LocalDateTime;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
@@ -23,8 +23,10 @@ public class PreOrderFacadeService {
   public void preOrder(Long preOrderId, Long addressId, Long userId) {
     PreOrder preOrder = preOrderService.findPreOrderByPreOrderId(preOrderId);
     preOrderLockService.reservation(preOrderId, userId);
-    OrderCreateRequest createRequest = PreOrderMapper.toDto(preOrderId, addressId);
-    preOrderProducer.send(KafkaTopicConstant.PROCESS_PREORDER, preOrderId, createRequest);
+    OrderCreateRequest createRequest =
+        PreOrderMapper.toDto(preOrder.getProductId().toString(), addressId);
+    preOrderProducer.send(
+        KafkaTopicConstant.PROCESS_PREORDER, Long.toString(userId), createRequest);
   }
 
   private void validatePreOrder(PreOrder preOrder) {

service/product/server/src/main/java/com/sparta/product/application/preorder/PreOrderMapper.java

@@ -2,8 +2,8 @@
 
 import com.sparta.product.domain.model.PreOrder;
 import com.sparta.product.presentation.request.PreOrderCreateRequest;
-import dto.OrderDto.OrderCreateRequest;
-import dto.OrderDto.OrderProductInfo;
+import dto.OrderCreateRequest;
+import dto.OrderProductInfo;
 import java.util.List;
 
 public class PreOrderMapper {
@@ -18,8 +18,8 @@ public static PreOrder toEntity(PreOrderCreateRequest request) {
         .build();
   }
 
-  public static OrderCreateRequest toDto(Long preOrderId, Long addressId) {
-    OrderProductInfo orderProduct = new OrderProductInfo(preOrderId.toString(), 1, null);
+  public static OrderCreateRequest toDto(String productId, Long addressId) {
+    OrderProductInfo orderProduct = new OrderProductInfo(productId, 1, null);
     return new OrderCreateRequest("PREORDER", List.of(orderProduct), null, addressId);
   }
 }

service/product/server/src/main/java/com/sparta/product/infrastructure/messaging/PreOrderProducer.java

@@ -1,6 +1,6 @@
 package com.sparta.product.infrastructure.messaging;
 
-import dto.OrderDto.OrderCreateRequest;
+import dto.OrderCreateRequest;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.kafka.core.KafkaTemplate;
@@ -10,8 +10,10 @@
 public class PreOrderProducer {
   private final KafkaTemplate<String, Object> kafkaTemplate;
 
-  public void send(String topic, Long preOrderId, OrderCreateRequest request) {
-    kafkaTemplate.send(topic, preOrderId.toString(), request);
-    log.info("send preorderRequest of {} to order server", preOrderId);
+  public void send(String topic, String userId, OrderCreateRequest request) {
+    kafkaTemplate.send(topic, userId, request);
+    log.info(
+        "send preorderRequest of {} to order server",
+        request.getOrderProductInfos().get(0).getProductId());
   }
 }

service/product/server/src/main/java/com/sparta/product/infrastructure/utils/ProductSearchDto.java

@@ -24,7 +24,6 @@ public class ProductSearchDto {
   private BigDecimal originalPrice;
   private BigDecimal discountedPrice;
   private Double discountPercent;
-  private Integer stock;
   private String description;
   private String thumbnailImgUrl;
   private double averageRating;
@@ -47,7 +46,6 @@ private ProductSearchDto(
       BigDecimal originalPrice,
       BigDecimal discountedPrice,
       Double discountPercent,
-      Integer stock,
       String description,
       String thumbnailImgUrl,
       double averageRating,
@@ -67,7 +65,6 @@ private ProductSearchDto(
     this.originalPrice = originalPrice;
     this.discountedPrice = discountedPrice;
     this.discountPercent = discountPercent;
-    this.stock = stock;
     this.description = description;
     this.thumbnailImgUrl = thumbnailImgUrl;
     this.averageRating = averageRating;
@@ -91,7 +88,6 @@ public static ProductSearchDto toDto(ProductResponse product) {
         .originalPrice(product.getOriginalPrice())
         .discountedPrice(product.getDiscountedPrice())
         .discountPercent(product.getDiscountPercent())
-        .stock(product.getStock())
         .description(product.getDescription())
         .thumbnailImgUrl(product.getThumbnailImgUrl())
         .averageRating(product.getAverageRating())

service/search/server/src/main/java/com/sparta/server/domain/ProductSearchDto.java

@@ -12,8 +12,7 @@
 @Document(indexName = "sasaping-ecommerce-products")
 public class ProductSearchDto {
 
-  @Id
-  private String productId;
+  @Id private String productId;
   private Long categoryId;
   private String productName;
   private String brandName;
@@ -22,7 +21,6 @@ public class ProductSearchDto {
   private BigDecimal originalPrice;
   private BigDecimal discountedPrice;
   private Double discountPercent;
-  private Integer stock;
   private String description;
   private String thumbnailImgUrl;
   private double averageRating;
@@ -33,6 +31,4 @@ public class ProductSearchDto {
   private Long salesCount;
   private boolean isDeleted;
   private String createdAt;
-
-
 }