From 66d33e7cb3f4a9bc630a0013e31a603d5e8f83f7 Mon Sep 17 00:00:00 2001
From: kienvt <vutrungkiennd@gmail.com>
Date: Thu, 17 Jul 2025 17:38:51 +0700
Subject: [PATCH] update

---
 src/dao/position.ts   |  7 +++---
 src/schedule/index.ts | 51 ++++++++++++++++++++++++++++---------------
 2 files changed, 38 insertions(+), 20 deletions(-)

diff --git a/src/dao/position.ts b/src/dao/position.ts
index 7fcadc2..d915b3a 100644
--- a/src/dao/position.ts
+++ b/src/dao/position.ts
@@ -4,6 +4,7 @@ export interface Position {
   entry: number;
   leverage: number;
   volume: number;
-  profit: number;
-  profitPercentage: number;
-}
\ No newline at end of file
+  sl: number;
+  tp: number;
+  status: string;
+}
diff --git a/src/schedule/index.ts b/src/schedule/index.ts
index 5957d57..0b3a2fd 100644
--- a/src/schedule/index.ts
+++ b/src/schedule/index.ts
@@ -16,8 +16,6 @@ const bybitService = new BybitService(
   false
 );
 
-
-
 export const eventHandlerFuture: EventHandler = {
   onBuy: (order: Order, reason: string) => {
     sendMessage(`Future Buy ${order.symbol} ${order.interval}M
@@ -35,9 +33,10 @@ export const eventHandlerFuture: EventHandler = {
       side: "Buy",
       orderType: "Limit",
       price: Number(order.entry).toFixed(2),
-      qty: '1',
+      stopLoss: Number(order.stopLoss).toFixed(2),
+      qty: "1",
     });
-      
+
     console.log(
       `Buy ${order.symbol} ${order.interval}M ${reason} ${order.entry}`
     );
@@ -57,13 +56,17 @@ export const eventHandlerFuture: EventHandler = {
       side: "Sell",
       orderType: "Limit",
       price: Number(order.entry).toFixed(2),
-      qty: '1',
+      stopLoss: Number(order.stopLoss).toFixed(2),
+      qty: "1",
     });
     console.log(
       `Sell ${order.symbol} ${order.interval}M ${reason} ${order.entry}`
     );
   },
-  onEvent: async (eventType: EventType, {candle, analysis}: {candle: Candle, analysis: Analysis}) => {
+  onEvent: async (
+    eventType: EventType,
+    { candle, analysis }: { candle: Candle; analysis: Analysis }
+  ) => {
     if (eventType === "HighVolatility") {
       const positions = await bybitService.listPositions({
         category: "linear",
@@ -78,10 +81,15 @@ export const eventHandlerFuture: EventHandler = {
             symbol: analysis.symbol,
             side: "Sell",
             orderType: "Limit",
-            price: candle.close > analysis.currentBB.upper ? Number(candle.close).toFixed(2) : Number(analysis.currentBB.upper).toFixed(2),
+            price:
+              candle.close > analysis.currentBB.upper
+                ? Number(candle.close).toFixed(2)
+                : Number(analysis.currentBB.upper).toFixed(2),
             qty: halfSize,
           });
-          sendMessage(`Future Căt nửa ${analysis.symbol} ${analysis.interval}M ${analysis.currentBB.upper} ${halfSize}`);
+          sendMessage(
+            `Future Căt nửa ${analysis.symbol} ${analysis.interval}M ${analysis.currentBB.upper} ${halfSize}`
+          );
         }
         if (position.side === "Sell" && analysis.isUnderBbLower) {
           const halfSize = (Number(position.size) / 2).toFixed(2);
@@ -90,10 +98,15 @@ export const eventHandlerFuture: EventHandler = {
             symbol: analysis.symbol,
             side: "Buy",
             orderType: "Limit",
-            price: candle.close < analysis.currentBB.lower ? Number(candle.close).toFixed(2) : Number(analysis.currentBB.lower).toFixed(2),
+            price:
+              candle.close < analysis.currentBB.lower
+                ? Number(candle.close).toFixed(2)
+                : Number(analysis.currentBB.lower).toFixed(2),
             qty: halfSize,
           });
-          sendMessage(`Future Căt nửa ${analysis.symbol} ${analysis.interval}M ${analysis.currentBB.lower} ${halfSize}`);
+          sendMessage(
+            `Future Căt nửa ${analysis.symbol} ${analysis.interval}M ${analysis.currentBB.lower} ${halfSize}`
+          );
         }
       }
     }
@@ -117,9 +130,9 @@ const eventHandlerSpot: EventHandler = {
       side: "Buy",
       orderType: "Limit",
       price: Number(order.entry).toFixed(2),
-      qty: '1',
+      qty: "1",
     });
-      
+
     console.log(
       `Buy ${order.symbol} ${order.interval}M ${reason} ${order.entry}`
     );
@@ -134,8 +147,10 @@ const eventHandlerSpot: EventHandler = {
       reason: ${reason}
       `);
   },
-  onEvent: async (eventType: EventType, {candle, analysis}: {candle: Candle, analysis: Analysis}) => {
-  },
+  onEvent: async (
+    eventType: EventType,
+    { candle, analysis }: { candle: Candle; analysis: Analysis }
+  ) => {},
 };
 
 const eventHandlerNotification: EventHandler = {
@@ -148,7 +163,7 @@ const eventHandlerNotification: EventHandler = {
       volume: ${order.volume}
       reason: ${reason}
       `);
-      
+
     console.log(
       `Buy ${order.symbol} ${order.interval}M ${reason} ${order.entry}`
     );
@@ -163,8 +178,10 @@ const eventHandlerNotification: EventHandler = {
       reason: ${reason}
       `);
   },
-  onEvent: async (eventType: EventType, {candle, analysis}: {candle: Candle, analysis: Analysis}) => {
-  },
+  onEvent: async (
+    eventType: EventType,
+    { candle, analysis }: { candle: Candle; analysis: Analysis }
+  ) => {},
 };
 
 createCandleAnalysisSchedule("ETHUSDT", "15", eventHandlerFuture);