From 3a185023419983eb18c9b2408939fc0d17c2dc0a Mon Sep 17 00:00:00 2001 From: Ranabir Guin Date: Fri, 14 May 2021 23:37:49 -0700 Subject: add FK for orders -> users in index; access user_accounts --- db/index.js | 21 +++++++++++++-------- routes/admin.js | 8 ++++---- 2 files changed, 17 insertions(+), 12 deletions(-) diff --git a/db/index.js b/db/index.js index 658a51a0..de9116a8 100644 --- a/db/index.js +++ b/db/index.js @@ -52,10 +52,10 @@ require("./normalized/waiting_list.js"); const { User, Account, Payment, Invoice, Key, Order } = db; // move relationships to specfic models -// User.hasMany(Account, { -// as: "accounts", -// foreignKey: "user_id" -// }); +User.hasMany(Account, { + as: "accounts", + foreignKey: "user_id" +}); User.hasMany(Invoice, { as: "invoices", @@ -67,6 +67,11 @@ User.hasMany(Key, { foreignKey: "user_id" }); +User.hasMany(Order, { + as: "orders", + foreignKey: "user_id" +}); + User.hasMany(Payment, { as: "payments", foreignKey: "user_id" @@ -82,10 +87,10 @@ Invoice.belongsTo(Account, { foreignKey: "account_id" }); -// Account.belongsTo(User, { -// as: "user", -// foreignKey: "user_id" -// }); +Account.belongsTo(User, { + as: "user", + foreignKey: "user_id" +}); Invoice.belongsTo(User, { as: "user", diff --git a/routes/admin.js b/routes/admin.js index a74edfa6..7cc02ba6 100644 --- a/routes/admin.js +++ b/routes/admin.js @@ -32,16 +32,16 @@ router.get( }) ); -// usage: GET '/accounts' +// usage: GET '/user_accounts' // // Returns: // { referrals: } router.get( - "/accounts", + "/user_accounts", ah(async (req, res) => { - var accounts = await db.Account.findAll({ + var accounts = await db.User.findAll({ include: [ - { model: db.User, as: 'user', required: true } + { model: db.Account, as: 'accounts' } ] }) -- cgit v1.2.3