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

Updated task model to allow setting streak (#7306)

Browse Source
This commit is contained in:
Keith Holliday
2016-05-16 13:12:46 -05:00
committed by Matteo Pagliazzi
parent cfb5e2be60
commit dbd6daeca0
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
test/api/v3/integration/tasks/POST-tasks_user.test.js
View File

@@ -108,7 +108,7 @@ describe('POST /tasks/user', () => {
}); });
it(`ignores setting userId, history, createdAt, it(`ignores setting userId, history, createdAt,
updatedAt, challenge, completed, streak, updatedAt, challenge, completed,
dateCompleted fields`, async () => { dateCompleted fields`, async () => {
let task = await user.post('/tasks/user', { let task = await user.post('/tasks/user', {
text: 'test daily', text: 'test daily',
@@ -119,7 +119,6 @@ describe('POST /tasks/user', () => {
updatedAt: 'tomorrow', updatedAt: 'tomorrow',
challenge: 'no', challenge: 'no',
completed: true, completed: true,
streak: 25,
dateCompleted: 'never', dateCompleted: 'never',
value: 324, // ignored because not a reward value: 324, // ignored because not a reward
}); });
@@ -130,7 +129,6 @@ describe('POST /tasks/user', () => {
expect(task.updatedAt).not.to.equal('tomorrow'); expect(task.updatedAt).not.to.equal('tomorrow');
expect(task.challenge).not.to.equal('no'); expect(task.challenge).not.to.equal('no');
expect(task.completed).to.equal(false); expect(task.completed).to.equal(false);
expect(task.streak).to.equal(0);
expect(task.streak).not.to.equal('never'); expect(task.streak).not.to.equal('never');
expect(task.value).not.to.equal(324); expect(task.value).not.to.equal(324);
}); });

2
website/server/models/task.js
View File

@@ -56,7 +56,7 @@ export let TaskSchema = new Schema({
}, discriminatorOptions)); }, discriminatorOptions));
TaskSchema.plugin(baseModel, { TaskSchema.plugin(baseModel, {
noSet: ['challenge', 'userId', 'completed', 'history', 'streak', 'dateCompleted', 'completed'], noSet: ['challenge', 'userId', 'completed', 'history', 'dateCompleted', 'completed'],
sanitizeTransform (taskObj) { sanitizeTransform (taskObj) {
if (taskObj.type && taskObj.type !== 'reward') { // value should be settable directly only for rewards if (taskObj.type && taskObj.type !== 'reward') { // value should be settable directly only for rewards
delete taskObj.value; delete taskObj.value;