Getting special query filters working and fixing a few bugs

Author: ekryski

lib/feathers-mongoose.js

@@ -1,7 +1,8 @@
 var _ = require('lodash');
 var Proto = require('uberproto');
 var mongoose = require('mongoose');
-var errors = require('feathers').errors.types;
+var errors = require('feathers-errors').types;
+var filter = require('feathers-query-filters');
 var Schema = mongoose.Schema;
 var ObjectId = mongoose.Types.ObjectId;
 
@@ -10,7 +11,7 @@ var MongooseService = Proto.extend({
   init: function(modelName, entity, options) {
     options = options || {};
 
-    if(typeof modelName !== 'string') {
+    if (!_.isString(modelName)) {
       throw new errors.GeneralError('Must provide a valid model name');
     }
 
@@ -86,22 +87,25 @@ var MongooseService = Proto.extend({
       return;
     }
 
-    if(!connectionString) {
+    if (!connectionString) {
       var config = _.extend({
         host: 'localhost',
         port: 27017,
-        db: 'feathers'
+        db: 'feathers',
+        reconnect: true
       }, options);
 
-      connectionString = config.host + ':' + config.port + '/' + config.db;
-    }
+      connectionString = 'mongodb://';
 
-    if(options.username && options.password) {
-      connectionString += options.username + ':' + options.password + '@';
-    }
+      if (config.username && config.password) {
+        connectionString += config.username + ':' + config.password + '@';
+      }
+
+      connectionString += config.host + ':' + config.port + '/' + config.db;
 
-    if(options.reconnect) {
-      connectionString += '?auto_reconnect=true';
+      if (config.reconnect) {
+        connectionString += '?auto_reconnect=true';
+      }
     }
 
     // TODO (EK): Support mongoose connection options
@@ -115,53 +119,44 @@ var MongooseService = Proto.extend({
       params = {};
     }
 
-    var sort = {};
-    var populate = '';
-    var limit = 100;
-    var skip = 0;
-    var select = {};
-
     params.query = params.query || {};
+    var filters = filter(params.query);
 
-    if (params.query.sort) {
-      sort = params.query.sort;
-      delete params.query.sort;
+    var query = this.model.find(params.query);
+
+    if (filters.$select && filters.$select.length) {
+      var fields = {};
+      
+      _.each(filters.$select, function(key){
+        fields[key] = 1;
+      });
+
+      query.select(fields);
     }
 
-    if (params.query.populate) {
-      populate = params.query.populate;
-      delete params.query.populate;
+    if (filters.$sort){
+      query.sort(filters.$sort);
     }
 
-    if (params.query.limit) {
-      limit = params.query.limit;
-      delete params.query.limit;
+    if (filters.$limit){
+      query.limit(filters.$limit);
     }
 
-    if (params.query.skip) {
-      skip = params.query.skip;
-      delete params.query.skip;
+    if (filters.$skip){
+      query.skip(filters.$skip);
     }
 
-    if (params.query.select) {
-      select = params.query.select;
-      delete params.query.select;
+    if (filters.$populate){
+      query.populate(filters.$populate);
     }
-      
-    this.model
-        .find(params.query)
-        .sort(sort)
-        .limit(limit)
-        .skip(skip)
-        .select(select)
-        .populate(populate)
-        .exec(function (error, data) {
-          if (error) {
-            return cb(new errors.BadRequest(error));
-          }
 
-          cb(null, data);
-        });
+    query.exec(function(error, data) {
+      if (error) {
+        return cb(new errors.BadRequest(error));
+      }
+
+      cb(null, data);
+    });
   },
 
   get: function(id, params, cb) {
@@ -215,16 +210,22 @@ var MongooseService = Proto.extend({
   },
 
   patch: function(id, data, params, cb) {
-    this.update.apply(this, arguments);
+    this.update.call(this, id, data, params, cb);
   },
 
   update: function(id, data, params, cb) {
-    if(_.isFunction(params)) {
+    if (_.isFunction(data)) {
+      cb = data;
+      return cb(new errors.BadRequest('You need to provide data to be updated'));
+    }
+
+    if (_.isFunction(params)) {
       cb = params;
       params = {};
     }
 
-    this.model.findByIdAndUpdate(new ObjectId(id), data, { upsert: true }, function(error, data) {
+    // TODO (EK): Support updating multiple docs. Maybe we just use feathers-batch
+    this.model.findByIdAndUpdate(new ObjectId(id), data, {new: true}, function(error, data) {
       if (error) {
         return cb(new errors.BadRequest(error));
       }