Dev

.github/workflows/code-analyze-sonarqube.yml

@@ -12,6 +12,7 @@ on:
       - 'src/**'
   push:
     branches:
+      - main
       - dev
     paths:
       - 'src/**'

README.md

@@ -0,0 +1,94 @@
+# Invest Future
+> 만약에 이때(<strong>IF</strong>) 투자했다면 지금 얼마를 벌었을까? <br/>
+>
+> 항상 저희는 상상을 하곤 합니다. ~~(이 때 돈 넣었으면 지금 4배는 벌었는데)~~<br/>
+> 하지만 현실은 돈이 부족하기 떄문에 투자를 하기 쉽지 않습니다. <br/>
+> <br/>
+> IF에서는 모의투자를 통해 투자에 대한 경험을 쌓고, 투자에 대한 이해를 높일 수 있습니다. <br/>
+ <br/>
+- 배포 URL : https://investfuture.my  
+<br/><br/>
+
+## 다른 모의투자 서비스와의 차이점
+ 많은 모의투자서비스는 3가지 유형이 있습니다.
+ 1. 턴제 모의투자
+ 2. 실시간 모의투자 (거래가 차트에 반영되지 않음)
+ 3. 자체 시장 모의투자 (거래가 차트에 반영 됨)
+  <br/>
+
+<table>
+  <thead>
+    <tr>
+      <td align="center"><img width="350" alt="Image" src="https://github.com/user-attachments/assets/5d346565-4660-467b-8df3-e8112b2e0c9c" /></td>
+      <td align="center"><img width="350" alt="Image" src="https://github.com/user-attachments/assets/466f8d9c-253a-40a3-afad-e46cddbcbdc8" /></td>
+      <td align="center"><img width="350" alt="Image" src="https://github.com/user-attachments/assets/d116963b-423b-4aee-a416-81e0d479d4c8" /></td>
+    </tr>
+  </thead>
+  <tbody>
+    <tr>
+      <th align="center"><strong>시장 개입 여부</strong></th>
+      <th align="center"><strong>DB 지원 여부</strong></th>
+      <th align="center"><strong>봇 지원 여부</strong></th>
+    </tr>
+  </tbody>
+</table>
+
+
+기존 모의투자 서비스는 실제 거래소의 시세를 지원하면 사용자의 투자 행동이 차트에 반영되지 않거나,<br/>
+차트에 반영되지만 실제 시장과는 다른 자체 시장을 형성하는 서비스가 제공되고 있습니다.
+
+ Invest Future(<strong>IF</strong>)는 실제 시장의 추세를 따라가고, 사용자의 투자 행동이 차트에 반영되는 모의투자 서비스입니다.
+
+
+<br/>
+<br/>
+
+
+## How it works?
+
+> 기존 실시간 모의투자 서비스에서 사용자의 투자 행동이 차트에 반영되지 않는 이유는 사용자의 투자 행동이 차트에 반영될경우 시간이 지날수록 실제 시장의 차트와 모의투자 서비스의 차트의 괴리가 커지기 때문입니다. <br/>
+> 비유하자면 시간이 지날수록 멀티버스가 발생합니다.
+
+<img width="1348" alt="Image" src="https://github.com/user-attachments/assets/a850a73f-b77e-4765-877b-fb31782ad22c" />
+Invest Future(<strong>IF</strong>)는 사용자의 투자 행동으로 서비스의 차트와 실제 시장의 차트의 괴리가 커지면 <u>자체 매수봇과 매도봇이 매수 매도를 하면서 <strong>실제 시장과의 차이를 보간</strong></u>합니다.
+
+
+
+
+## 프로젝트 특징
+
+<img width="2903" alt="Image" src="https://github.com/user-attachments/assets/d74aea6f-c605-48b6-b77b-42cb9be8565c" />
+
+### 세부 로직
+<details>
+<summary><b> 주문/체결</b></summary>
+<blockquote>
+	<img width="1400" alt="Image" src="https://github.com/user-attachments/assets/8e604703-8bb3-43b3-9d2a-e72ab53a3e6b" />
+	<p dir="auto"><strong>설명</strong> :  </p>
+</blockquote>
+</details>
+
+<details>
+<summary><b> 보간 </b></summary>
+<blockquote>
+	<img width="1200" alt="Image" src="https://github.com/user-attachments/assets/56e01e3a-a878-4921-ae40-692845d7989f" />
+	<p dir="auto"><strong>설명</strong> :  </p>
+</blockquote>
+</details>
+
+<details>
+<summary><b> 차트/DB </b></summary>
+<blockquote>
+	<img width="1500" alt="Image" src="https://github.com/user-attachments/assets/3a1850c1-54c9-46cc-b99d-dc0fbf59cd36" />
+	<p dir="auto"><strong>설명</strong> :  </p>
+</blockquote>
+</details>
+
+
+
+## 1차 구현 [5.2 ~ 5.15]
+
+코인 한 개(트럼프 코인)을 매수 할 수 있습니다.
+사용자의 주문에 따라 그래프차트와 호가창, 실시간 체결창에 반영됩니다.
+
+https://github.com/user-attachments/assets/779b77f1-e778-4a53-b37f-d79a2dc187e8

