gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix sitemap query's

Browse Source 
make rx mapping async
This commit is contained in:
Berkeley Martinez
2015-06-20 21:15:41 -07:00
parent f17c442018
commit 0623ace259
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
server/boot/randomAPIs.js
View File

@ -193,15 +193,15 @@ module.exports = function(app) {
users: function(callback) { users: function(callback) {
User.find( User.find(
{ {
where: { 'profile.username': { nlike: '' } }, where: { username: { nlike: '' } },
fields: { 'profile.username': true } fields: { username: true }
}, },
function(err, users) { function(err, users) {
if (err) { if (err) {
debug('User err: ', err); debug('User err: ', err);
callback(err); callback(err);
} else { } else {
Rx.Observable.from(users) Rx.Observable.from(users, null, null, Rx.Scheduler.default)
.map(function(user) { .map(function(user) {
return user.username; return user.username;
}) })
@ -224,7 +224,7 @@ module.exports = function(app) {
debug('Challenge err: ', err); debug('Challenge err: ', err);
callback(err); callback(err);
} else { } else {
Rx.Observable.from(challenges) Rx.Observable.from(challenges, null, null, Rx.Scheduler.default)
.map(function(challenge) { .map(function(challenge) {
return challenge.name; return challenge.name;
}) })
@ -244,7 +244,7 @@ module.exports = function(app) {
debug('Story err: ', err); debug('Story err: ', err);
callback(err); callback(err);
} else { } else {
Rx.Observable.from(stories) Rx.Observable.from(stories, null, null, Rx.Scheduler.default)
.map(function(story) { .map(function(story) {
return story.link; return story.link;
}) })
@ -265,7 +265,7 @@ module.exports = function(app) {
debug('User err: ', err); debug('User err: ', err);
callback(err); callback(err);
} else { } else {
Rx.Observable.from(nonprofits) Rx.Observable.from(nonprofits, null, null, Rx.Scheduler.default)
.map(function(nonprofit) { .map(function(nonprofit) {
return nonprofit.name; return nonprofit.name;
}) })
@ -285,7 +285,12 @@ module.exports = function(app) {
debug('User err: ', err); debug('User err: ', err);
callback(err); callback(err);
} else { } else {
Rx.Observable.from(fieldGuides) Rx.Observable.from(
fieldGuides,
null,
null,
Rx.Scheduler.default
)
.map(function(fieldGuide) { .map(function(fieldGuide) {
return fieldGuide.name; return fieldGuide.name;
}) })
@ -301,7 +306,7 @@ module.exports = function(app) {
if (err) { if (err) {
return next(err); return next(err);
} }
setTimeout(function() { process.nextTick(function() {
res.header('Content-Type', 'application/xml'); res.header('Content-Type', 'application/xml');
res.render('resources/sitemap', { res.render('resources/sitemap', {
appUrl: appUrl, appUrl: appUrl,
@ -312,7 +317,7 @@ module.exports = function(app) {
nonprofits: results.nonprofits, nonprofits: results.nonprofits,
fieldGuides: results.fieldGuides fieldGuides: results.fieldGuides
}); });
}, 0); });
} }
); );
} }
@ -383,7 +388,7 @@ module.exports = function(app) {
} }
function unsubscribe(req, res, next) { function unsubscribe(req, res, next) {
User.findOne({ email: req.params.email }, function(err, user) { User.findOne({ where: { email: req.params.email } }, function(err, user) {
if (user) { if (user) {
if (err) { if (err) {
return next(err); return next(err);