Make sure ids in queries are respected

lib/service.js

@@ -112,7 +112,7 @@ class Service extends AdapterService {
   _get (id, params = {}) {
     const { query, filters } = this.filterQuery(params);
 
-    query[this.id] = id;
+    query.$and = (query.$and || []).concat([{ [this.id]: id }]);
 
     const discriminator = query[this.discriminatorKey] || this.discriminatorKey;
     const model = this.discriminators[discriminator] || this.Model;
@@ -186,7 +186,7 @@ class Service extends AdapterService {
       setDefaultsOnInsert: true
     }, params.mongoose);
 
-    query[this.id] = id;
+    query.$and = (query.$and || []).concat({ [this.id]: id });
 
     if (this.id === '_id') {
       // We can not update default mongo ids
@@ -243,7 +243,7 @@ class Service extends AdapterService {
     }, params.mongoose);
 
     if (id !== null) {
-      query[this.id] = id;
+      query.$and = (query.$and || []).concat({ [this.id]: id });
     }
 
     if (this.id === '_id') {
@@ -298,7 +298,7 @@ class Service extends AdapterService {
     }
 
     if (id !== null) {
-      query[this.id] = id;
+      query.$and = (query.$and || []).concat({ [this.id]: id });
 
       return this.Model.findOneAndDelete(query, params.mongoose).lean(this.lean)
         .exec().then(result => {

package.json

@@ -65,6 +65,7 @@
     "@feathersjs/errors": "^3.3.5"
   },
   "devDependencies": {
+    "@feathersjs/adapter-tests": "^1.0.1",
     "@feathersjs/express": "^1.3.0",
     "@feathersjs/feathers": "^3.3.0",
     "@feathersjs/socketio": "^3.2.8",

test/index.test.js

@@ -4,7 +4,7 @@ const mongoose = require('mongoose');
 
 const errors = require('@feathersjs/errors');
 const feathers = require('@feathersjs/feathers');
-const adaptersTests = require('@feathersjs/adapter-commons/tests');
+const adaptersTests = require('@feathersjs/adapter-tests');
 
 const adapter = require('../lib');
 const testSuite = adaptersTests([
@@ -65,7 +65,11 @@ const testSuite = adaptersTests([
   '.find + paginate',
   '.find + paginate + $limit + $skip',
   '.find + paginate + $limit 0',
-  '.find + paginate + params'
+  '.find + paginate + params',
+  '.get + id + query id',
+  '.remove + id + query id',
+  '.update + id + query id',
+  '.patch + id + query id'
 ]);
 
 const {