more stats

1 files changed, 32 insertions, 9 deletions

diff --git a/routes/balances.js b/routes/balances.js
index 75541730..895cc1ff 100644
--- a/routes/balances.js
+++ b/routes/balances.js
@@ -1,19 +1,42 @@
 const sequelize = require("sequelize");
+const { Op } = sequelize;
 
 app.get("/balances", async (req, res) => {
+  const assets = await lq.getBalance();
+  const accounts = await db.Account.findAll({
+    attributes: [
+      "asset",
+      [sequelize.fn("sum", sequelize.col("balance")), "total"]
+    ],
+    group: ["asset"],
+    where: {
+      asset: {
+        [Op.ne]: config.liquid.btcasset
+      }
+    }
+  });
+
   const balances = {
+    accounts,
+    assets,
     bitcoin: parseInt((await bc.getBalance()) * SATS),
-    liquid: parseInt((await lq.getBalance()).bitcoin * SATS),
-    channel: (await lna.channelBalance({})).balance,
-    wallet: (await lna.walletBalance({})).total_balance,
-    user: (await db['User'].findAll({
-      attributes: [[sequelize.fn('sum', sequelize.col('balance')), 'total']],
+    liquid: parseInt(assets.bitcoin * SATS),
+    lnchannel: parseInt((await lna.channelBalance({})).balance),
+    lnwallet: parseInt((await lna.walletBalance({})).total_balance),
+    user: parseInt((await db["User"].findAll({
+      attributes: [[sequelize.fn("sum", sequelize.col("balance")), "total"]],
       raw: true,
-      order: sequelize.literal('total DESC')
-    }))[0].total,
+      order: sequelize.literal("total DESC")
+    }))[0].total)
   };
 
-  const { bitcoin, liquid, channel, user, wallet } = balances;
-  balances.ratio = ((parseInt(bitcoin) + parseInt(liquid) + parseInt(channel) + parseInt(wallet))/parseInt(user)).toFixed(2);
+  const { bitcoin, liquid, lnchannel, user, lnwallet } = balances;
+  balances.ratio = (
+    (parseInt(bitcoin) +
+      parseInt(liquid) +
+      parseInt(lnchannel) +
+      parseInt(lnwallet)) /
+    parseInt(user)
+  ).toFixed(2);
   res.send(balances);
 });