mirror of
https://github.com/HabitRPG/habitica.git
synced 2025-12-18 07:07:35 +01:00
add update challenge with tests
This commit is contained in:
@@ -50,6 +50,7 @@
|
|||||||
"winnerIdRequired": "\"winnerId\" must be a valid UUID.",
|
"winnerIdRequired": "\"winnerId\" must be a valid UUID.",
|
||||||
"challengeNotFound": "Challenge not found.",
|
"challengeNotFound": "Challenge not found.",
|
||||||
"onlyLeaderDeleteChal": "Only the challenge leader can delete it.",
|
"onlyLeaderDeleteChal": "Only the challenge leader can delete it.",
|
||||||
|
"onlyLeaderUpdateChal": "Only the challenge leader can update it.",
|
||||||
"winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.",
|
"winnerNotFound": "Winner with id \"<%= userId %>\" not found or not part of the challenge.",
|
||||||
"noCompletedTodosChallenge": "\"includeComepletedTodos\" is not supported when fetching a challenge tasks.",
|
"noCompletedTodosChallenge": "\"includeComepletedTodos\" is not supported when fetching a challenge tasks.",
|
||||||
"userTasksNoChallengeId": "When \"tasksOwner\" is \"user\" \"challengeId\" can't be passed.",
|
"userTasksNoChallengeId": "When \"tasksOwner\" is \"user\" \"challengeId\" can't be passed.",
|
||||||
|
|||||||
@@ -0,0 +1,76 @@
|
|||||||
|
import {
|
||||||
|
generateUser,
|
||||||
|
generateChallenge,
|
||||||
|
createAndPopulateGroup,
|
||||||
|
translate as t,
|
||||||
|
} from '../../../../helpers/api-v3-integration.helper';
|
||||||
|
|
||||||
|
describe('PUT /challenges/:challengeId', () => {
|
||||||
|
let privateGuild, user, nonMember, challenge, member;
|
||||||
|
|
||||||
|
beforeEach(async () => {
|
||||||
|
let { group, groupLeader, members } = await createAndPopulateGroup({
|
||||||
|
groupDetails: {
|
||||||
|
name: 'TestPrivateGuild',
|
||||||
|
type: 'guild',
|
||||||
|
privacy: 'private',
|
||||||
|
},
|
||||||
|
members: 1,
|
||||||
|
});
|
||||||
|
|
||||||
|
privateGuild = group;
|
||||||
|
user = groupLeader;
|
||||||
|
|
||||||
|
nonMember = await generateUser();
|
||||||
|
member = members[0];
|
||||||
|
|
||||||
|
challenge = await generateChallenge(user, group);
|
||||||
|
await member.post(`/challenges/${challenge._id}/join`);
|
||||||
|
});
|
||||||
|
|
||||||
|
it('fails if the user can\'t view the challenge', async () => {
|
||||||
|
await expect(nonMember.put(`/challenges/${challenge._id}`))
|
||||||
|
.to.eventually.be.rejected.and.eql({
|
||||||
|
code: 404,
|
||||||
|
error: 'NotFound',
|
||||||
|
message: t('challengeNotFound'),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('should only allow the leader or an admin to update the challenge', async () => {
|
||||||
|
await expect(member.put(`/challenges/${challenge._id}`))
|
||||||
|
.to.eventually.be.rejected.and.eql({
|
||||||
|
code: 401,
|
||||||
|
error: 'NotAuthorized',
|
||||||
|
message: t('onlyLeaderUpdateChal'),
|
||||||
|
});
|
||||||
|
});
|
||||||
|
|
||||||
|
it('only updates allowed fields', async () => {
|
||||||
|
let res = await user.put(`/challenges/${challenge._id}`, {
|
||||||
|
// ignored
|
||||||
|
prize: 33,
|
||||||
|
groupId: 'blabla',
|
||||||
|
memberCount: 33,
|
||||||
|
tasksOrder: 'new order',
|
||||||
|
official: true,
|
||||||
|
shortName: 'new short name',
|
||||||
|
|
||||||
|
// applied
|
||||||
|
name: 'New Challenge Name',
|
||||||
|
description: 'New challenge description.',
|
||||||
|
leader: member._id,
|
||||||
|
});
|
||||||
|
|
||||||
|
expect(res.prize).to.equal(0);
|
||||||
|
expect(res.groupId).to.equal(privateGuild._id);
|
||||||
|
expect(res.memberCount).to.equal(2);
|
||||||
|
expect(res.tasksOrder).not.to.equal('new order');
|
||||||
|
expect(res.official).to.equal(false);
|
||||||
|
expect(res.shortName).not.to.equal('new short name');
|
||||||
|
|
||||||
|
expect(res.leader).to.equal(member._id);
|
||||||
|
expect(res.name).to.equal('New Challenge Name');
|
||||||
|
expect(res.description).to.equal('New challenge description.');
|
||||||
|
});
|
||||||
|
});
|
||||||
@@ -3,7 +3,9 @@ import _ from 'lodash';
|
|||||||
import cron from '../../middlewares/api-v3/cron';
|
import cron from '../../middlewares/api-v3/cron';
|
||||||
import { model as Challenge } from '../../models/challenge';
|
import { model as Challenge } from '../../models/challenge';
|
||||||
import { model as Group } from '../../models/group';
|
import { model as Group } from '../../models/group';
|
||||||
import { model as User } from '../../models/user';
|
import {
|
||||||
|
model as User,
|
||||||
|
} from '../../models/user';
|
||||||
import {
|
import {
|
||||||
NotFound,
|
NotFound,
|
||||||
NotAuthorized,
|
NotAuthorized,
|
||||||
@@ -199,6 +201,43 @@ api.getChallenge = {
|
|||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @api {put} /challenges/:challengeId Update a challenge
|
||||||
|
* @apiVersion 3.0.0
|
||||||
|
* @apiName UpdateChallenge
|
||||||
|
* @apiGroup Challenge
|
||||||
|
*
|
||||||
|
* @apiParam {UUID} challengeId The challenge _id
|
||||||
|
*
|
||||||
|
* @apiSuccess {object} challenge The updated challenge object
|
||||||
|
*/
|
||||||
|
api.updateChallenge = {
|
||||||
|
method: 'PUT',
|
||||||
|
url: '/challenges/:challengeId',
|
||||||
|
middlewares: [authWithHeaders(), cron],
|
||||||
|
async handler (req, res) {
|
||||||
|
req.checkParams('challengeId', res.t('challengeIdRequired')).notEmpty().isUUID();
|
||||||
|
|
||||||
|
let validationErrors = req.validationErrors();
|
||||||
|
if (validationErrors) throw validationErrors;
|
||||||
|
|
||||||
|
let user = res.locals.user;
|
||||||
|
let challengeId = req.params.challengeId;
|
||||||
|
|
||||||
|
let challenge = await Challenge.findById(challengeId).exec();
|
||||||
|
if (!challenge) throw new NotFound(res.t('challengeNotFound'));
|
||||||
|
|
||||||
|
let group = await Group.getGroup({user, groupId: challenge.groupId, fields: '_id name type privacy', optionalMembership: true});
|
||||||
|
if (!group || !challenge.canView(user, group)) throw new NotFound(res.t('challengeNotFound'));
|
||||||
|
if (!challenge.canModify(user)) throw new NotAuthorized(res.t('onlyLeaderUpdateChal'));
|
||||||
|
|
||||||
|
_.merge(challenge, Challenge.sanitizeUpdate(req.body));
|
||||||
|
|
||||||
|
let savedChal = await challenge.save();
|
||||||
|
res.respond(200, savedChal);
|
||||||
|
},
|
||||||
|
};
|
||||||
|
|
||||||
// TODO everything here should be moved to a worker
|
// TODO everything here should be moved to a worker
|
||||||
// actually even for a worker it's probably just to big and will kill mongo
|
// actually even for a worker it's probably just to big and will kill mongo
|
||||||
function _closeChal (challenge, broken = {}) {
|
function _closeChal (challenge, broken = {}) {
|
||||||
|
|||||||
@@ -302,7 +302,7 @@ api.updateTask = {
|
|||||||
delete req.body.tags;
|
delete req.body.tags;
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO we have to convert task to an object because otherwise thigns doesn't get merged correctly, very bad for performances
|
// TODO we have to convert task to an object because otherwise thigns doesn't get merged correctly, bad for performances?
|
||||||
// TODO regarding comment above make sure other models with nested fields are using this trick too
|
// TODO regarding comment above make sure other models with nested fields are using this trick too
|
||||||
_.assign(task, _.merge(task.toObject(), Tasks.Task.sanitizeUpdate(req.body)));
|
_.assign(task, _.merge(task.toObject(), Tasks.Task.sanitizeUpdate(req.body)));
|
||||||
// TODO console.log(task.modifiedPaths(), task.toObject().repeat === tep)
|
// TODO console.log(task.modifiedPaths(), task.toObject().repeat === tep)
|
||||||
|
|||||||
@@ -10,9 +10,9 @@ let Schema = mongoose.Schema;
|
|||||||
|
|
||||||
let schema = new Schema({
|
let schema = new Schema({
|
||||||
name: {type: String, required: true},
|
name: {type: String, required: true},
|
||||||
shortName: {type: String, required: true}, // TODO what is it?
|
shortName: {type: String, required: true},
|
||||||
description: String,
|
description: String,
|
||||||
official: {type: Boolean, default: false}, // TODO only settable by admin
|
official: {type: Boolean, default: false},
|
||||||
tasksOrder: {
|
tasksOrder: {
|
||||||
habits: [{type: String, ref: 'Task'}],
|
habits: [{type: String, ref: 'Task'}],
|
||||||
dailys: [{type: String, ref: 'Task'}],
|
dailys: [{type: String, ref: 'Task'}],
|
||||||
@@ -20,16 +20,22 @@ let schema = new Schema({
|
|||||||
rewards: [{type: String, ref: 'Task'}],
|
rewards: [{type: String, ref: 'Task'}],
|
||||||
},
|
},
|
||||||
leader: {type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.'], required: true},
|
leader: {type: String, ref: 'User', validate: [validator.isUUID, 'Invalid uuid.'], required: true},
|
||||||
groupId: {type: String, ref: 'Group', validate: [validator.isUUID, 'Invalid uuid.'], required: true}, // TODO no update, no set?
|
groupId: {type: String, ref: 'Group', validate: [validator.isUUID, 'Invalid uuid.'], required: true},
|
||||||
timestamp: {type: Date, default: Date.now, required: true}, // TODO what is this? use timestamps from plugin? not settable?
|
|
||||||
memberCount: {type: Number, default: 1},
|
memberCount: {type: Number, default: 1},
|
||||||
prize: {type: Number, default: 0, min: 0}, // TODO no update?
|
prize: {type: Number, default: 0, min: 0}, // TODO no update?
|
||||||
});
|
});
|
||||||
|
|
||||||
schema.plugin(baseModel, {
|
schema.plugin(baseModel, {
|
||||||
noSet: ['_id', 'memberCount', 'challengeCount', 'tasksOrder'],
|
noSet: ['_id', 'memberCount', 'tasksOrder'],
|
||||||
|
timestamps: true,
|
||||||
});
|
});
|
||||||
|
|
||||||
|
// A list of additional fields that cannot be updated (but can be set on creation)
|
||||||
|
let noUpdate = ['groupId', 'official', 'shortName', 'prize'];
|
||||||
|
schema.statics.sanitizeUpdate = function sanitizeUpdate (updateObj) {
|
||||||
|
return this.sanitize(updateObj, noUpdate);
|
||||||
|
};
|
||||||
|
|
||||||
// Returns true if user is a member of the challenge
|
// Returns true if user is a member of the challenge
|
||||||
schema.methods.isMember = function isChallengeMember (user) {
|
schema.methods.isMember = function isChallengeMember (user) {
|
||||||
return user.challenges.indexOf(this._id) !== -1;
|
return user.challenges.indexOf(this._id) !== -1;
|
||||||
|
|||||||
@@ -654,7 +654,7 @@ schema.methods.isSubscribed = function isSubscribed () {
|
|||||||
return !!this.purchased.plan.customerId; // eslint-disable-line no-implicit-coercion
|
return !!this.purchased.plan.customerId; // eslint-disable-line no-implicit-coercion
|
||||||
};
|
};
|
||||||
|
|
||||||
// Unlink challenges tasks from user
|
// Unlink challenges tasks (and the challenge itself) from user
|
||||||
schema.methods.unlinkChallengeTasks = async function unlinkChallengeTasks (challengeId, keep) {
|
schema.methods.unlinkChallengeTasks = async function unlinkChallengeTasks (challengeId, keep) {
|
||||||
let user = this;
|
let user = this;
|
||||||
let findQuery = {
|
let findQuery = {
|
||||||
|
|||||||
Reference in New Issue
Block a user