fix #8

suenot · Feb 5, 2019 · 7972831 · 7972831
1 parent 2157afd
commit 7972831
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/server/api/index.js b/server/api/index.js
@@ -9,7 +9,7 @@ var {getPairs} = require('../core_components/getPairs')
 var {getOrderBook} = require('../core_components/getOrderBook')
 var {getOHLCV} = require('../core_components/getOHLCV')
 var {getTrades} = require('../core_components/updateTradesRaw')
-var getMyTrades = require('../core_components/getMyTrades')
+var {getMyTradesFromVariable} = require('../core_components/getMyTrades')
 var createOrder = require('../core_components/createOrder')
 var cancelOrder = require('../core_components/cancelOrder')
 var widgets = require('../core_components/widgets')
@@ -81,7 +81,7 @@ router.get('/myTrade/:stock/:pair', async function (req, res) {
   try {
     var stock = req.params.stock.toLowerCase()
     var pair = req.params.pair.split('_').join('/')
-    var result = await getMyTrades(stock, pair)
+    var result = await getMyTradesFromVariable(stock, pair)
     res.json(result)
   } catch (err) {
     res.status(500).send({error: serializeError(err).message})

diff --git a/server/core_components/getMyTrades.js b/server/core_components/getMyTrades.js
@@ -6,10 +6,23 @@ const getMyTrades = async function(stockName, symbol) {
     if (global.STOCKS[stockName].has['fetchMyTrades']) {
       await catchHead(rateLimit, stockName)
       var trades = await global.STOCKS[stockName].fetchMyTrades(symbol)
+      var id = `${stockName}--${symbol}`
+      global.MYTRADES[id] = trades
       return trades
     } else {
-      return {'Error': stockName + ' havent  fetchMyTrades'}
+      return {'Error': stockName + ' havent fetchMyTrades'}
     }
   } catch (err) { console.log(err) }
 }
-module.exports = getMyTrades
+
+const getMyTradesFromVariable = async function(stockName, symbol) {
+  try {
+    getMyTrades(stockName, symbol)
+    var id = `${stockName}--${symbol}`
+    var trades = global.MYTRADES[id]
+    return trades
+  } catch (err) { console.log(err) }
+}
+
+exports.getMyTrades = getMyTrades
+exports.getMyTradesFromVariable = getMyTradesFromVariable
diff --git a/server/index.js b/server/index.js
@@ -39,6 +39,7 @@ global.PAIRS
 global.ORDERBOOK
 global.OHLCV
 global.TRADESRAW
+global.MYTRADES = {}
 
 ///////////////
 //globals end