Feat: 실제 재고 서비스 구현

.github/workflows/gradle.yml

@@ -0,0 +1,39 @@
+name: Gradle Build
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v3
+
+      - name: Setup Gradle
+        uses: gradle/actions/setup-gradle@v4
+        with:
+          gradle-version: 7.5
+          cache-read-only: false  # 캐싱을 활성화합니다.
+
+      - name: Cache Gradle dependencies
+        uses: actions/cache@v3
+        with:
+          path: ~/.gradle/caches
+          key: ${{ runner.os }}-gradle-${{ hashFiles('**/*.gradle*', '**/gradle-wrapper.properties') }}
+          restore-keys: |
+            ${{ runner.os }}-gradle-
+      - name: Build Order Service
+        working-directory: ./order-service
+        run: ./gradlew build -x test
+
+      - name: Build Payment Service
+        working-directory: ./payment-service
+        run: ./gradlew build -x test
+
+      - name: Build Stock Service
+        working-directory: ./stock-service
+        run: ./gradlew build -x test

README.md

@@ -14,3 +14,12 @@
   <img src="https://user-images.githubusercontent.com/76584547/184909421-26ff2788-6037-47c4-bedc-d36186a52672.png"/>
 </p>
 
+### 실제 재고 서비스 구현
+
+#### Notion 정리
+- https://chanjin0000.notion.site/MSA-12ed19350581803990c9cdef6b0fe24a?pvs=73
+
+#### 변경후 아키텍처
+<p align="center">
+  <img src="https://github.com/user-attachments/assets/b4570fb3-5e3e-425e-a940-d765ce2567f6"/>
+</p>

order-service/src/main/java/pir/order/api/OrderController.java

@@ -1,9 +1,8 @@
 package pir.order.api;
 
+import lombok.Getter;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import pir.order.service.OrderService;
 
 @RestController
