wi[

src/server/api.coffee

@@ -5,6 +5,9 @@ scoring = require '../app/scoring'
 _ = require 'underscore'
 icalendar = require('icalendar')
 
+NO_TOKEN_OR_UID = err: "You must include a token and uid (user id) in your request"
+NO_USER_FOUND = err: "No user found."
+
 # ---------- /v1 API ------------
 # Every url added beneath router is prefaced by /v1
 
@@ -13,75 +16,24 @@ icalendar = require('icalendar')
   curl -X POST -H "Content-Type:application/json" -d '{"apiToken":"{TOKEN}"}' localhost:3000/v1/users/{UID}/tasks/productivity/up
 ###
 
-router.get '/users/:uid/tasks', (req, res) ->
-  {uid, taskId, direction} = req.params
-  {apiToken, title, service, icon} = req.body
-  console.log {params:req.params, body:req.body} if process.env.NODE_ENV == 'development'
+router.get '/status', (req, res) ->
+  res.json
+    status: 'up'
 
-  # 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
+router.get '/user', (req, res) ->
+  { uid, token } = req.query
+  return res.json 500, NO_TOKEN_OR_UID unless uid || token
 
   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")
+  query = model.query('users').withIdAndToken(uid, token)
 
-    model.ref('_user', user)
+  model.fetch query, (err, user) ->
+    return res.json 500, err: err if err
+    return res.json 500, err: NO_USER_FOUND unless user
 
-    # Create task if doesn't exist
-    # TODO add service & icon to task
-    unless model.get("_user.tasks")
-      model.refList "_habitList", "_user.tasks", "_user.habitIds"
-      return res.json model.get '_habitList'
+    res.json user
 
-
-router.post '/users/:uid/tasks/:taskId/:direction', (req, res) ->
-  {uid, taskId, direction} = req.params
-  {apiToken, 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)
-
-    # Create task if doesn't exist
-    # TODO add service & icon to task
-    unless model.get("_user.tasks.#{taskId}")
-      model.refList "_habitList", "_user.tasks", "_user.habitIds"
-      model.at('_habitList').push
-        id: taskId
-        type: 'habit'
-        text: (title || taskId)
-        value: 0
-        up: true
-        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)
-    result = model.get ('_user.stats')
-    result.delta = delta
-    res.send(result)
-
-router.get '/users/:uid/calendar.ics', (req, res) ->
+router.get '/user/calendar.ics', (req, res) ->
   #return next() #disable for now
   {uid} = req.params
   {apiToken} = req.query