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

refactor: Extract out finding task by id or _legacyId into a function

Browse Source
This commit is contained in:
Blade Barringer
2016-05-17 17:11:08 -05:00
parent 38473f09c7
commit dba53b85a2
1 changed files with 22 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
website/server/controllers/api-v2/user.js
View File

@@ -80,6 +80,25 @@ var findTask = function(req, res) {
return res.locals.user.tasks[req.params.id]; return res.locals.user.tasks[req.params.id];
}; };
function findTaskByIdOrLegacyId (user, taskId, callback) {
asyncM.waterfall([
function (cb) {
Tasks.Task.findOne({
_id: taskId,
userId: user._id,
}, cb);
},
function (task, cb) {
if (task) return cb(null, task);
Tasks.Task.findOne({
_legacyId: taskId,
userId: user._id,
}, cb);
},
], callback);
}
/* /*
API Routes API Routes
--------------- ---------------
@@ -99,22 +118,7 @@ api.score = function(req, res, next) {
return res.json(400, {err: ":direction must be 'up' or 'down'"}); return res.json(400, {err: ":direction must be 'up' or 'down'"});
} }
asyncM.waterfall([ findTaskByIdOrLegacyId(user, id, function (err, task) {
function (cb) {
Tasks.Task.findOne({
_id: id,
userId: user._id,
}, cb);
},
function (task, cb) {
if (task) return cb(null, task);
Tasks.Task.findOne({
_legacyId: id,
userId: user._id,
}, cb);
},
], function (err, task) {
if (err) return next(err); if (err) return next(err);
// If exists already, score it // If exists already, score it
@@ -228,22 +232,7 @@ api.getTask = function(req, res, next) {
var user = res.locals.user, var user = res.locals.user,
id = req.params.id; id = req.params.id;
asyncM.waterfall([ findTaskByIdOrLegacyId(user, id, function (err, task) {
function (cb) {
Tasks.Task.findOne({
_id: id,
userId: user._id,
}, cb);
},
function (task, cb) {
if (task) return cb(null, task);
Tasks.Task.findOne({
_legacyId: id,
userId: user._id,
}, cb);
},
], function (err, task) {
if (err) return next(err); if (err) return next(err);
if (!task) return res.status(404).json({err: shared.i18n.t('messageTaskNotFound')}); if (!task) return res.status(404).json({err: shared.i18n.t('messageTaskNotFound')});
res.status(200).json(task.toJSONV2()); res.status(200).json(task.toJSONV2());
@@ -863,27 +852,11 @@ api.deleteTask = function(req, res, next) {
api.updateTask = function(req, res, next) { api.updateTask = function(req, res, next) {
var user = res.locals.user, var user = res.locals.user,
taskQuery = { userId: user._id },
id = req.params.id; id = req.params.id;
req.body = Tasks.Task.fromJSONV2(req.body); req.body = Tasks.Task.fromJSONV2(req.body);
asyncM.waterfall([ findTaskByIdOrLegacyId(user, id, function (err, task) {
function (cb) {
Tasks.Task.findOne({
_id: id,
userId: user._id,
}, cb);
},
function (task, cb) {
if (task) return cb(null, task);
Tasks.Task.findOne({
_legacyId: id,
userId: user._id,
}, cb);
},
], function (err, task) {
if(err) return next(err); if(err) return next(err);
if(!task) return res.status(404).json({err: 'Task not found.'}) if(!task) return res.status(404).json({err: 'Task not found.'})