From 7a3a07bc711ea57fd8a84e809e7ecd0d6e64b5c2 Mon Sep 17 00:00:00 2001
From: Adam Soltys <asoltys@gmail.com>
Date: Mon, 8 Jun 2020 13:04:02 -0700
Subject: reduce network traffic

---
 lib/utils.js | 65 +-----------------------------------------------------------
 1 file changed, 1 insertion(+), 64 deletions(-)

(limited to 'lib/utils.js')

diff --git a/lib/utils.js b/lib/utils.js
index 5674f2fc..17b5d134 100644
--- a/lib/utils.js
+++ b/lib/utils.js
@@ -4,10 +4,6 @@ const { Op } = sequelize;
 getUser = async (username, transaction) => {
   let params = {
     include: [
-      {
-        model: db.Account,
-        as: "accounts"
-      },
       {
         model: db.Account,
         as: "account"
@@ -24,44 +20,12 @@ 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;
 };
 
 getUserById = async (id, transaction) => {
   let params = {
     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;
 };
-- 
cgit v1.2.3