Finished POST /users route

Author: Jrschellenberg

src/models/user.js

@@ -1,6 +1,7 @@
 const mongoose = require('mongoose');
 const bcrypt = require('bcrypt');
 import isEmail from 'validator/lib/isEmail';
+
 const Schema = mongoose.Schema;
 
 const UserSchema = new mongoose.Schema({
@@ -11,7 +12,7 @@ const UserSchema = new mongoose.Schema({
 		trim: true,
 		index: true
 	},
-	fullName:{
+	fullName: {
 		type: String,
 		required: true,
 		trim: true
@@ -23,40 +24,52 @@ const UserSchema = new mongoose.Schema({
 });
 
 // authenticate input against database documents
-UserSchema.statics.authenticate = function(email, password, callback) {
-	User.findOne({ emailAddress: email })
+UserSchema.statics.authenticate = function (email, password, callback) {
+	User.findOne({emailAddress: email})
 		.exec(function (error, user) {
 			if (error) {
 				return callback(error);
-			} else if ( !user ) {
+			} else if (!user) {
 				let err = new Error('User not found.');
 				err.status = 401;
 				return callback(err);
 			}
-			bcrypt.compare(password, user.password , function(error, result) {
+			bcrypt.compare(password, user.password, function (error, result) {
 				if (result === true) {
 					return callback(null, user);
 				}
 				return callback();
-				
-			})
+			});
 		});
 };
 
 
-
 /*
 May need some logic here later to check if email in correct format.
  */
-UserSchema.statics.validEmail = function(email) {
+UserSchema.statics.validEmail = function (email) {
 	email = email + '';
 	return isEmail(email);
 };
 
+UserSchema.statics.userExist = function (email, callback) {
+	User.findOne({emailAddress: email})
+		.exec(function (error, user) {
+			if (error) {
+				return callback(error);
+			} else if (user) {
+				const err = new Error('User Already Exists');
+				err.status = 409;
+				return callback(err);
+			}
+			return callback(null);
+		});
+};
+
 
 //hash password before saving to database
 // hash password before saving to database
-UserSchema.pre('save', function(next){ //This has to be function. for some reason. tried without and it fails..
+UserSchema.pre('save', function (next) { //This has to be function. for some reason. tried without and it fails..
 	const user = this;
 	bcrypt.hash(user.password, 10, (err, hash) => {
 		if (err) {

src/routes/index.js

@@ -39,15 +39,19 @@ router.post('/user', (req, res, next) => {
 		err.status = 400;
 		return next(err);
 	}
-	
-	const userData = req.body;
-	User.create(userData, (err, user) => {
-		if (err) {
+	User.userExist(req.body.emailAddress, (err) => {
+		if(err){
 			return next(err);
 		}
-		return res.status(201).json({message: "User Successfully added!", status: 201, user});
+		const userData = req.body;
+		User.create(userData, (err, user) => {
+			if (err) {
+				return next(err);
+			}
+			res.location('/');
+			return res.status(201).json({message: "User Successfully added!", status: 201, user});
+		});
 	});
-	
 });
 
 module.exports = router;

test/user_test.js

@@ -56,8 +56,8 @@ describe('Users', () => {
 						.post(postAPI)
 						.send(user)
 						.end((err, res) => {
-						err.message.should.be.equal('test');
-						res.should.have.status(500);
+						res.body.should.have.property('message').equal("User Already Exists");
+						res.should.have.status(409); //Conflict error
 						done();
 						});
 				});