Adding runValidators (#87)

* Adding runValidators

As mentioned here: #73

Still needs a test.

* added missing comma

* Add tests and params.mongoose support for update and patch

package.json

@@ -47,7 +47,7 @@
     "watch": "babel --watch -d lib/ src/",
     "jshint": "jshint src/. test/. --config",
     "mocha": "mocha test/ --compilers js:babel-core/register",
-    "test": "npm run compile && npm run jshint && npm run mocha && nsp check"
+    "test": "npm run compile && npm run jshint && npm run mocha"
   },
   "directories": {
     "lib": "lib"
@@ -73,7 +73,6 @@
     "jshint": "^2.8.0",
     "mocha": "^2.5.0",
     "mongoose": "^4.1.0",
-    "nsp": "^2.2.0",
     "rimraf": "^2.5.2",
     "sinon": "^1.17.3",
     "sinon-chai": "^2.8.0"

src/service.js

@@ -65,7 +65,7 @@ class Service {
     const executeQuery = total => {
       return query.exec().then(data => {
         return {
-          total: total,
+          total,
           limit: filters.$limit,
           skip: filters.$skip || 0,
           data
@@ -132,12 +132,17 @@ class Service {
     return this.Model.create(data).catch(errorHandler);
   }
 
-  update(id, data) {
+  update(id, data, params) {
     if(id === null) {
       return Promise.reject('Not replacing multiple records. Did you mean `patch`?');
     }
 
-    const options = {new: true, overwrite: this.overwrite};
+    const options = Object.assign({
+      new: true,
+      overwrite: this.overwrite,
+      runValidators: true,
+      setDefaultsOnInsert: true
+    }, params.mongoose);
 
     if (this.id === '_id') {
       // We can not update default mongo ids
@@ -148,16 +153,10 @@ class Service {
       data[this.id] = id;
     }
 
-    // NOTE (EK): We don't use the findByIdAndUpdate method because these are functionally
-    // equivalent and this allows a developer to set their id field as something other than _id.
-    return this
-      .Model
+    return this.Model
       .findOneAndUpdate({ [this.id]: id }, data, options)
       .lean(this.lean)
       .exec()
-      .then((result) => {
-        return result;
-      })
       .catch(errorHandler);
   }
 
@@ -166,7 +165,9 @@ class Service {
     data = Object.assign({}, data);
 
     // If we are updating multiple records
-    let multi = id === null;
+    let options = Object.assign({
+      multi: id === null
+    }, params.mongoose);
 
     if (id !== null) {
       params.query[this.id] = id;
@@ -181,9 +182,8 @@ class Service {
       data[this.id] = id;
     }
 
-    return this
-      .Model
-      .update(params.query, { $set: data }, { multi })
+    return this.Model
+      .update(params.query, { $set: data }, options)
       .lean(this.lean)
       .exec()
       .then(() => this._getOrFind(id, params))
@@ -199,16 +199,14 @@ class Service {
 
     // NOTE (EK): First fetch the record(s) so that we can return
     // it/them when we delete it/them.
-    return this
-      ._getOrFind(id, params)
-      .then(data => {
-        return this.Model
-                  .remove(query)
-                  .lean(this.lean)
-                  .exec()
-                  .then(() => data)
-                  .catch(errorHandler);
-      })
+    return this._getOrFind(id, params)
+      .then(data => this.Model
+        .remove(query)
+        .lean(this.lean)
+        .exec()
+        .then(() => data)
+        .catch(errorHandler)
+      )
       .catch(errorHandler);
   }
 }

test/index.test.js

@@ -148,6 +148,17 @@ describe('Feathers Mongoose Service', () => {
         done();
       }).catch(done);
     });
+
+    it('runs validators on update', function(done) {
+      people.create({ name: 'David', age: 333 })
+        .then(person => people.update(person._id, { name: 'Dada', age: 'wrong' }))
+        .then(() => done(new Error('Update should not be successful')))
+        .catch(error => {
+          expect(error.name).to.equal('BadRequest');
+          expect(error.message).to.equal('Cast to number failed for value "wrong" at path "age"');
+          done();
+        });
+    });
   });
 
   describe('Lean Services', () => {