From a763f7c2fc31f887a1336a30e3216344d7fed1d1 Mon Sep 17 00:00:00 2001 From: Drew Gross Date: Mon, 23 May 2016 20:19:03 -0700 Subject: [PATCH] move transformWhere into mongo adapter --- src/Adapters/Storage/Mongo/MongoStorageAdapter.js | 4 ++-- src/Controllers/DatabaseController.js | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js index 52573f8b..cf3a99b1 100644 --- a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js +++ b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js @@ -206,9 +206,9 @@ export class MongoStorageAdapter { } // Executs a count. - count(className, query) { + count(className, query, schema) { return this.adaptiveCollection(className) - .then(collection => collection.count(query)); + .then(collection => collection.count(transform.transformWhere(className, query, schema))); } get transform() { diff --git a/src/Controllers/DatabaseController.js b/src/Controllers/DatabaseController.js index 2c6e82eb..4de6a211 100644 --- a/src/Controllers/DatabaseController.js +++ b/src/Controllers/DatabaseController.js @@ -696,8 +696,7 @@ DatabaseController.prototype.find = function(className, query, { } validateQuery(query); if (count) { - let mongoWhere = this.transform.transformWhere(className, query, schema); - return this.adapter.count(className, mongoWhere); + return this.adapter.count(className, query, schema); } else { return this.adapter.find(className, query, mongoOptions, schema) .then(objects => objects.map(object => filterSensitiveData(isMaster, aclGroup, className, object)));