clean up handling validation errors

Author: Jrschellenberg

src/routes/course.js

@@ -32,7 +32,7 @@ router.get('/:courseId', (req, res, next) => {
 		.populate({path: 'reviews',
 		 populate: {path: 'user'}})
 		.exec((err, course) => {
-			if(err) return next(err);
+			if(err) return Utils.propagateError(err, 400, next);
 			res.locals.course = course;
 			let status = 200;
 			return res.status(status).json({success: true, message: "Course Successfully retrieved!", status: status, course: res.locals.course });
@@ -44,7 +44,7 @@ PUT Routes
  */
 router.put('/:courseId', authorizeUser, (req, res, next) => {
 	Course.findByIdAndUpdate(req.params.courseId, req.body, (err, course) => {
-		if(err) return next(err);
+		if(err) return Utils.propagateError(err, 400, next);
 		let status = 204;
 		return res.status(status).json({}); //Send status 204 and no content..
 	});
@@ -59,7 +59,7 @@ router.post('/', authorizeUser, (req, res, next) => {
 	}
 	const courseData = req.body;
 	Course.create(courseData, (err, course) => {
-		if(err) return next(err);
+		if(err) return Utils.propagateError(err, 400, next);
 		let status = 201;
 		return res.status(status).json({success: true, message: "Course Successfully added!", status: status, course});
 	});
@@ -68,12 +68,12 @@ router.post('/', authorizeUser, (req, res, next) => {
 router.post('/:courseId/reviews', authorizeUser, (req, res, next) => {
 	let review = new Review(req.body);
 	review.save((err) => {
-		if(err) return next(err);
+		if(err) return Utils.propagateError(err, 400, next);
 		Course.findById(req.params.courseId, (err, course) => {
-			if(err) return next(err);
+			if(err) return Utils.propagateError(err, 400, next);
 			course.reviews.push(review._id);
 			course.save((err) => {
-				if(err) return next(err);
+				if(err) return Utils.propagateError(err, 400, next);
 				let status = 201;
 				res.location('/api/courses/'+req.params.courseId);
 				return res.status(status).json({});  //Supposed to return no content. therefore no json.

src/routes/user.js

@@ -10,10 +10,8 @@ router.get('/', authorizeUser, (req, res, next) => {
 		return Utils.throwError(401, "Invalid or missing SessionId", next);
 	}
 	User.findById(req.session.userId)
-		.exec((error, user) => {
-			if(error){
-				return next(error);
-			}
+		.exec((err, user) => {
+			if(err) return Utils.propagateError(err, 400, next);
 			let status = 200;
 			res.status(status).json({success: true, message: "User Successfully retrieved", status: status, user: user});
 		});
@@ -30,14 +28,10 @@ router.post('/', (req, res, next) => {
 		return Utils.throwError(400, "Malformed Email Supplied", next);
 	}
 	User.userExist(req.body.emailAddress, (err) => {
-		if(err){
-			return next(err);
-		}
+		if(err) return Utils.propagateError(err, 409, next);
 		const userData = req.body;
 		User.create(userData, (err, user) => {
-			if (err) {
-				return next(err);
-			}
+			if(err) return Utils.propagateError(err, 400, next);
 			res.location('/');
 			return res.status(201).json({success: true, message: "User Successfully added!", status: 201, user});
 		});

src/utils.js

@@ -4,4 +4,8 @@ export default class Utils {
 		err.status = status;
 		return next(err);
 	}
+	static propagateError(err, status, next){
+		err.status = status;
+		return next(err);
+	}
 }

test/course_test.js

@@ -202,18 +202,18 @@ describe('Courses', () => {
 		it('should not POST when review has out of bounds rating', (done) => {
 			let badReview = review;
 			badReview.rating = 20;
-			failPostReview(500, "Review validation failed: rating: Path `rating` (20) is more than maximum allowed value (5).", courseId, validAuth, badReview, done);
+			failPostReview(400, "Review validation failed: rating: Path `rating` (20) is more than maximum allowed value (5).", courseId, validAuth, badReview, done);
 		});
 
 		it('should not POST when rating is missing', (done) => {
 			let badReview = review;
 			badReview.rating = null;
-			failPostReview(500, "Review validation failed: rating: Path `rating` is required.", courseId, validAuth, badReview, done);
+			failPostReview(400, "Review validation failed: rating: Path `rating` is required.", courseId, validAuth, badReview, done);
 		});
 
 		it('should not POST when not supplied with a review', (done) => {
 			let badReview = {};
-			failPostReview(500, "Review validation failed: rating: Path `rating` is required.", courseId, validAuth, badReview, done);
+			failPostReview(400, "Review validation failed: rating: Path `rating` is required.", courseId, validAuth, badReview, done);
 		});
 
 		function successPostReview(courseId, auth, review, done) {