Merge pull request #66 from gloorx/patch-1

Add NotEmpty validation message

Author: RobinBuschmann

lib/annotations/validation/NotEmpty.ts

@@ -4,11 +4,29 @@ import {addAttributeOptions} from "../../services/models";
 /**
  * Don't allow empty strings
  */
-export function NotEmpty(target: any, propertyName: string): void {
+export function NotEmpty(target: any, propertyName: string): void;
+export function NotEmpty(options: {msg: string}): Function;
+export function NotEmpty(...args: any[]): void|Function {
 
-  addAttributeOptions(target, propertyName, {
-    validate: {
-      notEmpty: true
-    }
-  });
+  if (args.length === 1) {
+
+    const options = args[0];
+
+    return (target: any, propertyName: string) =>
+      addAttributeOptions(target, propertyName, {
+        validate: {
+          notEmpty: options,
+        }
+      });
+  } else {
+
+    const target = args[0];
+    const propertyName = args[1];
+
+    addAttributeOptions(target, propertyName, {
+      validate: {
+        notEmpty: true
+      }
+    });
+  }
 }

test/specs/validation.spec.ts

@@ -14,6 +14,7 @@ import {Model} from "../../lib/models/Model";
 import {Table} from "../../lib/annotations/Table";
 import {Column} from "../../lib/annotations/Column";
 import {Length} from "../../lib/annotations/validation/Length";
+import {NotEmpty} from "../../lib/annotations/validation/NotEmpty";
 
 use(chaiAsPromised);
 
@@ -317,6 +318,73 @@ describe('validation', () => {
 
     });
 
+    describe('NotEmpty', () => {
+
+      it('should not produce an error', () => {
+        @Table
+        class User extends Model<User> {
+          @NotEmpty @Column name: string;
+        }
+        const sequelizeValidationOnly = createSequelizeValidationOnly(false);
+        sequelizeValidationOnly.addModels([User]);
+        const user = new User({name: 'elisa'});
+
+        if (majorVersion === 3) {
+          return user.validate().then(err => expect(err).to.be.not.an('object'));
+        } else if (majorVersion === 4) {
+          return expect(user.validate()).to.be.not.rejected;
+        }
+      });
+
+      it('should produce an error', () => {
+        @Table
+        class User extends Model<User> {
+          @NotEmpty @Column name: string;
+        }
+        const sequelizeValidationOnly = createSequelizeValidationOnly(false);
+        sequelizeValidationOnly.addModels([User]);
+        const user = new User({name: ''});
+
+        if (majorVersion === 3) {
+          return user.validate().then(err => expect(err).to.be.an('object'));
+        } else if (majorVersion === 4) {
+          return expect(user.validate()).to.be.rejected;
+        }
+      });
+
+      it('should not produce an error (with msg)', () => {
+        @Table
+        class User extends Model<User> {
+          @NotEmpty({msg: 'NotEmpty'}) @Column name: string;
+        }
+        const sequelizeValidationOnly = createSequelizeValidationOnly(false);
+        sequelizeValidationOnly.addModels([User]);
+        const user = new User({name: 'elisa'});
+
+        if (majorVersion === 3) {
+          return user.validate().then(err => expect(err).to.be.not.an('object'));
+        } else if (majorVersion === 4) {
+          return expect(user.validate()).to.be.not.rejected;
+        }
+      });
+
+      it('should produce an error (with msg)', () => {
+        @Table
+        class User extends Model<User> {
+          @NotEmpty({msg: 'NotEmpty'}) @Column name: string;
+        }
+        const sequelizeValidationOnly = createSequelizeValidationOnly(false);
+        sequelizeValidationOnly.addModels([User]);
+        const user = new User({name: ''});
+
+        if (majorVersion === 3) {
+          return user.validate().then(err => expect(err.errors[0].message).to.eq('NotEmpty'));
+        } else if (majorVersion === 4) {
+          return expect(user.validate()).to.be.rejected;
+        }
+      });
+    });
+
   });
 
   describe('only', () => {