fix up deprecated to work again (order of middleware)

src/server/deprecated.coffee

@@ -13,31 +13,6 @@ router.get '/:uid/up/:score?', (req, res) -> res.send(500, deprecatedMessage)
 router.get '/:uid/down/:score?', (req, res) -> res.send(500, deprecatedMessage)
 router.post '/users/:uid/tasks/:taskId/:direction', (req, res) -> res.send(500, deprecatedMessage)
 
-router.get '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
-  {uid, taskId, direction} = req.params
-  {apiToken} = req.query
-  {title, service, icon} = req.body
-  console.log {params:req.params, body:req.body} if process.env.NODE_ENV == 'development'
-
-  # Send error responses for improper API call
-  return res.send(500, 'request body "apiToken" required') unless apiToken
-  return res.send(500, ':uid required') unless uid
-  return res.send(500, ':taskId required') unless taskId
-  return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
-
-  model = req.getModel()
-  req._isServer = true
-  model.fetch model.query('users').withIdAndToken(uid, apiToken), (err, result) ->
-    return res.send(500, err) if err
-    user = result.at(0)
-    userObj = user.get()
-    if _.isEmpty(userObj)
-      return res.send(500, "User with uid=#{uid}, token=#{apiToken} not found. Make sure you're not using your username, but your User Id")
-
-    model.ref('_user', user)
-
-    res.send(user)
-
 router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
   {uid, taskId, direction} = req.params
   {apiToken, title, service, icon} = req.body
@@ -50,15 +25,15 @@ router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
   return res.send(500, ":direction must be 'up' or 'down'") unless direction in ['up','down']
 
   model = req.getModel()
-  req._isServer = true
   model.fetch model.query('users').withIdAndToken(uid, apiToken), (err, result) ->
     return res.send(500, err) if err
-    user = result.at(0)
+    user = result
     userObj = user.get()
     if _.isEmpty(userObj)
       return res.send(500, "User with uid=#{uid}, token=#{apiToken} not found. Make sure you're not using your username, but your User Id")
 
     model.ref('_user', user)
+    req._isServer = true
 
     # Create task if doesn't exist
     # TODO add service & icon to task
@@ -73,8 +48,8 @@ router.post '/v1/users/:uid/tasks/:taskId/:direction', (req, res) ->
         down: true
         notes: "This task was created by a third-party service. Feel free to edit, it won't harm the connection to that service. Additionally, multiple services may piggy-back off this task."
 
-    scoring.setModel(model)
-    delta = scoring.score(taskId, direction)
+    score = new scoring.Scoring(model)
+    delta = score.score(taskId, direction)
     result = model.get ('_user.stats')
     result.delta = delta
     res.send(result)
@@ -88,7 +63,7 @@ router.get '/v1/users/:uid/calendar.ics', (req, res) ->
   query = model.query('users').withIdAndToken(uid, apiToken)
   query.fetch (err, result) ->
     return res.send(500, err) if err
-    tasks = result.at(0).get('tasks')
+    tasks = result.get('tasks')
     #      tasks = result[0].tasks
     tasksWithDates = _.filter tasks, (task) -> !!task.date
     return res.send(500, "No events found") if _.isEmpty(tasksWithDates)

src/server/index.coffee

@@ -76,6 +76,7 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     .use(store.modelMiddleware())
     # API should be hit before all other routes
     .use('/api/v1', require('./api').middleware)
+    .use(require('./deprecated').middleware)
     # Show splash page for newcomers
     .use(middleware.splash)
     .use(priv.middleware)
@@ -84,7 +85,6 @@ mongo_store = new MongoStore {url: process.env.NODE_DB_URI}, ->
     # Creates an express middleware from the app's routes
     .use(app.router())
     .use(require('./static').middleware)
-    .use(require('./deprecated').middleware)
     .use(expressApp.router)
     .use(serverError(root))