From ef7d705059ac08cc58a56e9b9e0e016bffe8c7bb Mon Sep 17 00:00:00 2001 From: Daniel Saewitz Date: Wed, 6 Mar 2013 08:45:51 -0500 Subject: [PATCH 1/2] Add to next level to user stats on API --- src/server/api.coffee | 3 +++ test/api.mocha.coffee | 2 ++ 2 files changed, 5 insertions(+) diff --git a/src/server/api.coffee b/src/server/api.coffee index 8927f6172b..97865db4f6 100644 --- a/src/server/api.coffee +++ b/src/server/api.coffee @@ -3,6 +3,7 @@ router = new express.Router() scoring = require '../app/scoring' _ = require 'underscore' +{ tnl } = require '../app/algos' validator = require 'derby-auth/node_modules/validator' check = validator.check sanitize = validator.sanitize @@ -41,6 +42,8 @@ auth = (req, res, next) -> router.get '/user', auth, (req, res) -> user = req.userObj + user.stats.tnl = tnl user.stats.lvl + delete user.apiToken res.json user diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 6d82d71516..776be9f0c1 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -100,6 +100,8 @@ describe 'API', -> expect(res.body.id).not.to.be.empty() self = _.clone(currentUser) delete self.apiToken + # To next level should be 100 + self.stats.tnl = 100 expect(res.body).to.eql self done() From 5a1343a3b745ef0f8b1d891345f5a8393678c521 Mon Sep 17 00:00:00 2001 From: Daniel Saewitz Date: Wed, 6 Mar 2013 09:11:14 -0500 Subject: [PATCH 2/2] Set maxHealth to 50 --- src/server/api.coffee | 1 + test/api.mocha.coffee | 1 + 2 files changed, 2 insertions(+) diff --git a/src/server/api.coffee b/src/server/api.coffee index 97865db4f6..3fe4bd598a 100644 --- a/src/server/api.coffee +++ b/src/server/api.coffee @@ -43,6 +43,7 @@ router.get '/user', auth, (req, res) -> user = req.userObj user.stats.tnl = tnl user.stats.lvl + user.stats.maxHealth = 50 delete user.apiToken diff --git a/test/api.mocha.coffee b/test/api.mocha.coffee index 776be9f0c1..2b185afd96 100644 --- a/test/api.mocha.coffee +++ b/test/api.mocha.coffee @@ -102,6 +102,7 @@ describe 'API', -> delete self.apiToken # To next level should be 100 self.stats.tnl = 100 + self.stats.maxHealth = 50 expect(res.body).to.eql self done()