fix: nullObjects were skipping required rules

boycce · May 26, 2022 · 315af00 · 315af00
1 parent 0e57b4c
commit 315af00
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 4 deletions.
diff --git a/lib/model-validate.js b/lib/model-validate.js
@@ -245,7 +245,7 @@ module.exports = {
     if (typeof value === 'undefined' && (!validateUndefined  || !rule.validateUndefined)) return
 
     // Ignore null (if nullObject is set on objects or arrays)
-    if (value === null && (field.isObject || field.isArray) && field.nullObject) return
+    if (value === null && (field.isObject || field.isArray) && field.nullObject && !rule.validateNull) return
 
     // Ignore null
     if (value === null && !(field.isObject || field.isArray) && !rule.validateNull) return

diff --git a/test/validate.js b/test/validate.js
@@ -808,8 +808,10 @@ module.exports = function(monastery, opendb) {
     })
   })
 
-  test('schema default rules', async () => {
+  test('schema options default', async () => {
     // Setup
+    // todo: test objects
+    // todo: change test name
     let db = (await opendb(false)).db
     let user = db.model('user', { fields: {
       name: { type: 'string', minLength: 7 },
@@ -889,7 +891,35 @@ module.exports = function(monastery, opendb) {
     await expect(user.validate({ amount: 'bad' })).rejects.toContainEqual(mock2)
   })
 
-  test('schema default objects', async () => {
+  test('schema options objects', async () => {
+    let db = (await opendb(null, {
+      timestamps: false,
+      nullObjects: true,
+      serverSelectionTimeoutMS: 2000
+    })).db
+    let user = db.model('user', {
+      fields: {
+        location: {
+          lat: { type: 'number' },
+          lng: { type: 'number' },
+          schema: { required: true },
+        },
+      },
+    })
+
+    // Subdocument data (null/string)
+    await expect(user.validate({ location: null })).rejects.toEqual([{
+      'detail': 'This field is required.',
+      'meta': {'detailLong': undefined, 'field': 'location', 'model': 'user', 'rule': 'required'},
+      'status': '400',
+      'title': 'location'
+    }])
+    await expect(user.validate({ location: {} })).resolves.toEqual({ location: {} })
+
+    db.close()
+  })
+
+  test('validate defaultObjects', async () => {
     let db = (await opendb(null, {
       timestamps: false,
       defaultObjects: true,
@@ -915,7 +945,7 @@ module.exports = function(monastery, opendb) {
     db.close()
   })
 
-  test('schema nullObjects', async () => {
+  test('validate nullObjects', async () => {
     let db = (await opendb(null, {
       timestamps: false,
       nullObjects: true,