Merge pull request #6787 from TheHollidayInn/api-v3-challenge-model-tests

Added initial challenge model tests

website/src/controllers/api-v3/challenges.js

@@ -191,7 +191,7 @@ api.leaveChallenge = {
     challenge.memberCount -= 1;
 
     // Unlink challenge's tasks from user's tasks and save the challenge
-    await Q.all([user.unlinkChallengeTasks(challenge._id, keep), challenge.save()]);
+    await Q.all([challenge.unlinkTasks(user, keep), challenge.save()]);
     res.respond(200, {});
   },
 };

website/src/models/challenge.js

@@ -5,6 +5,7 @@ import baseModel from '../libs/api-v3/baseModel';
 import _ from 'lodash';
 import * as Tasks from './task';
 import { model as User } from './user';
+import { removeFromArray } from '../libs/api-v3/collectionManipulators';
 
 let Schema = mongoose.Schema;
 
@@ -186,9 +187,10 @@ schema.methods.updateTask = async function challengeUpdateTask (task) {
 
   let updateCmd = {$set: {}};
 
-  _syncableAttrs(task).forEach((value, key) => {
-    updateCmd.$set[key] = value;
-  });
+  let syncableAttrs = _syncableAttrs(task);
+  for (let key in syncableAttrs) {
+    updateCmd.$set[key] = syncableAttrs[key];
+  }
 
   // TODO reveiw
   // Updating instead of loading and saving for performances, risks becoming a problem if we introduce more complexity in tasks
@@ -213,4 +215,37 @@ schema.methods.removeTask = async function challengeRemoveTask (task) {
   }, {multi: true}).exec();
 };
 
+// Unlink challenges tasks (and the challenge itself) from user
+schema.methods.unlinkTasks = async function challengeUnlinkTasks (user, keep) {
+  let challengeId = this._id;
+  let findQuery = {
+    userId: user._id,
+    'challenge.id': challengeId,
+  };
+
+  removeFromArray(user.challenges, challengeId);
+
+  if (keep === 'keep-all') {
+    await Tasks.Task.update(findQuery, {
+      $set: {challenge: {}}, // TODO what about updatedAt?
+    }, {multi: true}).exec();
+
+    await user.save();
+  } else { // keep = 'remove-all'
+    let tasks = await Tasks.Task.find(findQuery).select('_id type completed').exec();
+    let taskPromises = tasks.map(task => {
+      // Remove task from user.tasksOrder and delete them
+      if (task.type !== 'todo' || !task.completed) {
+        removeFromArray(user.tasksOrder[`${task.type}s`], task._id);
+      }
+
+      return task.remove();
+    });
+    user.markModified('tasksOrder');
+    taskPromises.push(user.save());
+    return Q.all(taskPromises);
+  }
+};
+
+
 export let model = mongoose.model('Challenge', schema);

website/src/models/group.js

@@ -587,7 +587,7 @@ schema.methods.leave = async function leaveGroup (user, keep = 'keep-all') {
   });
 
   let challengesToRemoveUserFrom = challenges.map(chal => {
-    return user.unlinkChallengeTasks(chal._id, keep);
+    return chal.unlinkTasks(user, keep);
   });
   await Q.all(challengesToRemoveUserFrom);
 

website/src/models/user.js

@@ -6,7 +6,6 @@ import moment from 'moment';
 import * as Tasks from './task';
 import Q from 'q';
 import { schema as TagSchema } from './tag';
-import { removeFromArray } from '../libs/api-v3/collectionManipulators';
 import baseModel from '../libs/api-v3/baseModel';
 // import {model as Challenge} from './challenge';
 
@@ -703,38 +702,6 @@ schema.methods.getGroups = function getUserGroups () {
   return userGroups;
 };
 
-// Unlink challenges tasks (and the challenge itself) from user
-schema.methods.unlinkChallengeTasks = async function unlinkChallengeTasks (challengeId, keep) {
-  let user = this;
-  let findQuery = {
-    userId: user._id,
-    'challenge.id': challengeId,
-  };
-
-  removeFromArray(user.challenges, challengeId);
-
-  if (keep === 'keep-all') {
-    await Tasks.Task.update(findQuery, {
-      $set: {challenge: {}}, // TODO what about updatedAt?
-    }, {multi: true}).exec();
-
-    await user.save();
-  } else { // keep = 'remove-all'
-    let tasks = await Tasks.Task.find(findQuery).select('_id type completed').exec();
-    let taskPromises = tasks.map(task => {
-      // Remove task from user.tasksOrder and delete them
-      if (task.type !== 'todo' || !task.completed) {
-        removeFromArray(user.tasksOrder[`${task.type}s`], task._id);
-      }
-
-      return task.remove();
-    });
-
-    taskPromises.push(user.save());
-    return Q.all(taskPromises);
-  }
-};
-
 export let model = mongoose.model('User', schema);
 
 // Initially export an empty object so external requires will get