filter payments

2 files changed, 18 insertions, 4 deletions

diff --git a/lib/sockets.js b/lib/sockets.js
index d7973a99..f35ca5f5 100644
--- a/lib/sockets.js
+++ b/lib/sockets.js
@@ -1,6 +1,6 @@
 const jwt = require("jsonwebtoken");
 const io = require("socket.io");
-const Sequelize = require("sequelize");
+const { Op } = require("sequelize");
 
 /* eslint-disable-next-line */
 const pick = (O, ...K) => K.reduce((o, k) => ((o[k] = O[k]), o), {});
@@ -44,8 +44,13 @@ socket.sockets.on("connect", async socket => {
           model: db.Payment,
           as: "payments",
           order: [["id", "DESC"]],
-          received: {
-            [Sequelize.Op.ne]: null
+          where: {
+            [Op.or]: {
+              received: true,
+              amount: {
+                [Op.lt]: 0,
+              },
+            },
           },
           limit: 12
         }
diff --git a/routes/payments.js b/routes/payments.js
index 7cb51d02..0e829029 100644
--- a/routes/payments.js
+++ b/routes/payments.js
@@ -1,5 +1,6 @@
 const BitcoinCore = require("bitcoin-core");
 const lnd = require("../lib/lnd");
+const { Op } = require("sequelize");
 
 (async () => {
   bc = new BitcoinCore(config.bitcoin);
@@ -37,7 +38,15 @@ const lnd = require("../lib/lnd");
 
   app.get("/payments", auth, async (req, res) => {
     const payments = await db.Payment.findAll({
-      where: { user_id: req.user.id },
+      where: { 
+        user_id: req.user.id,
+        [Op.or]: {
+          received: true,
+          amount: {
+            [Op.lt]: 0,
+          },
+        }, 
+      },
       order: [["id", "DESC"]]
     });