when liquidity zero delete pair against user DONE and tested

Scytalelabs-official · Feb 13, 2022 · 6be8ec5 · 6be8ec5
1 parent 775a320
commit 6be8ec5
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 24 deletions.
diff --git a/routes/deploypair.js b/routes/deploypair.js
@@ -5,6 +5,8 @@ var pair = require("../JsClients/PAIR/test/install.ts");
 var pairsagainstuser = require("../models/pairsagainstuser");
 var pairagainstuser = require("../models/pairagainstuser");
 var pairsModel = require("../models/pair");
+var pair = require("../JsClients/PAIR/test/installed.ts");
+const { reset } = require("nodemon");
 
 router.route("/makedeploypaircontract").post(async function (req, res, next) {
   try {
@@ -147,17 +149,30 @@ router.route("/getpairagainstuser").post(async function (req, res, next) {
         message: "This user has not added liquidity against any pair.",
       });
     } else {
-      let pairsdata=[];
-      for(var i=0;i<result.length;i++)
-      {
-        let pairsresult = await pairsModel.findOne({id:result[i].pair});
+      for (var i = 0; i < result.length; i++) {
+        let liquidity = await pair.balanceOf(
+          result[i].pair,
+          result[i].id.toLowerCase()
+        );
+        if (liquidity == "0") {
+          await pairagainstuser.deleteOne({ _id: result[i]._id });
+        }
+      }
+      let result1 = await pairagainstuser.find({
+        id: req.body.user.toLowerCase(),
+      });
+
+      let pairsdata = [];
+      for (var i = 0; i < result1.length; i++) {
+        let pairsresult = await pairsModel.findOne({ id: result1[i].pair });
         pairsdata.push(pairsresult);
       }
+
       return res.status(200).json({
         success: true,
         message: "This User has added liquidity against following pairs.",
-        userpairs: result,
-        pairsdata:pairsdata
+        userpairs: result1,
+        pairsdata: pairsdata,
       });
     }
   } catch (error) {

diff --git a/routes/listenerroutes.js b/routes/listenerroutes.js
@@ -721,24 +721,13 @@ router.route("/geteventsdata").post(async function (req, res, next) {
         });
         await pairagainstuser.create(newData);
       } else {
-        if (
-          (
-            BigInt(pairagainstuserresult.reserve0) - BigInt(reserve0)
-          ).toString() == "0" &&
-          (
-            BigInt(pairagainstuserresult.reserve1) - BigInt(reserve1)
-          ).toString() == "0"
-        ) {
-          await pairagainstuser.deleteOne({ _id: pairagainstuserresult._id });
-        } else {
-          pairagainstuserresult.reserve0 = (
-            BigInt(pairagainstuserresult.reserve0) - BigInt(reserve0)
-          ).toString();
-          pairagainstuserresult.reserve1 = (
-            BigInt(pairagainstuserresult.reserve1) - BigInt(reserve1)
-          ).toString();
-          await pairagainstuserresult.save();
-        }
+        pairagainstuserresult.reserve0 = (
+          BigInt(pairagainstuserresult.reserve0) - BigInt(reserve0)
+        ).toString();
+        pairagainstuserresult.reserve1 = (
+          BigInt(pairagainstuserresult.reserve1) - BigInt(reserve1)
+        ).toString();
+        await pairagainstuserresult.save();
       }
     }
   } catch (error) {