reduce network traffic

1 files changed, 1 insertions, 64 deletions

diff --git a/lib/utils.js b/lib/utils.js
index 5674f2fc..17b5d134 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -6,10 +6,6 @@ getUser = async (username, transaction) => {
     include: [
       {
         model: db.Account,
-        as: "accounts"
-      },
-      {
-        model: db.Account,
         as: "account"
       }
     ],
@@ -24,34 +20,6 @@ getUser = async (username, transaction) => {
   let user = await db.User.findOne(params);
   if (!user) throw new Error("User not found");
 
-  user = user.get({ plain: true });
-
-  params = {
-    order: [["id", "DESC"]],
-    where: {
-      user_id: user.id,
-      account_id: user.account_id,
-      [Op.or]: {
-        received: true,
-        amount: {
-          [Op.lt]: 0
-        }
-      }
-    },
-    limit: 12,
-    include: {
-      model: db.Account,
-      as: "account"
-    }
-  };
-
-  if (transaction) {
-    params.lock = transaction.LOCK.UPDATE;
-    params.transaction = transaction;
-  }
-
-  user.payments = await db.Payment.findAll(params);
-
   return user;
 };
 
@@ -60,10 +28,6 @@ getUserById = async (id, transaction) => {
     include: [
       {
         model: db.Account,
-        as: "accounts"
-      },
-      {
-        model: db.Account,
         as: "account"
       }
     ],
@@ -76,34 +40,7 @@ getUserById = async (id, transaction) => {
   }
 
   let user = await db.User.findOne(params);
-
-  user = user.get({ plain: true });
-
-  params = {
-    order: [["id", "DESC"]],
-    where: {
-      user_id: user.id,
-      account_id: user.account_id,
-      [Op.or]: {
-        received: true,
-        amount: {
-          [Op.lt]: 0
-        }
-      }
-    },
-    limit: 12,
-    include: {
-      model: db.Account,
-      as: "account"
-    }
-  };
-
-  if (transaction) {
-    params.lock = transaction.LOCK.UPDATE;
-    params.transaction = transaction;
-  }
-
-  user.payments = await db.Payment.findAll(params);
+  if (!user) throw new Error("User not found");
 
   return user;
 };