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

fix story upvote should happen at end of stream

Browse Source
This commit is contained in:
Berkeley Martinez
2015-06-26 00:35:13 -07:00
parent 9818186afc
commit 8570f9b5e7
1 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
server/boot/story.js
View File

@ -4,7 +4,7 @@ var Rx = require('rx'),
sanitizeHtml = require('sanitize-html'), sanitizeHtml = require('sanitize-html'),
moment = require('moment'), moment = require('moment'),
mongodb = require('mongodb'), mongodb = require('mongodb'),
// debug = require('debug')('freecc:cntr:story'), debug = require('debug')('freecc:cntr:story'),
utils = require('../utils'), utils = require('../utils'),
observeMethod = require('../utils/rx').observeMethod, observeMethod = require('../utils/rx').observeMethod,
saveUser = require('../utils/rx').saveUser, saveUser = require('../utils/rx').saveUser,
@ -251,18 +251,9 @@ module.exports = function(app) {
function upvote(req, res, next) { function upvote(req, res, next) {
var id = req.body.data.id; var id = req.body.data.id;
var savedStory = findStoryById(id) var story$ = findStoryById(id).shareReplay();
.flatMap(function(story) {
story.rank += 1;
story.upVotes.push({
upVotedBy: req.user.id,
upVotedByUsername: req.user.username
});
return saveInstance(story);
})
.shareReplay();
savedStory.flatMap(function(story) { story$.flatMap(function(story) {
// find story author // find story author
return findUserById(story.author.userId); return findUserById(story.author.userId);
}) })
@ -277,7 +268,18 @@ module.exports = function(app) {
req.user.progressTimestamps.push(Date.now()); req.user.progressTimestamps.push(Date.now());
return saveUser(req.user); return saveUser(req.user);
}) })
.flatMap(savedStory) .flatMap(function() {
return story$;
})
.flatMap(function(story) {
debug('upvoting');
story.rank += 1;
story.upVotes.push({
upVotedBy: req.user.id,
upVotedByUsername: req.user.username
});
return saveInstance(story);
})
.subscribe( .subscribe(
function(story) { function(story) {
return res.send(story); return res.send(story);