src/main/java/com/cleanengine/coin/chart/handler/TradeEventHandler.java

@@ -12,8 +12,8 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
-import org.springframework.context.event.EventListener;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionalEventListener;
 
 @Component
 @RequiredArgsConstructor
@@ -25,7 +25,7 @@ public class TradeEventHandler {
     private final RealTimeDataPrevRateService realTimeDataPrevRateService;
     //event로 이벤틀 처리해야한다.
     //eventListener는 void로 처리를 해야한다
-    @EventListener
+    @TransactionalEventListener
     public void handleTradeEvent(TradeExecutedEvent event) {
         Trade trade = event.getTrade();
         if (trade == null) {

src/main/java/com/cleanengine/coin/order/application/OrderRestoreService.java

@@ -38,6 +38,6 @@ public void run(ApplicationArguments args) throws Exception {
     protected void restoreOrder(Order order){
         WaitingOrders waitingOrders = waitingOrdersManager.getWaitingOrders(order.getTicker());
         waitingOrders.addOrder(order);
-        updateOrderBookUsecase.updateOrderBookOnNewOrder(order);
+        updateOrderBookUsecase.updateOrderBookOnRestored(order);
     }
 }

src/main/java/com/cleanengine/coin/orderbook/application/service/OrderBookService.java

@@ -25,12 +25,21 @@ public class OrderBookService implements UpdateOrderBookUsecase, ReadOrderBookUs
 
     @Override
     public void updateOrderBookOnNewOrder(Order order) {
+        addToOrderBook(order, order.getOrderSize());
+    }
+
+    @Override
+    public void updateOrderBookOnRestored(Order order) {
+        addToOrderBook(order, order.getRemainingSize());
+    }
+
+    private void addToOrderBook(Order order, double size) {
         if(order.getIsMarketOrder()){return;}
         String ticker = order.getTicker();
         activeOrders(ticker).saveOrder(order);
 
         boolean isBuyOrder = order instanceof BuyOrder;
-        orderBookDomainService.updateOrderBookOnNewOrder(ticker, isBuyOrder, order.getPrice(), order.getRemainingSize());
+        orderBookDomainService.updateOrderBookOnNewOrder(ticker, isBuyOrder, order.getPrice(), size);
 
         sendOrderBookUpdated(ticker);
     }

src/main/java/com/cleanengine/coin/orderbook/application/service/UpdateOrderBookUsecase.java

@@ -5,5 +5,6 @@
 // TODO 메서드 parameter가 비슷한 스타일이어야 한다.
 public interface UpdateOrderBookUsecase {
     void updateOrderBookOnNewOrder(Order order);
+    void updateOrderBookOnRestored(Order order);
     void updateOrderBookOnTradeExecuted(String ticker, Long buyOrderId, Long sellOrderId, Double orderSize);
 }

src/main/java/com/cleanengine/coin/order/adapter/in/event/SpringOrderCreatedUpdateOrderBookHandler.java → src/main/java/com/cleanengine/coin/orderbook/infra/SpringOrderCreatedUpdateOrderBookHandler.java

@@ -1,8 +1,9 @@
-package com.cleanengine.coin.order.adapter.in.event;
+package com.cleanengine.coin.orderbook.infra;
 
 import com.cleanengine.coin.order.application.event.OrderCreated;
 import com.cleanengine.coin.orderbook.application.service.UpdateOrderBookUsecase;
 import lombok.RequiredArgsConstructor;
+import org.springframework.core.annotation.Order;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.event.TransactionalEventListener;
 
@@ -11,6 +12,7 @@
 public class SpringOrderCreatedUpdateOrderBookHandler {
     private final UpdateOrderBookUsecase updateOrderBookUsecase;
 
+    @Order(1)
     @TransactionalEventListener
     public void handleOrderCreated(OrderCreated event) {
         updateOrderBookUsecase.updateOrderBookOnNewOrder(event.order());

src/main/java/com/cleanengine/coin/trade/application/TradeExecutedNotificationHandler.java

@@ -0,0 +1,53 @@
+package com.cleanengine.coin.trade.application;
+
+import com.cleanengine.coin.trade.entity.Trade;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.messaging.simp.SimpMessagingTemplate;
+import org.springframework.stereotype.Component;
+import org.springframework.transaction.event.TransactionalEventListener;
+
+import static com.cleanengine.coin.common.CommonValues.BUY_ORDER_BOT_ID;
+import static com.cleanengine.coin.common.CommonValues.SELL_ORDER_BOT_ID;
+
+@Slf4j
+@Component
+public class TradeExecutedNotificationHandler {
+
+    private final SimpMessagingTemplate messagingTemplate;
+
+    private static final String ASK = "ask"; // 매도
+    private static final String BID = "bid"; // 매수
+
+    public TradeExecutedNotificationHandler(SimpMessagingTemplate messagingTemplate) {
+        this.messagingTemplate = messagingTemplate;
+    }
+
+    @TransactionalEventListener
+    public void notifyAfterTradeExecuted(TradeExecutedEvent tradeExecutedEvent) {
+        Trade trade = tradeExecutedEvent.getTrade();
+        if (trade == null) {
+            log.error("체결 알림 실패! trade == null");
+            return ;
+        }
+
+        Integer sellUserId = trade.getSellUserId();
+        Integer buyUserId = trade.getBuyUserId();
+        if (sellUserId == null || buyUserId == null) {
+            log.error("체결 알림 실패! sellUserId: {}, buyUserId: {}", sellUserId, buyUserId);
+            return ;
+        }
+
+        if (sellUserId != SELL_ORDER_BOT_ID) {
+            TradeExecutedNotifyDto soldDto = TradeExecutedNotifyDto.of(trade, ASK);
+            messagingTemplate.convertAndSend("/topic/tradeNotification/" + sellUserId, soldDto);
+        }
+        if (buyUserId != BUY_ORDER_BOT_ID) {
+            TradeExecutedNotifyDto boughtDto = TradeExecutedNotifyDto.of(trade, BID);
+            messagingTemplate.convertAndSend("/topic/tradeNotification/" + buyUserId, boughtDto);
+        }
+        if (sellUserId != SELL_ORDER_BOT_ID || buyUserId != BUY_ORDER_BOT_ID) {
+            log.debug("{} 체결 이벤트 구독 : {}원에 {}개, 매수인: {}, 매도인: {}", trade.getTicker(), trade.getPrice(), trade.getSize(), buyUserId, sellUserId );
+        }
+    }
+
+}

src/main/java/com/cleanengine/coin/trade/application/TradeExecutedNotifyDto.java

@@ -0,0 +1,43 @@
+package com.cleanengine.coin.trade.application;
+
+import com.cleanengine.coin.trade.entity.Trade;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import lombok.Builder;
+import lombok.Getter;
+
+import java.time.LocalDateTime;
+
+@Getter
+@JsonPropertyOrder({"ticker", "price", "size", "type", "tradedTime"})
+public class TradeExecutedNotifyDto {
+
+    private String ticker;
+
+    private Double price;
+
+    private Double size;
+
+    private String type;
+
+    private LocalDateTime tradedTime;
+
+    @Builder
+    private TradeExecutedNotifyDto(String ticker, Double price, Double size, String type, LocalDateTime tradedTime) {
+        this.ticker = ticker;
+        this.price = price;
+        this.size = size;
+        this.type = type;
+        this.tradedTime = tradedTime;
+    }
+
+    public static TradeExecutedNotifyDto of(Trade trade, String type) {
+        return TradeExecutedNotifyDto.builder()
+                .ticker(trade.getTicker())
+                .price(trade.getPrice())
+                .size(trade.getSize())
+                .type(type)
+                .tradedTime(trade.getTradeTime())
+                .build();
+    }
+
+}

src/main/java/com/cleanengine/coin/trade/application/TradeExecutor.java

@@ -12,11 +12,12 @@
 import com.cleanengine.coin.user.domain.Wallet;
 import com.cleanengine.coin.user.info.application.AccountService;
 import com.cleanengine.coin.user.info.application.WalletService;
-import jakarta.transaction.Transactional;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
+import org.springframework.transaction.annotation.Propagation;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.time.LocalDateTime;
 
@@ -33,7 +34,7 @@ public class TradeExecutor {
     private final TradeExecutedEventPublisher tradeExecutedEventPublisher;
     private final TradeService tradeService;
 
-    @Transactional
+    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void executeTrade(WaitingOrders waitingOrders, TradePair<Order, Order> tradePair, String ticker) {
         BuyOrder buyOrder = tradePair.getBuyOrder();
         SellOrder sellOrder = tradePair.getSellOrder();
@@ -48,7 +49,7 @@ public void executeTrade(WaitingOrders waitingOrders, TradePair<Order, Order> tr
         tradedPrice = tradeUnitPriceAndSize.tradedPrice();
         if (approxEquals(tradedSize, 0.0)) {
             log.debug("체결 중단! 체결 시도 수량 : {}, 매수단가 : {}, 매도단가 : {}", tradedSize, buyOrder.getPrice(), sellOrder.getPrice());
-            return;
+            return ;
         }
         this.writeTradingLog(buyOrder, sellOrder);
 

src/main/java/com/cleanengine/coin/trade/application/TradeFlowService.java

@@ -2,11 +2,10 @@
 
 import com.cleanengine.coin.order.domain.Order;
 import com.cleanengine.coin.order.domain.spi.WaitingOrders;
+import com.cleanengine.coin.order.domain.spi.WaitingOrdersManager;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
-import org.springframework.transaction.annotation.Propagation;
-import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Optional;
 
@@ -17,14 +16,25 @@ public class TradeFlowService {
 
     private final TradeMatcher tradeMatcher;
     private final TradeExecutor tradeExecutor;
+    private final WaitingOrdersManager waitingOrdersManager;
 
-    @Transactional(propagation = Propagation.REQUIRES_NEW)
     public void execMatchAndTrade(String ticker) {
-        WaitingOrders waitingOrders = tradeMatcher.getWaitingOrders(ticker);
+        WaitingOrders waitingOrders = waitingOrdersManager.getWaitingOrders(ticker);
         // TODO : peek() 해온 Order 객체들을 lock -> 체결 도중 취소 방지
         Optional<TradePair<Order, Order>> tradePair = tradeMatcher.matchOrders(waitingOrders);
+        boolean continueProcessing = tradePair.isPresent();
 
-        tradePair.ifPresent(orderOrderTradePair -> tradeExecutor.executeTrade(waitingOrders, orderOrderTradePair, ticker));
+        while (continueProcessing) {
+            try {
+                tradeExecutor.executeTrade(waitingOrders, tradePair.get(), ticker);
+                tradePair = tradeMatcher.matchOrders(waitingOrders);
+                continueProcessing = tradePair.isPresent();
+            } catch (Exception e) {
+                // TODO : 회복 필요
+                log.error("Error processing trades for {}: {}", ticker, e.getMessage());
+                continueProcessing = false;
+            }
+        }
     }
 
 }

src/main/java/com/cleanengine/coin/trade/application/TradeMatcher.java

@@ -5,7 +5,6 @@
 import com.cleanengine.coin.order.domain.OrderType;
 import com.cleanengine.coin.order.domain.SellOrder;
 import com.cleanengine.coin.order.domain.spi.WaitingOrders;
-import com.cleanengine.coin.order.domain.spi.WaitingOrdersManager;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
 
@@ -15,20 +14,10 @@
 @Component
 public class TradeMatcher {
 
-    private final WaitingOrdersManager waitingOrdersManager;
-
     // 1초마다 로깅
     private long lastLogTime = 0;
     private static final long LOG_INTERVAL = 1000;
 
-    public TradeMatcher(WaitingOrdersManager waitingOrdersManager) {
-        this.waitingOrdersManager = waitingOrdersManager;
-    }
-
-    public WaitingOrders getWaitingOrders(String ticker) {
-        return waitingOrdersManager.getWaitingOrders(ticker);
-    }
-
     public Optional<TradePair<Order, Order>> matchOrders(WaitingOrders waitingOrders) {  // 반환값 : 체결여부
         this.writeQueueLog(waitingOrders);