Handle callback errors for user, bonfire, challenges,

courseware, and resources controllers
This commit is contained in:
jameskopacz
2015-03-25 20:43:11 -05:00
parent 8a357dd48a
commit c17ff59aef
5 changed files with 53 additions and 42 deletions

View File

@@ -14,7 +14,7 @@ exports.coursewareNames = function(req, res) {
});
};
exports.returnNextCourseware = function(req, res) {
exports.returnNextCourseware = function(req, res, next) {
if (!req.user) {
return res.redirect('../coursewares/start-our-challenges');
}
@@ -27,14 +27,16 @@ exports.returnNextCourseware = function(req, res) {
return elem;
}
});
req.user.save();
req.user.save(function(err) {
if (err) return next(err);
});
var uncompletedCoursewares = req.user.uncompletedCoursewares;
var displayedCoursewares = Courseware.find({'_id': uncompletedCoursewares[0]});
displayedCoursewares.exec(function(err, courseware) {
if (err) {
next(err);
return next(err);
}
courseware = courseware.pop();
if (courseware === undefined) {
@@ -55,7 +57,7 @@ exports.returnIndividualCourseware = function(req, res, next) {
Courseware.find({"name" : new RegExp(coursewareName, 'i')}, function(err, courseware) {
if (err) {
next(err);
return next(err);
}
// Handle not found
if (courseware.length < 1) {
@@ -203,7 +205,7 @@ exports.generateChallenge = function(req, res) {
res.send(response);
};
exports.completedCourseware = function (req, res) {
exports.completedCourseware = function (req, res, next) {
var isCompletedDate = Math.round(+new Date() / 1000);
var coursewareHash = req.body.coursewareInfo.coursewareHash;
@@ -221,10 +223,10 @@ exports.completedCourseware = function (req, res) {
req.user.save(function (err, user) {
if (err) {
throw err;
return next(err);
}
if (user) {
res.send(true)
}
});
};
};