port updateTask, addTask, clearCompleted, taskDefaults, uuid

common/script/ops/addTask.js

@@ -1,27 +1,22 @@
 import taskDefaults from '../libs/taskDefaults';
-import i18n from '../i18n';
 
-module.exports = function(user, req, cb) {
-  var task;
-  task = taskDefaults(req.body);
-  if (user.tasks[task.id] != null) {
-    return typeof cb === "function" ? cb({
-      code: 409,
-      message: i18n.t('messageDuplicateTaskID', req.language)
-    }) : void 0;
-  }
-  user[task.type + "s"].unshift(task);
+// TODO move to client since it's only used there?
+
+module.exports = function addTask (user, req = {body: {}}) {
+  let task = taskDefaults(req.body);
+  user.tasksOrder[`${task.type}s`].unshift(task._id);
+
   if (user.preferences.newTaskEdit) {
     task._editing = true;
   }
+
   if (user.preferences.tagsCollapsed) {
     task._tags = true;
   }
+
   if (!user.preferences.advancedCollapsed) {
     task._advanced = true;
   }
-  if (typeof cb === "function") {
-    cb(null, task);
-  }
+
   return task;
 };

common/script/ops/clearCompleted.js

@@ -1,12 +1,10 @@
 import _ from 'lodash';
 
-module.exports = function(user, req, cb) {
-  _.remove(user.todos, function(t) {
-    var ref;
-    return t.completed && !((ref = t.challenge) != null ? ref.id : void 0);
+// TODO move to client since it's only used there?
+// TODO rename file to clearCompletedTodos
+
+module.exports = function clearCompletedTodos (todos) {
+  _.remove(todos, todo => {
+    return todo.completed && (!todo.challenge || !todo.challenge.id || todo.challenge.broken);
   });
-  if (typeof user.markModified === "function") {
-    user.markModified('todos');
-  }
-  return typeof cb === "function" ? cb(null, user.todos) : void 0;
 };

common/script/ops/updateTask.js

@@ -1,23 +1,26 @@
-import i18n from '../i18n';
 import _ from 'lodash';
 
-module.exports = function(user, req, cb) {
-  var ref, task;
-  if (!(task = user.tasks[(ref = req.params) != null ? ref.id : void 0])) {
-    return typeof cb === "function" ? cb({
-      code: 404,
-      message: i18n.t('messageTaskNotFound', req.language)
-    }) : void 0;
-  }
-  _.merge(task, _.omit(req.body, ['checklist', 'reminders', 'id', 'type']));
-  if (req.body.checklist) {
-    task.checklist = req.body.checklist;
-  }
+// From server pass task.toObject() not the task document directly
+module.exports = function updateTask (task, req = {}) {
+  // If reminders are updated -> replace the original ones
   if (req.body.reminders) {
     task.reminders = req.body.reminders;
+    delete req.body.reminders;
   }
-  if (typeof task.markModified === "function") {
-    task.markModified('tags');
+
+  // If checklist is updated -> replace the original one
+  if (req.body.checklist) {
+    task.checklist = req.body.checklist;
+    delete req.body.checklist;
   }
-  return typeof cb === "function" ? cb(null, task) : void 0;
+
+  // If tags are updated -> replace the original ones
+  if (req.body.tags) {
+    task.tags = req.body.tags;
+    delete req.body.tags;
+  }
+
+  _.merge(task, _.omit(req.body, ['_id', 'id', 'type']));
+
+  return task;
 };