port updateTask, addTask, clearCompleted, taskDefaults, uuid

common/script/libs/taskDefaults.js

@@ -1,71 +1,74 @@
-import uuid from './uuid';
+import { v4 as uuid } from 'uuid';
 import _ from 'lodash';
+import moment from 'moment';
 
-/*
-Even though Mongoose handles task defaults, we want to make sure defaults are set on the client-side before
-sending up to the server for performance
- */
+// Even though Mongoose handles task defaults, we want to make sure defaults are set on the client-side before
+// sending up to the server for performance
 
-// TODO revisit
+// TODO move to client code?
 
-module.exports = function(task) {
-  var defaults, ref, ref1, ref2;
-  if (task == null) {
-    task = {};
-  }
-  if (!(task.type && ((ref = task.type) === 'habit' || ref === 'daily' || ref === 'todo' || ref === 'reward'))) {
+const tasksTypes = ['habit', 'daily', 'todo', 'reward'];
+
+module.exports = function taskDefaults (task = {}) {
+  if (!task.type || tasksTypes.indexOf(task.type) === -1) {
     task.type = 'habit';
   }
-  defaults = {
-    id: uuid(),
-    text: task.id != null ? task.id : '',
+
+  let defaultId = uuid();
+  let defaults = {
+    _id: defaultId, // TODO convert all occurencies of id to _id
+    text: task._id || defaultId,
     notes: '',
+    tags: [],
+    value: task.type === 'reward' ? 10 : 0,
     priority: 1,
     challenge: {},
+    reminders: {},
     attribute: 'str',
-    dateCreated: new Date()
+    createdAt: new Date(), // TODO these are going to be overwritten by the server...
+    updatedAt: new Date(),
   };
+
   _.defaults(task, defaults);
+
+  if (task.type === 'habit' || task.type === 'daily') {
+    _.defaults(task, {
+      history: [],
+    });
+  }
+
+  if (task.type === 'todo' || task.type === 'daily') {
+    _.defaults(task, {
+      completed: false,
+      collapseChecklist: false,
+      checklist: [],
+    });
+  }
+
   if (task.type === 'habit') {
     _.defaults(task, {
       up: true,
-      down: true
-    });
-  }
-  if ((ref1 = task.type) === 'habit' || ref1 === 'daily') {
-    _.defaults(task, {
-      history: []
-    });
-  }
-  if ((ref2 = task.type) === 'daily' || ref2 === 'todo') {
-    _.defaults(task, {
-      completed: false
+      down: true,
     });
   }
+
   if (task.type === 'daily') {
     _.defaults(task, {
       streak: 0,
       repeat: {
-        su: true,
         m: true,
         t: true,
         w: true,
         th: true,
         f: true,
-        s: true
-      }
-    }, {
-      startDate: new Date(),
+        s: true,
+        su: true,
+      },
+      startDate: moment().startOf('day').toDate(),
       everyX: 1,
-      frequency: 'weekly'
+      frequency: 'weekly',
     });
   }
-  task._id = task.id;
-  if (task.value == null) {
-    task.value = task.type === 'reward' ? 10 : 0;
-  }
-  if (!_.isNumber(task.priority)) {
-    task.priority = 1;
-  }
+
   return task;
 };