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

Fix block stream not being set correctly

Browse Source
This commit is contained in:
Berkeley Martinez
2015-12-11 14:44:27 -08:00
parent 773358980c
commit 38d71abda6
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
server/boot/challenge.js
View File

@ -121,7 +121,6 @@ module.exports = function(app) {
const findChallenge$ = observeMethod(Challenge, 'find'); const findChallenge$ = observeMethod(Challenge, 'find');
// create a stream of all the challenges // create a stream of all the challenges
const challenge$ = findChallenge$(challengesQuery) const challenge$ = findChallenge$(challengesQuery)
.doOnNext(() => debug('query challenges'))
.flatMap(challenges => Observable.from( .flatMap(challenges => Observable.from(
challenges, challenges,
null, null,
@ -147,15 +146,21 @@ module.exports = function(app) {
challenges: blockArray, challenges: blockArray,
superBlock: blockArray[0].superBlock superBlock: blockArray[0].superBlock
})) }))
// filter out hikes
.filter(({ superBlock }) => { .filter(({ superBlock }) => {
return challengesRegex.test(superBlock); return !(/hikes/gi).test(superBlock);
}) })
.groupBy(block => block.superBlock) .groupBy(block => block.superBlock)
.flatMap(superBlocks$ => superBlocks$.toArray()) .flatMap(superBlocks$ => superBlocks$.toArray())
.map(superBlockArr => ({
name: superBlockArr[0].superBlock,
superOrder: superBlockArr[0].superOrder,
blocks: superBlockArr
}))
.shareReplay(); .shareReplay();
const blocks$ = superBlocks$ const blocks$ = superBlocks$
.flatMap(superBlock => Observable.just(superBlock)) .flatMap(superBlock => Observable.from(superBlock.blocks))
.shareReplay(); .shareReplay();
const User = app.models.User; const User = app.models.User;
@ -192,7 +197,8 @@ module.exports = function(app) {
// find challenge // find challenge
return challenge$ return challenge$
.map(challenge => challenge.toJSON()) .map(challenge => challenge.toJSON())
.filter(({ superBlock }) => challengesRegex.test(superBlock)) // filter out hikes
.filter(({ superBlock }) => !(/hikes/gi).test(superBlock))
.filter(({ id }) => id === challengeId) .filter(({ id }) => id === challengeId)
// now lets find the block it belongs to // now lets find the block it belongs to
.flatMap(challenge => { .flatMap(challenge => {
@ -537,6 +543,7 @@ module.exports = function(app) {
time: blockArray[0] && blockArray[0].time || '???' time: blockArray[0] && blockArray[0].time || '???'
}; };
}) })
// filter out hikes
.filter(({ superBlock }) => { .filter(({ superBlock }) => {
return !(/hikes/i).test(superBlock); return !(/hikes/i).test(superBlock);
}) })