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

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

Browse Source
This commit is contained in:
Quincy Larson
2015-08-16 14:20:19 -07:00
parent eaa781ef3e f475a4e1ad
commit a0c9906e69
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
server/boot/challenge.js
View File

@ -68,6 +68,7 @@ module.exports = function(app) {
// create a stream of challenge blocks // create a stream of challenge blocks
const blocks$ = challenge$ const blocks$ = challenge$
.map(challenge => challenge.toJSON())
// group challenges by block | returns a stream of observables // group challenges by block | returns a stream of observables
.groupBy(challenge => challenge.block) .groupBy(challenge => challenge.block)
// turn block group stream into an array // turn block group stream into an array
@ -139,6 +140,7 @@ module.exports = function(app) {
const challengeId = req.user.currentChallenge.challengeId; const challengeId = req.user.currentChallenge.challengeId;
// find challenge // find challenge
return challenge$ return challenge$
.map(challenge => challenge.toJSON())
.filter(({ block }) => block !== 'Hikes') .filter(({ block }) => block !== 'Hikes')
.filter(({ id }) => id === challengeId) .filter(({ id }) => id === challengeId)
// now lets find the block it belongs to // now lets find the block it belongs to
@ -517,7 +519,8 @@ module.exports = function(app) {
// create a stream of an array of all the challenge blocks // create a stream of an array of all the challenge blocks
const blocks$ = challenge$ const blocks$ = challenge$
// mark challenge completed // mark challenge completed
.map(challenge => { .map(challengeModel => {
const challenge = challengeModel.toJSON();
if (completedChallenges.indexOf(challenge.id) !== -1) { if (completedChallenges.indexOf(challenge.id) !== -1) {
challenge.completed = true; challenge.completed = true;
} }