refactor

Author: emmanuel

lib/roller.js

@@ -32,17 +32,14 @@ var Roller = {
   roll: function(){
     var chain = Promise.resolve();
 
-    return TaskMdl.find().exec()
-      .then(function(tasks){
-
-        tasks.forEach(function(task){
-          chain = chain.then(function(){
-            return rollBackTask(task);
-          });
+    return TaskMdl.find().exec().then(function (tasks) {
+      tasks.forEach(function (task) {
+        chain = chain.then(function () {
+          return rollBackTask(task);
         });
-
-        return chain;
       });
+      return chain;
+    });
   }
 
   // for internal use only
@@ -87,11 +84,9 @@ function getRollbackFunc(step){
 function rollbackSave(save, task) {
   var Collection = getModel(save.name);
 
-  return Collection.remove({_id: save.dataStore[0]._id})
-    .exec()
-    .then(function(){
-      return updateState(task, save.index, ROLLED);
-    });
+  return Collection.remove({_id: save.dataStore[0]._id}).exec().then(function () {
+    return updateState(task, save.index, ROLLED);
+  });
 }
 
 function rollbackDeleteOrUpdate(step, task){
@@ -100,16 +95,14 @@ function rollbackDeleteOrUpdate(step, task){
 
   step.dataStore.forEach(function(data){
     chain = chain.then(function(){
-      return Collection.findById(data._id)
-        .exec()
-        .then(function(doc){
-          if(doc) {
-            return doc.update(data).exec();
-          }
-
-          doc = new Collection(data);
-          return doc.save();
-        });
+      return Collection.findById(data._id).exec().then(function (doc) {
+        if (doc) {
+          return doc.update(data).exec();
+        }
+
+        doc = new Collection(data);
+        return doc.save();
+      });
     });
   });
 

lib/task.js

@@ -151,26 +151,21 @@ var Task = function(){
     steps = [];
     index = 0;
 
-    return dbTask
-      .save()
-      .then(function(_task){
-        _task.steps.forEach(function(step){
-          chain = chain.then(function(){
-            return getResolveFunc(step)(step, _task);
-          });
+    return dbTask.save().then(function (_task) {
+      _task.steps.forEach(function (step) {
+        chain = chain.then(function () {
+          return getResolveFunc(step)(step, _task);
         });
+      });
 
-        return chain
-          .then(function(){
-            return _task.remove();
-          })
-          .catch(function(err){
-            return Roller.rollOne(_task)
-              .then(function(){
-                throw err;
-              });
-          });
+      return chain.then(function () {
+        return _task.remove();
+      }).catch(function (err) {
+        return Roller.rollOne(_task).then(function () {
+          throw err;
+        });
       });
+    });
   };
 };
 
@@ -214,31 +209,25 @@ function performSave(save, task){
   task.steps[save.index].dataStore = dataStore;
   task.steps[save.index].markModified("dataStore");
 
-  return updateState(task, save.index, PENDING)
-    .then(function(_task){
-      return doc.save()
-        .then(function(){
-          return updateState(_task, save.index, DONE);
-        });
+  return updateState(task, save.index, PENDING).then(function (_task) {
+    return doc.save().then(function () {
+      return updateState(_task, save.index, DONE);
     });
+  });
 }
 
 function performRemove(remove, task){
   var Collection = getModel(remove.name);
 
   handle$Token(remove.condition, true);
 
-  return storeOldData(remove, task)
-    .then(function(){
-      return updateState(task, remove.index, PENDING)
-        .then(function(_task){
-          return Collection.remove(remove.condition)
-            .exec()
-            .then(function(){
-              return updateState(_task, remove.index, DONE);
-            });
-        });
+  return storeOldData(remove, task).then(function () {
+    return updateState(task, remove.index, PENDING).then(function (_task) {
+      return Collection.remove(remove.condition).exec().then(function () {
+        return updateState(_task, remove.index, DONE);
+      });
     });
+  });
 }
 
 function storeOldData(step, task){