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

Added tests for challenge task scoring and moved scoring code to model

Browse Source
This commit is contained in:
Keith Holliday
2016-03-18 14:00:14 -05:00
parent 99ff440abc
commit b46219adc5
6 changed files with 265 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,8 +13,6 @@ import {
import common from '../../../../common';
import Q from 'q';
import _ from 'lodash';
import moment from 'moment';
import { preenHistory } from '../../libs/api-v3/preening';
let api = {};
@@ -438,31 +436,7 @@ api.scoreTask = {
_id: task.challenge.taskId,
}).exec();
chalTask.value += delta;
if (chalTask.type === 'habit' || chalTask.type === 'daily') {
// Add only one history entry per day
if (moment(chalTask.history[chalTask.history.length - 1].date).isSame(new Date(), 'day')) {
chalTask.history[chalTask.history.length - 1] = {
date: Number(new Date()),
value: chalTask.value,
};
chalTask.markModified(`history.${chalTask.history.length - 1}`);
} else {
chalTask.history.push({
date: Number(new Date()),
value: chalTask.value,
});
// Only preen task history once a day when the task is scored first
if (chalTask.history.length > 365) {
chalTask.history = preenHistory(chalTask.history, true); // true means the challenge will retain as much entries as a subscribed user
chalTask.markModified(`history.${chalTask.history.length - 1}`);
}
}
}
await chalTask.save();
await chalTask.scoreChallengeTask(delta);
} catch (e) {
// TODO handle
}