krikkert/habitica
1
0
Fork 0
mirror of https://github.com/HabitRPG/habitica.git synced 2025-12-18 15:17:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

add support for getting single challenges tasks

Browse Source
This commit is contained in:
Matteo Pagliazzi
2016-01-04 19:57:20 +01:00
parent d25cb70f66
commit b73f5a8f40
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
website/src/controllers/api-v3/tasks.js
View File

@@ -120,7 +120,7 @@ api.getTasks = {
if (tasksOwner === 'user' && challengeId) throw new BadRequest(res.t('userTasksNoChallengeId')); if (tasksOwner === 'user' && challengeId) throw new BadRequest(res.t('userTasksNoChallengeId'));
if (tasksOwner === 'challenge') { if (tasksOwner === 'challenge') {
if (!challengeId) throw new BadRequest(res.t('challengeIdRequired')); if (!challengeId) throw new BadRequest(res.t('challengeIdRequired'));
challenge = await Challenge.findOne({_id: challengeId}).exec(); challenge = await Challenge.findOne({_id: challengeId}).select('leader').exec();
// If the challenge does not exist, or if it exists but user is not a member, not the leader and not an admin -> throw error // If the challenge does not exist, or if it exists but user is not a member, not the leader and not an admin -> throw error
if (!challenge || (user.challenges.indexOf(challengeId) === -1 && challenge.leader !== user._id && !user.contributor.admin)) { // eslint-disable-line no-extra-parens if (!challenge || (user.challenges.indexOf(challengeId) === -1 && challenge.leader !== user._id && !user.contributor.admin)) { // eslint-disable-line no-extra-parens
@@ -188,10 +188,20 @@ api.getTask = {
let task = await Tasks.Task.findOne({ let task = await Tasks.Task.findOne({
_id: req.params.taskId, _id: req.params.taskId,
userId: user._id,
}).exec(); }).exec();
if (!task) throw new NotFound(res.t('taskNotFound')); if (!task) throw new NotFound(res.t('taskNotFound'));
// If the task belongs to a challenge make sure the user has rights
if (!task.userId) {
let challenge = await Challenge.find().selec({_id: task.challenge.id}).select('leader').exec();
if (user.challenges.indexOf(task.challenge.id) === -1 && challenge.leader !== user._id && !user.contributor.admin) {
throw new NotFound(res.t('taskNotFound'));
}
} else if (task.userId !== user._id) { // If the task is owned by an user make it's the current one
throw new NotFound(res.t('taskNotFound'));
}
res.respond(200, task); res.respond(200, task);
}, },
}; };

5
website/src/models/challenge.js
View File

@@ -125,7 +125,10 @@ schema.methods.addTasksToMembers = async function addTasksToMembers (tasks) {
// Add tasks to users sequentially so that we don't kill the server (hopefully); // Add tasks to users sequentially so that we don't kill the server (hopefully);
// using a for...of loop allows each op to be run in sequence // using a for...of loop allows each op to be run in sequence
for (let memberId of membersIds) { for (let memberId of membersIds) {
let update = User.update let updateQ = {$push: {}};
tasks.forEach(chalTask => {
})
await db.post(doc); await db.post(doc);
} }