Merge branch 'feature/isolate-odm-validation-error' into dev

gocreating · Oct 14, 2016 · f52d11d · f52d11d
2 parents 4eff5b5 + 499060d
commit f52d11d
Show file tree

Hide file tree

Showing 6 changed files with 39 additions and 36 deletions.
diff --git a/specs/endToEnd/apis/user.js b/specs/endToEnd/apis/user.js
@@ -49,7 +49,8 @@ describe('#user', () => {
             expect(err).to.equal(null);
             expect(res).to.not.be.undefined;
             expect(res.status).to.equal(200);
-            expect(res.body.errors[0].code).to.equal(Errors.USER_CONFLICT.code);
+            expect(res.body.errors[0].code)
+              .to.equal(Errors.ODM_VALIDATION.code);
             done();
           });
       });

diff --git a/src/common/constants/ErrorCodes.js b/src/common/constants/ErrorCodes.js
@@ -6,5 +6,5 @@ export default {
   PERMISSION_DENIED: 'PERMISSION_DENIED',
   LOCALE_NOT_SUPPORTED: 'LOCALE_NOT_SUPPORTED',
   USER_TOKEN_EXPIRATION: 'USER_TOKEN_EXPIRATION',
-  USER_CONFLICT: 'USER_CONFLICT',
+  ODM_VALIDATION: 'ODM_VALIDATION',
 };
diff --git a/src/common/constants/Errors.js b/src/common/constants/Errors.js
@@ -9,10 +9,16 @@ export default {
   },
   [ErrorCodes.ODM_OPERATION_FAIL]: {
     code: ErrorCodes.ODM_OPERATION_FAIL,
-    status: 400,
+    status: 500,
     title: 'Database Operation Failed',
     detail: 'Current database operation is invalid.',
   },
+  [ErrorCodes.ODM_VALIDATION]: {
+    code: ErrorCodes.ODM_VALIDATION,
+    status: 400,
+    title: 'Database Validation Failed',
+    detail: 'The data is invalid.',
+  },
   [ErrorCodes.STATE_PRE_FETCHING_FAIL]: {
     code: ErrorCodes.STATE_PRE_FETCHING_FAIL,
     status: 500,
@@ -43,10 +49,4 @@ export default {
     title: 'Token Expired',
     detail: 'Your jwt token expired. Please re-login.',
   },
-  [ErrorCodes.USER_CONFLICT]: {
-    code: ErrorCodes.USER_CONFLICT,
-    status: 400,
-    title: 'User Already Exists',
-    detail: 'The user already exists.',
-  },
 };
diff --git a/src/server/controllers/user.js b/src/server/controllers/user.js
@@ -1,30 +1,20 @@
-import Errors from '../../common/constants/Errors';
 import { handleDbError } from '../decorators/handleError';
 import User from '../models/User';
 import filterAttribute from '../utils/filterAttribute';
 
 export default {
   create(req, res) {
-    User.findOne({
-      'email.value': req.body.email,
-    }, handleDbError(res)((user) => {
-      if (user !== null) {
-        res.errors([Errors.USER_CONFLICT]);
-      } else {
-        const user = User({
-          name: req.body.name,
-          email: {
-            value: req.body.email,
-          },
-          password: req.body.password,
-        });
-
-        user.save(handleDbError(res)((user) => {
-          res.json({
-            user: user,
-          });
-        }));
-      }
+    const user = User({
+      name: req.body.name,
+      email: {
+        value: req.body.email,
+      },
+      password: req.body.password,
+    });
+    user.save(handleDbError(res)((user) => {
+      res.json({
+        user: user,
+      });
     }));
   },
 

diff --git a/src/server/decorators/handleError.js b/src/server/decorators/handleError.js
@@ -5,7 +5,12 @@ let getErrorHandler = (ErrorType) => (res) => (fn) => (err, ...result) => {
   if (err) {
     switch (ErrorType) {
       case ErrorTypes.ODM_OPERATION: {
-        res.pushError(Errors.ODM_OPERATION_FAIL, err);
+        if (err.name === 'ValidationError') {
+          res.pushError(Errors.ODM_VALIDATION, err);
+          res.errors();
+        } else {
+          res.pushError(Errors.ODM_OPERATION_FAIL, err);
+        }
         break;
       }
       default: {

diff --git a/src/server/models/User.js b/src/server/models/User.js
@@ -15,7 +15,7 @@ const hashPassword = (rawPassword = '') => {
   return rawPassword;
 };
 
-let User = new mongoose.Schema({
+let UserSchema = new mongoose.Schema({
   name: String,
   email: {
     value: {
@@ -41,12 +41,18 @@ let User = new mongoose.Schema({
   },
 });
 
-User.methods.auth = function(password, cb) {
+UserSchema.path('email.value').validate(function(value, cb) {
+  User.findOne({ 'email.value': value }, (err, user) => {
+    cb(!err && !user);
+  });
+}, 'This email address is already registered');
+
+UserSchema.methods.auth = function(password, cb) {
   const isAuthenticated = (this.password === hashPassword(password));
   cb(null, isAuthenticated);
 };
 
-User.methods.toJwtToken = function(cb) {
+UserSchema.methods.toJwtToken = function(cb) {
   const user = {
     _id: this._id,
     name: this.name,
@@ -58,10 +64,11 @@ User.methods.toJwtToken = function(cb) {
   return token;
 };
 
-User.methods.toJSON = function() {
+UserSchema.methods.toJSON = function() {
   let obj = this.toObject();
   delete obj.password;
   return obj;
 };
 
-export default mongoose.model('User', User);
+let User = mongoose.model('User', UserSchema);
+export default User;