c4patino/know-it-all
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Switched includes to associations

Browse source
This commit is contained in:
Ceferino Patino 2022-03-06 16:58:41 -06:00
commit 19486635bd
1 changed files with 7 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

20
server/middleware/checkKnownUser.js
View file

@ -9,31 +9,25 @@ async function checkKnownUser(req, res, next) {
}
const result = await User.findOne({
where: { userID: userID },
where: { userID: user.userID },
include: [
{
model: Organization,
as: 'ownedOrg',
association: 'ownedOrg',
include: {
model: User,
as: 'orgMembers',
association: 'orgMembers',
where: { userID: user.userID },
required: false,
},
},
{
model: Organization,
as: 'memberOrgs',
association: 'memberOrgs',
include: [
{
model: User,
as: 'orgMembers',
association: 'orgMembers',
where: { userID: user.userID },
required: false,
},
{
model: User,
as: 'orgOwner',
association: 'orgOwner',
where: { userID: user.userID },
required: false,
},
@ -50,7 +44,7 @@ async function checkKnownUser(req, res, next) {
(org) => org.orgMembers.length != 0 || org_owner
);
if (filteredResult.length == 0 && result.ownedOrg.orgMembers.length == 0) {
if (filteredResult.length == 0 && result.ownedOrg) {
return res.status(403).send('You do not have contact with this user.');
}