Finish course review post route and modified tests.

Author: Jrschellenberg

src/routes/course.js

@@ -11,9 +11,7 @@ GET routes
 
 router.get('/', (req, res, next) => {
 	Course.find({}, (err, courses) => {
-		if(err){
-			return next(err);
-		}
+		if(err) return next(err);
 		let coursesArray = [];
 		for(let i=0; i<courses.length; i++){
 			let obj = {
@@ -34,7 +32,7 @@ router.get('/:courseId', (req, res, next) => {
 		.populate({path: 'reviews',
 		 populate: {path: 'user'}})
 		.exec((err, course) => {
-			Utils.isError(err, next);
+			if(err) return next(err);
 			res.locals.course = course;
 			let status = 200;
 			return res.status(status).json({success: true, message: "Course Successfully retrieved!", status: status, course: res.locals.course });
@@ -46,7 +44,7 @@ PUT Routes
  */
 router.put('/:courseId', authorizeUser, (req, res, next) => {
 	Course.findByIdAndUpdate(req.params.courseId, req.body, (err, course) => {
-		Utils.isError(err, next);
+		if(err) return next(err);
 		let status = 204;
 		return res.status(status).json({}); //Send status 204 and no content..
 	});
@@ -61,9 +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 next(err);
 		let status = 201;
 		return res.status(status).json({success: true, message: "Course Successfully added!", status: status, course});
 	});
@@ -72,17 +68,19 @@ router.post('/', authorizeUser, (req, res, next) => {
 router.post('/:courseId/reviews', authorizeUser, (req, res, next) => {
 	let review = new Review(req.body);
 	review.save((err) => {
-		Utils.isError(err, next);
+		if(err) return next(err);
 		Course.findById(req.params.courseId, (err, course) => {
-			Utils.isError(err, next);
+			if(err) return next(err);
 			course.reviews.push(review._id);
 			course.save((err) => {
-				Utils.isError(err, next);
+				if(err) return next(err);
 				let status = 201;
 				res.location('/api/courses/'+req.params.courseId);
-				return res.status(status).json({success: true, message: "Review Successfully added to Course!", status: status, course});
+				return res.status(status).json({});  //Supposed to return no content. therefore no json.
 			});
 		});
 	});
 });
+
+
 module.exports = router;

src/utils.js

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

test/course_test.js

@@ -173,28 +173,71 @@ describe('Courses', () => {
 	});
 
 	describe('/POST course/:courseId/reviews', () => {
+		let review = {
+			user: '57029ed4795118be119cc438',
+			postedOn: "2016-02-04T21:22:00.000Z",
+			rating: 4,
+			review: "Lorem ipsum This is a review that I am writing, blah blah blah de blah"
+		};
+		let courseId = "57029ed4795118be119cc43d";
+		
 		it('should POST when a review is supplied with proper information and has an authorized user', (done) => {
-			let review = {
-				user: '57029ed4795118be119cc438',
-				postedOn: "2016-02-04T21:22:00.000Z",
-				rating: 4,
-				review: "Lorem ipsum This is a review that I am writing, blah blah blah de blah"
+			successPostReview(courseId, validAuth, review, done);
+		});
+		
+		it('should POST only required attribute for review when supplied with garbage parameters', (done) => {
+			let excessReview = review;
+			excessReview.extra = 'this is extra param';
+			successPostReview(courseId, validAuth, excessReview, done);
+		});
+		
+		it('should not POST when user is not authorized', (done) => {
+			let invalidAuth = {
+				user: 'invalid@notvalid.com',
+				pass: 'notValidPass'
 			};
-			let courseId = "57029ed4795118be119cc43d";
-			postReview(courseId, validAuth, review, done);
+			failPostReview(401, "Access Denied: Wrong email or password", courseId, invalidAuth, review, done);
 		});
 
-		function postReview(courseId, validAuth, review, done) {
+		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);
+		});
+		
+		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);
+		});
+		
+		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);
+		});
+		
+		function successPostReview(courseId, auth, review, done) {
 			chai.request(server)
 				.post(courseIndexLink+courseId+'/reviews')
-				.auth(validAuth.user, validAuth.pass)
+				.auth(auth.user, auth.pass)
 				.send(review)
 				.end((err, res) => {
-					res.body.should.have.property('message').equal("Review Successfully added to Course!");
 					res.should.have.status(201);
 					done();
 				});
 		};
+		
+		function failPostReview(status, msg, courseId, auth, review, done) {
+			chai.request(server)
+				.post(courseIndexLink+courseId+'/reviews')
+				.auth(auth.user, auth.pass)
+				.send(review)
+				.end((err, res) => {
+					res.body.should.have.property('message').equal(msg);
+					res.should.have.status(status);
+					done();
+				});
+		};
 	});
 
 });