allow bulk delete of ticks

islandio · May 17, 2015 · bc2bdd5 · bc2bdd5
1 parent 033bddf
commit bc2bdd5
Show file tree

Hide file tree

Showing 11 changed files with 98 additions and 65 deletions.
diff --git a/lib/resources/ascent.js b/lib/resources/ascent.js
@@ -215,6 +215,9 @@ exports.routes = function () {
     // Get the ascent.
     db.Ascents.read({_id: id}, function (err, doc) {
       if (err) return cb(err);
+      if (!doc) {
+        return cb({error: {code: 404, message: 'Ascent not found'}});
+      }
       if (member._id.toString() !== doc.author_id.toString() && !member.admin) {
         return cb({error: {code: 403, message: 'Member invalid'}});
       }

diff --git a/lib/resources/crag.js b/lib/resources/crag.js
@@ -617,7 +617,7 @@ exports.routes = function () {
 
     // Get the crag
     db.Crags.read({key: key}, function (err, doc) {
-      if (errorHandler(err, req, res)) return;
+      if (errorHandler(err, req, res, doc, 'crag')) return;
       if ((!doc.author_id || mid.toString() !== doc.author_id.toString()) &&
           !req.user.admin) {
         return res.send(403, {error: {message: 'Member invalid'}});

diff --git a/lib/resources/tick.js b/lib/resources/tick.js
@@ -50,53 +50,26 @@ exports.routes = function () {
   var errorHandler = app.get('errorHandler');
   var events = app.get('events');
 
-  // List
-  app.post('/api/ticks/list', function (req, res) {
-    var cursor = req.body.cursor || 0;
-    var limit = req.body.limit || 5;
-    var query = {};
-
-    if (req.body.author_id) {
-      query.author_id = db.oid(req.body.author_id);
-    }
-    if (req.body.parent_id) {
-      query.parent_id = db.oid(req.body.parent_id);
+  function deleteTick(id, member, cb) {
+    if (!member) {
+      return cb({code: 403, error: {message: 'Member invalid'}});
     }
-
-    db.Ticks.list(query, {sort: {created: 1}, limit: limit,
-        skip: limit * cursor, inflate: {author: profiles.member}},
-        function (err, ticks) {
-      if (errorHandler(err, req, res)) return;
-
-      // Send profile.
-      res.send(iutil.client({
-        ticks: {
-          cursor: ++cursor,
-          more: ticks && ticks.length === limit,
-          items: ticks
-        }
-      }));
-
-    });
-
-  });
-
-  // Delete
-  app.delete('/api/ticks/:id', function (req, res) {
-    if (!req.user) {
-      return res.send(403, {error: 'Member invalid'});
+    if (_.isString(id)) {
+      id = db.oid(id);
     }
 
-    // Get the tick.
-    db.Ticks.read({_id: db.oid(req.params.id)}, function (err, doc) {
-      if (errorHandler(err, req, res, doc, 'tick')) return;
-      if (req.user._id.toString() !== doc.author_id.toString()) {
-        return res.send(403, {error: 'Member invalid'});
+    db.Ticks.read({_id: id}, function (err, doc) {
+      if (err) return cb(err);
+      if (!doc) {
+        return cb({error: {code: 404, message: 'Tick not found'}});
+      }
+      if (member._id.toString() !== doc.author_id.toString()) {
+        return cb({error: {code: 403, message: 'Member invalid'}});
       }
 
       // Get the event (from creation).
       db.Events.read({action_id: doc._id}, function (err, event) {
-        if (errorHandler(err, req, res)) return;
+        if (err) return cb(err);
 
         Step(
           function () {
@@ -132,43 +105,102 @@ exports.routes = function () {
             db.Comments.remove({parent_id: doc._id}, this.parallel());
             db.Hangtens.remove({parent_id: doc._id}, this.parallel());
             db.Subscriptions.remove({subscribee_id: doc._id}, this.parallel());
-            db.Events.remove({$or: [{target_id: doc._id}, {action_id: doc._id}]},
-                this.parallel());
+            db.Events.remove({$or: [{target_id: doc._id},
+                {action_id: doc._id}]}, this.parallel());
 
             // Finally, remove the tick.
             db.Ticks.remove({_id: doc._id}, this.parallel());
           },
           function (err) {
-            if (errorHandler(err, req, res)) return;
+            if (err) return this(err);
 
             // Get the tick's session's other ticks.
             db.Ticks.list({session_id: doc.session_id}, this);
           },
           function (err, ticks) {
-            if (errorHandler(err, req, res)) return;
+            if (err) return this(err);
 
             // Remove the session if it's empty.
             if (ticks.length === 0) {
-              Sessions.deleteSession(doc.session_id, req.user, this);
+              Sessions.deleteSession(doc.session_id, member, this);
             } else {
               this();
             }
           },
           function (err) {
-            if (errorHandler(err, req, res)) return;
+            if (err) return cb(err);
 
-            // Publish removed status.
             if (event) {
               events.publish('event', 'event.removed', {data: event});
             }
-            events.publish('tick', 'tick.removed', {data: {id: doc._id.toString()}});
+            events.publish('tick', 'tick.removed', {data: {id:
+                doc._id.toString()}});
 
-            // Finish.
-            res.send({removed: true});
+            cb();
           }
         );
       });
     });
+  }
+
+  // List
+  app.post('/api/ticks/list', function (req, res) {
+    var cursor = req.body.cursor || 0;
+    var limit = req.body.limit || 5;
+    var query = {};
+
+    if (req.body.author_id) {
+      query.author_id = db.oid(req.body.author_id);
+    }
+    if (req.body.parent_id) {
+      query.parent_id = db.oid(req.body.parent_id);
+    }
+
+    db.Ticks.list(query, {sort: {created: 1}, limit: limit,
+        skip: limit * cursor, inflate: {author: profiles.member}},
+        function (err, ticks) {
+      if (errorHandler(err, req, res)) return;
+
+      // Send profile.
+      res.send(iutil.client({
+        ticks: {
+          cursor: ++cursor,
+          more: ticks && ticks.length === limit,
+          items: ticks
+        }
+      }));
+
+    });
+
+  });
+
+  // Delete
+  app.delete('/api/ticks/:id', function (req, res) {
+    if (!req.user) {
+      return res.send(403, {error: 'Member invalid'});
+    }
+
+    if (req.params.id !== 'all') {
+      deleteTick(req.params.id, req.user, function (err) {
+        if (errorHandler(err, req, res)) return;
+        res.send({removed: true});
+      });
+    } else {
+      db.Ticks.list({author_id: req.user._id}, function (err, docs) {
+        if (errorHandler(err, req, res)) return;
+        if (docs.length === 0) {
+          return res.send({removed: true});
+        }
+
+        var done = _.after(docs.length, function (err) {
+          if (errorHandler(err, req, res)) return;
+          res.send({removedAll: true});
+        });
+        _.each(docs, function (doc) {
+          deleteTick(doc._id, req.user, done);
+        });
+      });
+    }
   });
 
   // Download

diff --git a/public/css/style.css b/public/css/style.css
@@ -5098,12 +5098,12 @@ input.import-input {
   width: 480px;
   margin-right: 10px;
   font-size: 16px;
+  vertical-align: -1px;
 }
 .import button.button.import-search-button {
   position: relative;
   width: 190px;
-  line-height: 32px;
-  height: 34px;
+  height: 36px;
 }
 .import ul.list {
   font-size: 14px;

diff --git a/public/css/style.styl b/public/css/style.styl
@@ -5181,12 +5181,13 @@ input.import-input
   width 480px
   margin-right 10px
   font-size 16px
+  vertical-align -1px
 
 .import button.button.import-search-button
   position relative
   width 190px
-  line-height 32px
-  height 34px
+  // line-height 36px
+  height 36px
 
 .import ul.list
   font-size 14px

diff --git a/public/js/models/card.js b/public/js/models/card.js
@@ -29,7 +29,7 @@ define([
           }
           ticks[grade].push(t);
         } else {
-          var k = 'not graded by you';
+          var k = 'ungraded';
           if (!ticks[k]) {
             ticks[k] = [];
           }

diff --git a/public/js/views/lists/ascents.js b/public/js/views/lists/ascents.js
@@ -114,7 +114,7 @@ define([
       // Handle type changes.
       this.data.ascents.bcnt = this.data.ascents.bcnt || 0;
       this.data.ascents.rcnt = this.data.ascents.rcnt || 0;
-      if (this.data.ascents.bcnt > this.data.ascents.rcnt) {
+      if (this.data.ascents.bcnt >= this.data.ascents.rcnt) {
         this.currentType = 'b';
         this.bouldersFilter.addClass('active');
         this.boulders.show();

diff --git a/public/js/views/settings.js b/public/js/views/settings.js
@@ -781,7 +781,6 @@ define([
     clearAscents: function (e) {
       e.preventDefault();
 
-      // Render the confirm modal.
       $.fancybox(_.template(confirm)({
         message: 'Clear all of your logs (work and "My Ascents") forever?',
       }), {
@@ -791,15 +790,13 @@ define([
         padding: 0
       });
 
-      // Setup actions.
       $('.modal-cancel').click(function (e) {
         $.fancybox.close();
       });
       $('.modal-confirm').click(_.bind(function (e) {
 
-        // Delete the member.
-        rest.delete('/api/ascents/' + this.app.profile.member.username +
-            '/all', {}, _.bind(function (err, data) {
+        // Delete all ticks.
+        rest.delete('/api/ticks/all', {}, _.bind(function (err, data) {
           if (err) {
             mps.publish('flash/new', [{err: err, level: 'error', type: 'popup'}]);
             return;

diff --git a/public/js/views/ticks.js b/public/js/views/ticks.js
@@ -137,7 +137,7 @@ define([
             data.type + '">');
         var grade;
         if (isNaN(Number(data.grade))) {
-          grade = 'not graded by you';
+          grade = 'ungraded';
         } else {
           grade = this.app.gradeConverter[data.type].indexes(data.grade);
         }

diff --git a/public/templates/import.insert.html b/public/templates/import.insert.html
@@ -1,6 +1,6 @@
 <%
   var data = this.model.attributes;
-  var grades = ['not graded by you'].concat(this.model.grades);
+  var grades = ['ungraded'].concat(this.model.grades);
 %>
 
 <div class="rightside">

diff --git a/public/templates/ticks.html b/public/templates/ticks.html
@@ -2,7 +2,7 @@
 
   // Save model attributes
   var data = this.model.attributes;
-  var grades = ['not graded by you'].concat(this.model.grades);
+  var grades = ['ungraded'].concat(this.model.grades);
 
   var own = !this.model || (this.app.profile.member && data.author.id === this.app.profile.member.id);
   var owner = own ? 'You\'re': data.author.displayName.trim() + ' is ';