@@ -12,7 +11,12 @@ public class OrderController {
     private final OrderService orderService;
 
     @PostMapping("/order")
-    public void order(@RequestParam String productId){
+    public void order(@RequestParam Long productId){
         orderService.order(productId);
     }
+    @GetMapping("/order/{orderId}")
+    public Long getProductId(@PathVariable Long orderId){
+        return orderService.getProductId(orderId);
+    }
+
 }

order-service/src/main/java/pir/order/domain/Order.java

@@ -1,23 +1,23 @@
 package pir.order.domain;
 
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+
 import javax.persistence.*;
 
 @Entity
 @Table(name = "orders")
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
 public class Order {
 
-    @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    private String productId;
-
-    public Order() {
-    }
+    private Long productId;
 
-    public Order(String productId) {
+    public Order(Long productId) {
         this.productId = productId;
     }
-
-    public Long getId() {
-        return id;
-    }
 }

order-service/src/main/java/pir/order/domain/OrderRepository.java → order-service/src/main/java/pir/order/repository/OrderRepository.java

@@ -1,6 +1,7 @@
-package pir.order.domain;
+package pir.order.repository;
 
 import org.springframework.data.jpa.repository.JpaRepository;
+import pir.order.domain.Order;
 
 public interface OrderRepository extends JpaRepository<Order, Long> {
 }

order-service/src/main/java/pir/order/service/OrderService.java

@@ -4,7 +4,7 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 import pir.order.domain.Order;
-import pir.order.domain.OrderRepository;
+import pir.order.repository.OrderRepository;
 import pir.order.producer.StockProducer;
 
 @Slf4j
@@ -14,14 +14,21 @@ public class OrderService {
     private final OrderRepository orderRepository;
     private final StockProducer stockProducer;
 
-    public void order(String productId){
+    public void order(Long productId){
         final Order order = new Order(productId);
         final Order newOrder = orderRepository.save(order);
         stockProducer.order(newOrder.getId());
+        log.info("{}번 주문번호 생성", newOrder.getId());
+        log.info("{}번 상품 주문", productId);
     }
 
     public void delete(Long orderId){
         orderRepository.deleteById(orderId);
         log.info("{}번 주문번호 삭제", orderId);
     }
+
+    public Long getProductId(Long orderId){
+        Order order = orderRepository.findById(orderId).orElseThrow(()->new IllegalArgumentException("주문번호가 없습니다."));
+        return order.getProductId();
+    }
 }

stock-service/build.gradle

@@ -19,8 +19,12 @@ repositories {
 }
 
 dependencies {
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.kafka:spring-kafka'
+	implementation 'mysql:mysql-connector-java'
+	//webflux
+	implementation 'org.springframework.boot:spring-boot-starter-webflux'
 	compileOnly 'org.projectlombok:lombok'
 	annotationProcessor 'org.projectlombok:lombok'
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'

stock-service/src/main/java/pir/stock/api/StockController.java

@@ -0,0 +1,22 @@
+package pir.stock.api;
+
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import pir.stock.dto.CreateStockDto;
+import pir.stock.service.StockService;
+
+@RestController
+@RequiredArgsConstructor
+@RequestMapping("/stock")
+public class StockController {
+    private final StockService stockService;
+
+    @PostMapping("")
+    public void createStock(@RequestBody CreateStockDto createStockDto){
+        stockService.createStock(createStockDto.getProductId(), createStockDto.getAmount());
+    }
+
+}

stock-service/src/main/java/pir/stock/configuration/WebClientConfig.java

@@ -0,0 +1,18 @@
+package pir.stock.configuration;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.reactive.function.client.WebClient;
+
+@Configuration
+public class WebClientConfig {
+
+    public static final String BASE_URL = "http://localhost:8080";
+
+    @Bean
+    public WebClient webClient() {
+        return WebClient.builder()
+                .baseUrl(BASE_URL)
+                .build();
+    }
+}

stock-service/src/main/java/pir/stock/consumer/OrderCreatedConsumer.java

@@ -15,9 +15,16 @@ public class OrderCreatedConsumer {
     @KafkaListener(topics = "order-create", groupId = "group-01")
     public void decrease(Long orderId){
         try {
-            stockService.decrease(orderId);
+
+            stockService.getProductIdByOrderService(orderId)
+                            .subscribe(
+                                    stockService::decrease,
+                                    error -> log.error("error : {}", error.getMessage())
+                            );
+
             stockService.payment(orderId);
         }catch (Exception e){
+            log.error("======== error : {} ======== ", e.getMessage());
             log.error("======== [Rollback] stock-rollback, orderId :{} ======== ", orderId);
             stockService.rollbackCreatedOrder(orderId);
         }

stock-service/src/main/java/pir/stock/consumer/RollbackConsumer.java

@@ -13,9 +13,15 @@ public class RollbackConsumer {
     private final StockService stockService;
 
     @KafkaListener(topics = "stock-rollback", groupId = "group-01")
-    public void rollbackDecreaseStock(Long orderId){
+    public void rollbackDecreaseStock(Long orderId) {
         log.error("======== [Rollback] stock-rollback, orderId :{} ======== ", orderId);
-        stockService.increase(orderId);
+
+        stockService.getProductIdByOrderService(orderId)
+                .subscribe(
+                        stockService::increase,
+                        error -> log.error("error : {}", error.getMessage())
+                );
+
         stockService.rollbackCreatedOrder(orderId);
     }
 

stock-service/src/main/java/pir/stock/domain/Stock.java

@@ -0,0 +1,36 @@
+package pir.stock.domain;
+
+import lombok.AccessLevel;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.DynamicUpdate;
+
+import javax.persistence.*;
+
+@Entity
+@Table(name = "stocks")
+@Getter
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@DynamicUpdate
+public class Stock {
+
+        @Id
+        @GeneratedValue(strategy = GenerationType.IDENTITY)
+        @Column(name = "id", nullable = false, updatable = false, unique = true)
+        private Long id;
+        @Column(name = "product_id", nullable = false)
+        private Long productId;
+        @Column(name = "stock")
+        private int stock;
+
+        public Stock(Long productId, int stock) {
+            this.productId = productId;
+            this.stock = stock;
+        }
+        public void decrease(){
+            this.stock--;
+        }
+        public void increase(){
+            this.stock++;
+        }
+}

stock-service/src/main/java/pir/stock/dto/CreateStockDto.java

@@ -0,0 +1,9 @@
+package pir.stock.dto;
+
+import lombok.Getter;
+
+@Getter
+public class CreateStockDto {
+    private Long productId;
+    private int amount;
+}

stock-service/src/main/java/pir/stock/repository/StockRepository.java

@@ -0,0 +1,7 @@
+package pir.stock.repository;
+
+import org.springframework.data.jpa.repository.JpaRepository;
+import pir.stock.domain.Stock;
+
+public interface StockRepository extends JpaRepository<Stock, Long> {
+}

stock-service/src/main/java/pir/stock/service/StockService.java

@@ -3,29 +3,62 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+import org.springframework.web.reactive.function.client.WebClient;
+import pir.stock.domain.Stock;
 import pir.stock.producer.OrderProducer;
 import pir.stock.producer.PaymentProducer;
+import pir.stock.repository.StockRepository;
+import reactor.core.publisher.Mono;
+
+import javax.transaction.Transactional;
 
 @Slf4j
 @Service
 @RequiredArgsConstructor
 public class StockService {
     private final PaymentProducer paymentProducer;
     private final OrderProducer orderProducer;
+    private final StockRepository stockRepository;
+
+    private final WebClient webClient;
+
+    public Mono<Long> getProductIdByOrderService(Long orderId) {
+        return webClient.get()
+                .uri("/order/{orderId}", orderId)
+                .retrieve()
+                .bodyToMono(Long.class);
+    }
 
-    public void decrease(Long orderId){
-        log.info("{}번 상품 재고 -1", orderId);
+    @Transactional
+    public void decrease(Long productId) {
+        Stock stock = stockRepository.findById(productId).orElseThrow(() -> new IllegalArgumentException("해당 상품이 존재하지 않습니다."));
+        if (stock.getStock() <= 0) {
+            log.info("{}번 상품 재고 부족", productId);
+            throw new IllegalArgumentException("재고가 부족합니다.");
+        } else {
+            stock.decrease();
+            log.info("{}번 상품 재고 -1", productId);
+        }
     }
 
-    public void increase(Long orderId){
-        log.info("{}번 상품 재고 +1", orderId);
+    @Transactional
+    public void increase(Long productId) {
+        Stock stock = stockRepository.findById(productId).orElseThrow(() -> new IllegalArgumentException("해당 상품이 존재하지 않습니다."));
+        stock.increase();
+        log.info("{}번 상품 재고 +1", productId);
     }
 
-    public void payment(Long orderId){
+    public void payment(Long orderId) {
         paymentProducer.payment(orderId);
+        log.info("{}번 주문 결제", orderId);
     }
 
-    public void rollbackCreatedOrder(Long orderId){
+    public void rollbackCreatedOrder(Long orderId) {
         orderProducer.rollbackCreatedOrder(orderId);
     }
+
+    public void createStock(Long productId, int amount) {
+        Stock stock = new Stock(productId, amount);
+        stockRepository.save(stock);
+    }
 }