mantra/mantra.press
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle owner with null userId

Browse Source
This commit is contained in:
Kgothatso Ngako
2022-01-09 03:22:40 +02:00
parent 862c02d423
commit fca88993c7
5 changed files with 161 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
server/router/projects/index.js
View File

@@ -7,7 +7,35 @@ module.exports = function (options) {
router.route('/')
.get(function(request, response, next) {
db.Project.findAll()
db.Project.findAll({
include: [
{
association: db.Project.Owner,
required: true,
include: [
{
association: db.Owner.OwnerEntities,
required: true,
include: [
{
association: db.OwnerEntity.Entity,
required: true,
include: [
{
association: db.Entity.EntityUsers,
required: true,
where: {
userId: request.user?.id ?? null
}
}
]
}
]
}
]
}
]
})
.then(projects => {
response.display("projects", {
user: request.user,
@@ -51,6 +79,31 @@ module.exports = function (options) {
]
}
]
},
{
association: db.Project.Owner,
required: true,
include: [
{
association: db.Owner.OwnerEntities,
required: true,
include: [
{
association: db.OwnerEntity.Entity,
required: true,
include: [
{
association: db.Entity.EntityUsers,
required: true,
where: {
userId: request.user?.id ?? null
}
}
]
}
]
}
]
}
]
}).then(project => {