Merge pull request #1 from dmytroshch/features/backtest-history

Features/backtest history
tekwani · Aug 15, 2023 · ee511d1 · ee511d1
2 parents f37cbfe + 0f44165
commit ee511d1
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 5 deletions.
diff --git a/lib/cmds/delete_bt.js b/lib/cmds/delete_bt.js
@@ -7,5 +7,5 @@ module.exports = async (ds, ws, msg) => {
   const [, executionId] = msg
 
   await deleteBt(executionId)
-  send(ws, ['data.bt.history.deleted', { executionId }])
+  send(ws, ['data.bt.history.deleted', executionId])
 }
diff --git a/lib/cmds/get_bt_data.js b/lib/cmds/get_bt_data.js
@@ -7,5 +7,5 @@ module.exports = async (ds, ws, msg) => {
   const [, executionId] = msg
   const btData = await getBtData(executionId)
 
-  send(ws, ['data.bt.history.details', btData])
+  send(ws, ['data.bt.history.details', executionId, btData])
 }
diff --git a/lib/cmds/get_bt_history.js b/lib/cmds/get_bt_history.js
@@ -7,5 +7,5 @@ module.exports = async (ds, ws, msg) => {
   const [, strategyId] = msg
   const btHistory = await getBtHistory(strategyId)
 
-  send(ws, ['data.bt.history.list', btHistory])
+  send(ws, ['data.bt.history.list', strategyId, btHistory])
 }
diff --git a/lib/cmds/set_bt_favorite.js b/lib/cmds/set_bt_favorite.js
@@ -7,5 +7,5 @@ module.exports = async (ds, ws, msg) => {
   const [, executionId, isFavorite] = msg
 
   await setBtFavorite(executionId, isFavorite)
-  send(ws, ['data.bt.history.favorite', { executionId, isFavorite }])
+  send(ws, ['data.bt.history.favorite', executionId, isFavorite])
 }
diff --git a/lib/db/bt_dao.js b/lib/db/bt_dao.js
@@ -32,7 +32,10 @@ const getBtData = async (executionId) => {
   const query = 'SELECT * FROM bt_history where executionId=?'
   const values = [executionId]
 
-  return await sqliteDb.getData(query, values)
+  const btData = await sqliteDb.getData(query, values)
+  const parsedResult = btData?.btResult ? JSON.parse(btData.btResult) : {}
+
+  return { ...btData, btResult: parsedResult }
 }
 
 const setBtFavorite = async (executionId, isFavorite) => {