resolving conflicts

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

@@ -399,6 +399,7 @@ api.scoreTask = {
     if (direction === 'up') user.fns.randomDrop({task, delta}, req);
 
     // If a todo was completed or uncompleted move it in or out of the user.tasksOrder.todos list
+    // TODO move to common code?
     if (task.type === 'todo') {
       if (!wasCompleted && task.completed) {
         removeFromArray(user.tasksOrder.todos, task._id);
@@ -406,9 +407,7 @@ api.scoreTask = {
         let hasTask = removeFromArray(user.tasksOrder.todos, task._id);
         if (!hasTask) {
           user.tasksOrder.todos.push(task._id); // TODO push at the top?
-        } else { // If for some reason it hadn't been removed TODO ok?
-          user.tasksOrder.push(task._id);
-        }
+        } // If for some reason it hadn't been removed previously don't do anything TODO ok?
       }
     }
 

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

@@ -219,6 +219,10 @@ api.deleteUser = {
 
     await Q.all(groupLeavePromises);
 
+    await Tasks.Task.remove({
+      userId: user._id,
+    }).exec();
+
     await user.remove();
 
     res.respond(200, {});
@@ -779,7 +783,7 @@ api.addWebhook = {
     let user = res.locals.user;
     let result = common.ops.addWebhook(user, req);
     await user.save();
-    res.respond(200, {id: result.id});
+    res.respond(200, result);
   },
 };
 
@@ -796,9 +800,9 @@ api.updateWebhook = {
   url: '/user/webhook/:id',
   async handler (req, res) {
     let user = res.locals.user;
-    common.ops.updateWebhook(user, req);
+    let result = common.ops.updateWebhook(user, req);
     await user.save();
-    res.respond(200, {});
+    res.respond(200, result);
   },
 };
 
@@ -822,4 +826,63 @@ api.deleteWebhook = {
 };
 
 
+/* @api {post} /user/release-pets Releases pets.
+* @apiVersion 3.0.0
+* @apiName UserReleasePets
+* @apiGroup User
+*
+* @apiSuccess {Object} data `user.items.pets`
+*/
+api.userReleasePets = {
+  method: 'POST',
+  middlewares: [authWithHeaders(), cron],
+  url: '/user/release-pets',
+  async handler (req, res) {
+    let user = res.locals.user;
+    let releasePetsResponse = common.ops.releasePets(user, req, res.analytics);
+    await user.save();
+    res.respond(200, releasePetsResponse);
+  },
+};
+
+/*
+* @api {post} /user/release-both Releases Pets and Mounts and grants Triad Bingo.
+* @apiVersion 3.0.0
+* @apiName UserReleaseBoth
+* @apiGroup User
+*
+* @apiSuccess {Object} data `user.items.gear.owned`
+*/
+api.userReleaseBoth = {
+  method: 'POST',
+  middlewares: [authWithHeaders(), cron],
+  url: '/user/release-both',
+  async handler (req, res) {
+    let user = res.locals.user;
+    let releaseBothResponse = common.ops.releaseBoth(user, req, res.analytics);
+    await user.save();
+    res.respond(200, releaseBothResponse);
+  },
+};
+
+/*
+* @api {post} /user/release-mounts Released mounts.
+* @apiVersion 3.0.0
+* @apiName UserReleaseMounts
+* @apiGroup User
+*
+* @apiSuccess {Object} data `mounts`
+*/
+api.userReleaseMounts = {
+  method: 'POST',
+  middlewares: [authWithHeaders(), cron],
+  url: '/user/release-mounts',
+  async handler (req, res) {
+    let user = res.locals.user;
+    let releaseMountsResponse = common.ops.releaseMounts(user, req, res.analytics);
+    await user.save();
+    res.respond(200, releaseMountsResponse);
+  },
+};
+
 module.exports = api;