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

3
server/router/fork/index.js
View File

@@ -6,6 +6,7 @@ module.exports = function (options) {
router.route('/t/:id') router.route('/t/:id')
.post(function(request, response, next) { .post(function(request, response, next) {
if (request.user) {
db.TranslationArtifactVersion.findByPk(request.params.id, { db.TranslationArtifactVersion.findByPk(request.params.id, {
include: [ include: [
{ {
@@ -111,6 +112,8 @@ module.exports = function (options) {
}).catch(error => { }).catch(error => {
next(error) next(error)
}) })
}
}) })
router.route('/e/:id') router.route('/e/:id')

4
server/router/library/index.js
View File

@@ -26,7 +26,7 @@ module.exports = function (options) {
association: db.Entity.EntityUsers, association: db.Entity.EntityUsers,
required: true, required: true,
where: { where: {
userId: request.user.id userId: request.user?.id ?? null
} }
} }
] ]
@@ -60,7 +60,7 @@ module.exports = function (options) {
association: db.Entity.EntityUsers, association: db.Entity.EntityUsers,
required: true, required: true,
where: { where: {
userId: request.user.id userId: request.user?.id ?? null
} }
} }
] ]

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

@@ -7,7 +7,35 @@ module.exports = function (options) {
router.route('/') router.route('/')
.get(function(request, response, next) { .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 => { .then(projects => {
response.display("projects", { response.display("projects", {
user: request.user, 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 => { }).then(project => {

12
server/router/translate/index.js
View File

@@ -31,7 +31,7 @@ module.exports = function (options) {
association: db.Entity.EntityUsers, association: db.Entity.EntityUsers,
required: false, required: false,
where: { where: {
userId: request.user.id userId: request.user?.id ?? null
} }
} }
] ]
@@ -74,7 +74,7 @@ module.exports = function (options) {
association: db.Entity.EntityUsers, association: db.Entity.EntityUsers,
required: false, required: false,
where: { where: {
userId: request.user.id userId: request.user?.id ?? null
} }
} }
] ]
@@ -374,7 +374,7 @@ module.exports = function (options) {
association: db.Entity.EntityUsers, association: db.Entity.EntityUsers,
required: true, required: true,
where: { where: {
userId: request.user.id userId: request.user?.id ?? null
} }
} }
] ]
@@ -480,7 +480,7 @@ module.exports = function (options) {
association: db.Entity.EntityUsers, association: db.Entity.EntityUsers,
required: true, required: true,
where: { where: {
userId: request.user.id userId: request.user?.id ?? null
} }
} }
] ]
@@ -542,7 +542,7 @@ module.exports = function (options) {
association: db.Entity.EntityUsers, association: db.Entity.EntityUsers,
required: true, required: true,
where: { where: {
userId: request.user.id userId: request.user?.id ?? nulls
} }
} }
] ]
@@ -605,7 +605,7 @@ module.exports = function (options) {
association: db.Entity.EntityUsers, association: db.Entity.EntityUsers,
required: true, required: true,
where: { where: {
userId: request.user.id userId: request.user?.id ?? null
} }
} }
] ]

6
server/router/versions/index.js
View File

@@ -32,7 +32,7 @@ module.exports = function (options) {
association: db.Entity.EntityUsers, association: db.Entity.EntityUsers,
required: false, required: false,
where: { where: {
userId: request.user.id userId: request.user?.id ?? null
} }
} }
] ]
@@ -97,7 +97,7 @@ module.exports = function (options) {
association: db.Entity.EntityUsers, association: db.Entity.EntityUsers,
required: true, required: true,
where: { where: {
userId: request.user.id userId: request.user?.id ?? null
} }
} }
] ]
@@ -153,7 +153,7 @@ module.exports = function (options) {
association: db.Entity.EntityUsers, association: db.Entity.EntityUsers,
required: true, required: true,
where: { where: {
userId: request.user.id userId: request.user?.id ?? null
} }
} }
] ]