Merge 8d0d7ce into 9279bae

talyssonoc · Nov 16, 2018 · 0f07b19 · 0f07b19
2 parents 9279bae + 8d0d7ce
commit 0f07b19
Show file tree

Hide file tree

Showing 9 changed files with 466 additions and 186 deletions.
diff --git a/dist/structure.js b/dist/structure.js
diff --git a/src/validation/utils.js b/src/validation/utils.js
@@ -1,9 +1,12 @@
 const joi = require('joi');
 const { isPlainObject } = require('lodash');
 
+const notRequired = ({ optionName, typeDescriptor }) =>
+  optionName === 'required' && typeDescriptor[optionName] === false;
+
 exports.mapToJoi = function mapToJoi(typeDescriptor, { initial, mappings }) {
   return mappings.reduce((joiSchema, [optionName, joiMethod, passValueToJoi]) => {
-    if(typeDescriptor[optionName] === undefined) {
+    if (typeDescriptor[optionName] === undefined || notRequired({ optionName, typeDescriptor})) {
       return joiSchema;
     }
 

diff --git a/test/unit/validation/array.spec.js b/test/unit/validation/array.spec.js
@@ -70,6 +70,38 @@ describe('validation', () => {
       });
     });
 
+    describe('not required', () => {
+      var User;
+
+      beforeEach(() => {
+        User = attributes({
+          books: {
+            type: Array,
+            itemType: String,
+            required: false
+          }
+        })(class User {});
+      });
+
+      context('when value is present', () => {
+        it('is valid', () => {
+          const user = new User();
+
+          assertValid(user);
+        });
+      });
+
+      context('when value is not present', () => {
+        it('is valid', () => {
+          const user = new User({
+            books: undefined
+          });
+
+          assertValid(user, 'books');
+        });
+      });
+    });
+
     describe('sparse array', () => {
       context('when array can not be sparse', () => {
         var User;

diff --git a/test/unit/validation/boolean.spec.js b/test/unit/validation/boolean.spec.js
@@ -68,6 +68,27 @@ describe('validation', () => {
       });
     });
 
+    describe('not required', () => {
+      var User;
+
+      beforeEach(() => {
+        User = attributes({
+          isAdmin: {
+            type: Boolean,
+            required: false
+          }
+        })(class User {});
+      });
+
+      context('when value is not present', () => {
+        it('is valid', () => {
+          const user = new User();
+
+          assertValid(user);
+        });
+      });
+    });
+
     describe('equal', () => {
       var User;
 

diff --git a/test/unit/validation/date.spec.js b/test/unit/validation/date.spec.js
@@ -68,6 +68,27 @@ describe('validation', () => {
       });
     });
 
+    describe('not required', () => {
+      var User;
+
+      beforeEach(() => {
+        User = attributes({
+          birth: {
+            type: Date,
+            required: false
+          }
+        })(class User {});
+      });
+
+      context('when value is not present', () => {
+        it('is valid', () => {
+          const user = new User();
+
+          assertValid(user);
+        });
+      });
+    });
+
     describe('equal', () => {
       var now;
       var User;

diff --git a/test/unit/validation/nestedPojo.spec.js b/test/unit/validation/nestedPojo.spec.js
@@ -73,5 +73,30 @@ describe('validation', () => {
         });
       });
     });
+
+    describe('not required', () => {
+      var Location;
+      var User;
+
+      beforeEach(() => {
+        Location = class Location {};
+
+        User = attributes({
+          lastLocation: {
+            type: Location,
+            required: false
+          }
+        })(class User {});
+      });
+
+      context('when value is not present', () => {
+        it('is valid', () => {
+          const user = new User();
+
+          assertValid(user);
+        });
+      });
+    });
+
   });
 });
diff --git a/test/unit/validation/nestedStructure.spec.js b/test/unit/validation/nestedStructure.spec.js
@@ -88,6 +88,37 @@ describe('validation', () => {
       });
     });
 
+    describe('not required', () => {
+      var Location;
+      var User;
+
+      beforeEach(() => {
+        Location = attributes({
+          x: {
+            type: Number
+          },
+          y: {
+            type: Number
+          }
+        })(class Location {});
+
+        User = attributes({
+          lastLocation: {
+            type: Location,
+            required: false
+          }
+        })(class User {});
+      });
+
+      context('when value is not present', () => {
+        it('is valid', () => {
+          const user = new User();
+
+          assertValid(user);
+        });
+      });
+    });
+
     describe('nested required', () => {
       var Location;
       var User;

diff --git a/test/unit/validation/number.spec.js b/test/unit/validation/number.spec.js
@@ -68,6 +68,28 @@ describe('validation', () => {
       });
     });
 
+
+    describe('not required', () => {
+      var User;
+
+      beforeEach(() => {
+        User = attributes({
+          age: {
+            type: Number,
+            required: false
+          }
+        })(class User {});
+      });
+
+      context('when value is not present', () => {
+        it('is valid', () => {
+          const user = new User();
+
+          assertValid(user);
+        });
+      });
+    });
+
     describe('equal', () => {
       describe('when using a value', () => {
         var User;

diff --git a/test/unit/validation/string.spec.js b/test/unit/validation/string.spec.js
@@ -68,6 +68,29 @@ describe('validation', () => {
       });
     });
 
+    describe('not required', () => {
+      var User;
+
+      beforeEach(() => {
+        User = attributes({
+          name: {
+            type: String,
+            required: false
+          }
+        })(class User {});
+      });
+
+      context('when value is not present', () => {
+        it('is valid', () => {
+          const user = new User({
+            name: undefined
+          });
+
+          assertValid(user);
+        });
+      });
+    });
+
     describe('equal', () => {
       var User;