fix: order status update (chrisleekr#461)

anhngml · Aug 10, 2022 · a2cd38e · a2cd38e
1 parent 8160e25
commit a2cd38e
Show file tree

Hide file tree

Showing 11 changed files with 184 additions and 181 deletions.
diff --git a/app/__tests__/server.test.js b/app/__tests__/server.test.js
@@ -49,4 +49,12 @@ describe('server', () => {
   it('triggers runBinance', () => {
     expect(mockRunBinance).toHaveBeenCalled();
   });
+
+  it('triggers runCronjob', () => {
+    expect(mockRunCronJob).toHaveBeenCalled();
+  });
+
+  it('triggers runFrontend', () => {
+    expect(mockRunFrontend).toHaveBeenCalled();
+  });
 });
diff --git a/app/binance/__tests__/user.test.js b/app/binance/__tests__/user.test.js
@@ -10,6 +10,7 @@ describe('user.js', () => {
   let mockUpdateGridTradeLastOrder;
   let mockGetManualOrder;
   let mockSaveManualOrder;
+  let mockExecuteTrailingTrade;
 
   let mockUserClean;
 
@@ -137,6 +138,14 @@ describe('user.js', () => {
     });
 
     describe('when executionReport event received', () => {
+      beforeEach(() => {
+        mockExecuteTrailingTrade = jest.fn().mockResolvedValue(true);
+
+        jest.mock('../../cronjob', () => ({
+          executeTrailingTrade: mockExecuteTrailingTrade
+        }));
+      });
+
       describe('when last order not found', () => {
         beforeEach(async () => {
           mockUserClean = jest.fn().mockResolvedValue(true);
@@ -225,10 +234,15 @@ describe('user.js', () => {
           expect(mockUpdateGridTradeLastOrder).not.toHaveBeenCalled();
         });
 
+        it('does not trigger executeTrailingTrade', () => {
+          expect(mockExecuteTrailingTrade).not.toHaveBeenCalled();
+        });
+
         it('does not trigger userClean', () => {
           expect(mockUserClean).not.toHaveBeenCalled();
         });
       });
+
       describe('when last order found', () => {
         beforeEach(async () => {
           mockUserClean = jest.fn().mockResolvedValue(true);
@@ -336,6 +350,13 @@ describe('user.js', () => {
           );
         });
 
+        it('triggers executeTrailingTrade', () => {
+          expect(mockExecuteTrailingTrade).toHaveBeenCalledWith(
+            loggerMock,
+            'ETHUSDT'
+          );
+        });
+
         it('does not trigger userClean', () => {
           expect(mockUserClean).not.toHaveBeenCalled();
         });
@@ -429,6 +450,10 @@ describe('user.js', () => {
           expect(mockSaveManualOrder).not.toHaveBeenCalled();
         });
 
+        it('does not trigger executeTrailingTrade', () => {
+          expect(mockExecuteTrailingTrade).not.toHaveBeenCalled();
+        });
+
         it('does not trigger userClean', () => {
           expect(mockUserClean).not.toHaveBeenCalled();
         });
@@ -540,6 +565,13 @@ describe('user.js', () => {
           );
         });
 
+        it('triggers executeTrailingTrade', () => {
+          expect(mockExecuteTrailingTrade).toHaveBeenCalledWith(
+            loggerMock,
+            'ETHUSDT'
+          );
+        });
+
         it('does not trigger userClean', () => {
           expect(mockUserClean).not.toHaveBeenCalled();
         });

diff --git a/app/binance/user.js b/app/binance/user.js
@@ -13,6 +13,7 @@ const {
   getManualOrder,
   saveManualOrder
 } = require('../cronjob/trailingTradeHelper/order');
+const { executeTrailingTrade } = require('../cronjob');
 
 let userClean;
 
@@ -51,7 +52,10 @@ const setupUserWebsocket = async logger => {
         totalQuoteTradeQuantity,
         totalTradeQuantity
       } = evt;
-      logger.info({ evt }, 'Received new report');
+      logger.info(
+        { symbol, evt, saveLog: true },
+        `There is a new update in order. ${orderId} - ${side} - ${orderStatus}`
+      );
 
       const checkLastOrder = async () => {
         const lastOrder = await getGridTradeLastOrder(
@@ -74,6 +78,12 @@ const setupUserWebsocket = async logger => {
             isWorking: isOrderWorking,
             updateTime: eventTime
           });
+          logger.info(
+            { symbol, lastOrder, saveLog: true },
+            'The last order has been updated.'
+          );
+
+          executeTrailingTrade(logger, symbol);
         }
       };
 
@@ -96,6 +106,13 @@ const setupUserWebsocket = async logger => {
             isWorking: isOrderWorking,
             updateTime: eventTime
           });
+
+          logger.info(
+            { symbol, manualOrder, saveLog: true },
+            'The manual order has been updated.'
+          );
+
+          executeTrailingTrade(logger, symbol);
         }
       };