From 5b2b7e23ae5d720b8a66ef1b91d6f02fb59584fb Mon Sep 17 00:00:00 2001 From: terakilobyte Date: Fri, 12 Jun 2015 19:16:10 -0400 Subject: [PATCH] Take id property of username, remove wasteful save on profile lookup. --- common/models/user.json | 3 +-- seed/flattenUser.js | 3 ++- server/boot/user.js | 10 +++------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/common/models/user.json b/common/models/user.json index ff0cab3495..df99af1651 100644 --- a/common/models/user.json +++ b/common/models/user.json @@ -44,8 +44,7 @@ "username": { "type": "string", "lowercase": true, - "trim": true, - "id": true + "trim": true }, "bio": { "type": "string", diff --git a/seed/flattenUser.js b/seed/flattenUser.js index 64525b143d..fad529cea3 100644 --- a/seed/flattenUser.js +++ b/seed/flattenUser.js @@ -114,7 +114,8 @@ var userIdentityCount = users .map(function(provider) { return { provider: provider, - externalId: user[provider] + externalId: user[provider], + userId: user.id }; }) .filter(function(ident) { diff --git a/server/boot/user.js b/server/boot/user.js index f5753c9b98..0e0dc09cdb 100644 --- a/server/boot/user.js +++ b/server/boot/user.js @@ -119,13 +119,15 @@ module.exports = function(app) { */ function returnUser (req, res, next) { + debug(req.params.username); User.findOne( - { where: { username: req.params.username.toLowerCase() } }, + { where: { 'username': req.params.username.toLowerCase() } }, function(err, user) { if (err) { debug('Username err: ', err); return next(err); } + debug(user); if (user) { user.progressTimestamps = user.progressTimestamps.sort(function(a, b) { @@ -184,11 +186,6 @@ module.exports = function(app) { user.currentStreak = 1; } - user.save(function(err) { - if (err) { - return next(err); - } - var data = {}; var progressTimestamps = user.progressTimestamps; progressTimestamps.forEach(function(timeStamp) { @@ -234,7 +231,6 @@ module.exports = function(app) { currentStreak: user.currentStreak + (user.currentStreak === 1 ? ' day' : ' days') }); - }); } else { req.flash('errors', { msg: "404: We couldn't find a page with that url. " +