From 9e2ef95d84bb63c699da92ba18870bb856a3282c Mon Sep 17 00:00:00 2001
From: Tyler Renelle <tylerrenelle@gmail.com>
Date: Fri, 26 Jul 2013 16:35:28 -0400
Subject: [PATCH] apiv2: bugfix in handling doneCount (we really should move to
 Q instead)

---
 src/server/apiv2.coffee | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/server/apiv2.coffee b/src/server/apiv2.coffee
index 33d2db0108..80aa725519 100644
--- a/src/server/apiv2.coffee
+++ b/src/server/apiv2.coffee
@@ -27,9 +27,9 @@ router.post '/', api.auth, (req, res, next) ->
   model = req.getModel()
   {user} = req
   actions = req.body
-  #console.log util.inspect req.body
 
-  doneCount = 0
+  doneCount = 1 + # cron
+    actions.length # standard operations
   done = (err) ->
     return next(err) if err
     if --doneCount is 0
@@ -43,7 +43,6 @@ router.post '/', api.auth, (req, res, next) ->
       console.log "Reply sent"
 
   misc.batchTxn model, (uObj, paths) ->
-    doneCount++
     # habitrpg-shared/algos requires uObj.habits, uObj.dailys etc instead of uObj.tasks
     _.each ['habit','daily','todo','reward'], (type) -> uObj["#{type}s"] = _.where(uObj.tasks, {type}); true
     algos.cron uObj, {paths}
@@ -51,24 +50,23 @@ router.post '/', api.auth, (req, res, next) ->
 
   if _.isArray actions
     actions.forEach (action)->
-      doneCount++
 
       task = action.task ? {}
 
       switch action.op
         when "score"
+          sendScore = -> api.score(model, user, task.id, action.dir, done)
           if task.type in ["daily","todo"]
             # switch completed state. Since checkbox is not binded to model unlike when you click through Derby website.
             completed = if action.dir is "up" then true else false
-            user.set "tasks.#{task.id}.completed", completed, done
-          doneCount++
-          api.score model, user, task.id, action.dir, done
+            user.set "tasks.#{task.id}.completed", completed, sendScore
+          else sendScore()
 
         when "sortTask"
           path = action.task.type + "Ids"
           a = user.get(path)
           a.splice(action.to, 0, a.splice(action.from, 1)[0])
-          user.set(path, a)
+          user.set path, a, done
 
         when "addTask"
           api.addTask user, task, done
@@ -84,4 +82,6 @@ router.post '/', api.auth, (req, res, next) ->
           else
             user.set action.path, action.value, done
 
+        else done()
+
 module.exports = router
\ No newline at end of file