Take id property of username, remove wasteful save on profile lookup.

This commit is contained in:
terakilobyte
2015-06-12 19:16:10 -04:00
parent d07e5351ea
commit 5b2b7e23ae
3 changed files with 6 additions and 10 deletions

View File

@ -44,8 +44,7 @@
"username": { "username": {
"type": "string", "type": "string",
"lowercase": true, "lowercase": true,
"trim": true, "trim": true
"id": true
}, },
"bio": { "bio": {
"type": "string", "type": "string",

View File

@ -114,7 +114,8 @@ var userIdentityCount = users
.map(function(provider) { .map(function(provider) {
return { return {
provider: provider, provider: provider,
externalId: user[provider] externalId: user[provider],
userId: user.id
}; };
}) })
.filter(function(ident) { .filter(function(ident) {

View File

@ -119,13 +119,15 @@ module.exports = function(app) {
*/ */
function returnUser (req, res, next) { function returnUser (req, res, next) {
debug(req.params.username);
User.findOne( User.findOne(
{ where: { username: req.params.username.toLowerCase() } }, { where: { 'username': req.params.username.toLowerCase() } },
function(err, user) { function(err, user) {
if (err) { if (err) {
debug('Username err: ', err); debug('Username err: ', err);
return next(err); return next(err);
} }
debug(user);
if (user) { if (user) {
user.progressTimestamps = user.progressTimestamps =
user.progressTimestamps.sort(function(a, b) { user.progressTimestamps.sort(function(a, b) {
@ -184,11 +186,6 @@ module.exports = function(app) {
user.currentStreak = 1; user.currentStreak = 1;
} }
user.save(function(err) {
if (err) {
return next(err);
}
var data = {}; var data = {};
var progressTimestamps = user.progressTimestamps; var progressTimestamps = user.progressTimestamps;
progressTimestamps.forEach(function(timeStamp) { progressTimestamps.forEach(function(timeStamp) {
@ -234,7 +231,6 @@ module.exports = function(app) {
currentStreak: user.currentStreak + currentStreak: user.currentStreak +
(user.currentStreak === 1 ? ' day' : ' days') (user.currentStreak === 1 ? ' day' : ' days')
}); });
});
} else { } else {
req.flash('errors', { req.flash('errors', {
msg: "404: We couldn't find a page with that url. " + msg: "404: We couldn't find a page with that url. " +