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

Remove mongoose style lookup from fieldguide.js. Update user model.

Browse Source
This commit is contained in:
terakilobyte
2015-06-11 15:33:38 -04:00
parent 0b1c23207d
commit 0aa83f1bb9
2 changed files with 50 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/models/user.json
View File

@ -126,9 +126,8 @@
"type": "string" "type": "string"
}, },
"sentSlackInvite": { "sentSlackInvite": {
"type": { "type": "boolean",
"type": false "default": false
}
}, },
"resetPasswordExpires": { "resetPasswordExpires": {
"type": "string" "type": "string"
@ -145,10 +144,12 @@
"completedDate": "string", "completedDate": "string",
"solution": "string" "solution": "string"
} }
] ],
"default": []
}, },
"uncompletedCoursewares": { "uncompletedCoursewares": {
"type": "array" "type": "array",
"default": []
}, },
"completedCoursewares": { "completedCoursewares": {
"type": [ "type": [
@ -164,7 +165,8 @@
"githubLink": "string", "githubLink": "string",
"verified": "boolean" "verified": "boolean"
} }
] ],
"default": []
}, },
"completedFieldGuides": { "completedFieldGuides": {
"type": [] "type": []
@ -217,7 +219,8 @@
"default": [] "default": []
}, },
"uncompletedChallenges": { "uncompletedChallenges": {
"type": "array" "type": "array",
"default": []
} }
}, },
"validations": [], "validations": [],

7
server/boot/fieldGuide.js
View File

@ -80,10 +80,9 @@ module.exports = function(app) {
return res.redirect('/field-guide/how-do-i-use-this-guide'); return res.redirect('/field-guide/how-do-i-use-this-guide');
} }
var displayedFieldGuides = FieldGuide.find({'id': req.user.uncompletedFieldGuides[0]},
FieldGuide.find({'id': req.user.uncompletedFieldGuides[0]}); function(err, fieldGuide) {
displayedFieldGuides.exec(function(err, fieldGuide) {
if (err) { return next(err); } if (err) { return next(err); }
fieldGuide = fieldGuide.pop(); fieldGuide = fieldGuide.pop();
@ -102,6 +101,7 @@ module.exports = function(app) {
return res.redirect('../field-guide/' + fieldGuide.dashedName); return res.redirect('../field-guide/' + fieldGuide.dashedName);
}); });
} }
};
function completedFieldGuide(req, res, next) { function completedFieldGuide(req, res, next) {
var fieldGuideId = req.body.fieldGuideInfo.fieldGuideId; var fieldGuideId = req.body.fieldGuideInfo.fieldGuideId;
@ -121,4 +121,3 @@ module.exports = function(app) {
res.send(true); res.send(true);
}); });
} }
};