try join queries; order normalized models to enable HasMany, BelongsTo specs in applicable models (enabling all table specific logic to be in one file)

1 files changed, 28 insertions, 19 deletions

diff --git a/routes/admin.js b/routes/admin.js
index 0d065a4d..b17e5aa4 100644
--- a/routes/admin.js
+++ b/routes/admin.js
@@ -39,29 +39,38 @@ router.get(
 router.get(
   "/accounts",
   ah(async (req, res) => {
-    // var referrals = await db.User
-    //   .findAll({
-    //     attributes: ['users.id', 'accounts.balance'],
-    //     where: {
-    //       '$accounts.user_id$' : '$users.id$'
-    //       // user_id: users.id
-    //       // $or: [
-    //       //     {'$accounts.user_id$' : $users.id$},
-    //       // ]
-    //     },
-    //     include: [
-    //       {
-    //         model: Account,
-    //         required: false
-    //       }
-    //     ]
-    //   });
-
-    var accounts = await db.Account.findAll()
+    var accounts = await db.Accounts.findAll({
+      include: [ db.User ]
+    })
 
     debug('accounts: ' + JSON.stringify(accounts))
     return res.send({accounts: accounts})
   })
 );
 
+// usage:  GET '/user/transactions'
+//
+// Returns: 
+//    { users: [
+//         <user attributes>, 
+//         Invoices: 
+//           <invoice attributes>, 
+//         Payments: 
+//           <invoice attributes>, 
+//         Orders: 
+//           <invoice attributes>, 
+//       ], ...
+//    }
+router.get(
+  "/user_transactions",
+  ah(async (req, res) => {
+    var transactions = await db.User.findAll({
+      include: [ db.Invoice, db.Payment, db.Order ]
+    })
+
+    debug('transactions: ' + JSON.stringify(transactions))
+    return res.send({transactions: transactions})
+  })
+);
+
 module.exports = router;