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

starts writing tests for tasks, fix errors in auth middleware and tasks methods

Browse Source
This commit is contained in:
Matteo Pagliazzi
2015-12-03 17:48:32 +01:00
parent 62708d4365
commit 506609cc29
4 changed files with 67 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,6 +25,9 @@ api.createTask = {
handler (req, res, next) {
req.checkBody('type', res.t('invalidTaskType')).notEmpty().isIn(Tasks.tasksTypes);
let validationErrors = req.validationErrors();
if (validationErrors) return next(validationErrors);
let user = res.locals.user;
let taskType = req.body.type;
@@ -60,6 +63,9 @@ api.getTasks = {
handler (req, res, next) {
req.checkQuery('type', res.t('invalidTaskType')).isIn(Tasks.tasksTypes);
let validationErrors = req.validationErrors();
if (validationErrors) return next(validationErrors);
let user = res.locals.user;
let query = {userId: user._id};
let type = req.query.type;
@@ -115,6 +121,9 @@ api.getTask = {
req.checkParams('taskId', res.t('taskIdRequired')).notEmpty().isUUID();
let validationErrors = req.validationErrors();
if (validationErrors) return next(validationErrors);
Tasks.Task.findOne({
_id: req.params.taskId,
userId: user._id,
@@ -147,6 +156,9 @@ api.updateTask = {
req.checkParams('taskId', res.t('taskIdRequired')).notEmpty().isUUID();
// TODO check that req.body isn't empty
let validationErrors = req.validationErrors();
if (validationErrors) return next(validationErrors);
Tasks.Task.findOne({
_id: req.params.taskId,
userId: user._id,
@@ -188,6 +200,9 @@ api.scoreTask = {
req.checkParams('taskId', res.t('taskIdRequired')).notEmpty().isUUID();
req.checkParams('direction', res.t('directionUpDown')).notEmpty().isIn(['up', 'down']);
let validationErrors = req.validationErrors();
if (validationErrors) return next(validationErrors);
let user = res.locals.user;
Tasks.Task.findOne({
@@ -223,6 +238,9 @@ api.moveTask = {
req.checkParams('taskId', res.t('taskIdRequired')).notEmpty().isUUID();
req.checkParams('position', res.t('positionRequired')).notEmpty().isNumeric();
let validationErrors = req.validationErrors();
if (validationErrors) return next(validationErrors);
let user = res.locals.user;
let to = Number(req.params.position);
@@ -274,6 +292,9 @@ api.addChecklistItem = {
req.checkParams('taskId', res.t('taskIdRequired')).notEmpty().isUUID();
// TODO check that req.body isn't empty and is an array
let validationErrors = req.validationErrors();
if (validationErrors) return next(validationErrors);
Tasks.Task.findOne({
_id: req.params.taskId,
userId: user._id,
@@ -311,6 +332,9 @@ api.scoreCheckListItem = {
req.checkParams('taskId', res.t('taskIdRequired')).notEmpty().isUUID();
req.checkParams('itemId', res.t('itemIdRequired')).notEmpty().isUUID();
let validationErrors = req.validationErrors();
if (validationErrors) return next(validationErrors);
Tasks.Task.findOne({
_id: req.params.taskId,
userId: user._id,
@@ -351,6 +375,9 @@ api.updateChecklistItem = {
req.checkParams('taskId', res.t('taskIdRequired')).notEmpty().isUUID();
req.checkParams('itemId', res.t('itemIdRequired')).notEmpty().isUUID();
let validationErrors = req.validationErrors();
if (validationErrors) return next(validationErrors);
Tasks.Task.findOne({
_id: req.params.taskId,
userId: user._id,
@@ -392,6 +419,9 @@ api.removeChecklistItem = {
req.checkParams('taskId', res.t('taskIdRequired')).notEmpty().isUUID();
req.checkParams('itemId', res.t('itemIdRequired')).notEmpty().isUUID();
let validationErrors = req.validationErrors();
if (validationErrors) return next(validationErrors);
Tasks.Task.findOne({
_id: req.params.taskId,
userId: user._id,
@@ -446,6 +476,9 @@ api.deleteTask = {
req.checkParams('taskId', res.t('taskIdRequired')).notEmpty().isUUID();
let validationErrors = req.validationErrors();
if (validationErrors) return next(validationErrors);
Tasks.Task.findOne({
_id: req.params.taskId,
userId: user._id,