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

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

View File

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

View File

@ -1,6 +1,6 @@
var R = require('ramda'),
// Rx = require('rx'),
// debug = require('debug')('freecc:fieldguides'),
// Rx = require('rx'),
// debug = require('debug')('freecc:fieldguides'),
utils = require('../utils');
module.exports = function(app) {
@ -80,10 +80,9 @@ module.exports = function(app) {
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); }
fieldGuide = fieldGuide.pop();
@ -102,8 +101,9 @@ module.exports = function(app) {
return res.redirect('../field-guide/' + fieldGuide.dashedName);
});
}
};
function completedFieldGuide(req, res, next) {
function completedFieldGuide(req, res, next) {
var fieldGuideId = req.body.fieldGuideInfo.fieldGuideId;
req.user.completedFieldGuides.push(fieldGuideId);
@ -120,5 +120,4 @@ module.exports = function(app) {
}
res.send(true);
});
}
};
}