fix: projects not showing up despite being a member of the project (#237)
This commit is contained in:
@@ -1,11 +1,14 @@
|
|||||||
const express = require('express');
|
const express = require('express');
|
||||||
const router = express.Router();
|
const router = express.Router();
|
||||||
const defineProject = require('../../models/projects');
|
|
||||||
const { DataTypes, Op } = require('sequelize');
|
const { DataTypes, Op } = require('sequelize');
|
||||||
|
const defineProject = require('../../models/projects');
|
||||||
|
const defineMember = require('../../models/members');
|
||||||
|
|
||||||
module.exports = function (sequelize) {
|
module.exports = function (sequelize) {
|
||||||
const { verifySignedIn } = require('../../middleware/auth')(sequelize);
|
const { verifySignedIn } = require('../../middleware/auth')(sequelize);
|
||||||
const Project = defineProject(sequelize, DataTypes);
|
const Project = defineProject(sequelize, DataTypes);
|
||||||
|
const Member = defineMember(sequelize, DataTypes);
|
||||||
|
Project.hasMany(Member, { foreignKey: 'projectId' });
|
||||||
|
|
||||||
router.get('/', verifySignedIn, async (req, res) => {
|
router.get('/', verifySignedIn, async (req, res) => {
|
||||||
try {
|
try {
|
||||||
@@ -17,9 +20,24 @@ module.exports = function (sequelize) {
|
|||||||
},
|
},
|
||||||
});
|
});
|
||||||
} else {
|
} else {
|
||||||
|
// public projects, owned projects, participated projects will be returned
|
||||||
projects = await Project.findAll({
|
projects = await Project.findAll({
|
||||||
|
include: [
|
||||||
|
{
|
||||||
|
model: Member,
|
||||||
|
attributes: [],
|
||||||
|
where: {
|
||||||
|
userId: req.userId,
|
||||||
|
},
|
||||||
|
required: false,
|
||||||
|
},
|
||||||
|
],
|
||||||
where: {
|
where: {
|
||||||
[Op.or]: [{ isPublic: true }, { userId: req.userId }],
|
[Op.or]: [
|
||||||
|
{ isPublic: true },
|
||||||
|
{ userId: req.userId },
|
||||||
|
sequelize.where(sequelize.col('Members.userId'), req.userId),
|
||||||
|
],
|
||||||
},
|
},
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user