From 09adc6fa031f5b02035b7a14b919b87e71ded78c Mon Sep 17 00:00:00 2001 From: Ran Guin Date: Sat, 15 May 2021 15:36:11 -0700 Subject: tidy up attributes retrieved for accounts --- routes/admin.js | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/routes/admin.js b/routes/admin.js index 22eea87a..d41c71b9 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -12,7 +12,9 @@ router.get( "/users", auth, ah(async (req, res) => { - var users = await db.User.findAll() + var users = await db.User.findAll({ + attributes: ['usrname', 'email', 'sms', 'verified', 'createdAt'] + }) debug('users: ' + JSON.stringify(users)) return res.send({users: users}) @@ -43,8 +45,13 @@ router.get( auth, ah(async (req, res) => { var accounts = await db.User.findAll({ + attributes: ['username'], include: [ - { model: db.Account, as: 'accounts' } + { + model: db.Account, + as: 'accounts', + attributes: ['id', 'name', 'ticker', 'balance', 'createdAt'] + } ] }) @@ -58,12 +65,13 @@ router.get( // Returns: // { referrals: } router.get( - "/user_accounts", + "/accounts", auth, ah(async (req, res) => { var accounts = await db.Account.findAll({ + attributes: ['id', 'name', 'ticker', 'balance', 'createdAt'], include: [ - { model: db.User, as: 'user' } + { model: db.User, as: 'user', attributes: ['username'] } ] }) -- cgit v1.2.3