From 1ae1d42c32bb99faa339bd53dbfca8289a5e282e Mon Sep 17 00:00:00 2001 From: Drew Gross Date: Mon, 23 May 2016 17:39:07 -0700 Subject: [PATCH] transformWhere in MongoAdapter --- src/Adapters/Storage/Mongo/MongoStorageAdapter.js | 3 ++- src/Controllers/DatabaseController.js | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js index 681729b3..5768262a 100644 --- a/src/Adapters/Storage/Mongo/MongoStorageAdapter.js +++ b/src/Adapters/Storage/Mongo/MongoStorageAdapter.js @@ -199,8 +199,9 @@ export class MongoStorageAdapter { // Executes a find. Accepts: className, query in Parse format, and { skip, limit, sort }. find(className, query, { skip, limit, sort }, schema) { + let mongoWhere = this.transform.transformWhere(className, query, schema); return this.adaptiveCollection(className) - .then(collection => collection.find(query, { skip, limit, sort })) + .then(collection => collection.find(mongoWhere, { skip, limit, sort })) .then(objects => objects.map(object => transform.mongoObjectToParseObject(className, object, schema))); } diff --git a/src/Controllers/DatabaseController.js b/src/Controllers/DatabaseController.js index 8b88410b..db2276ff 100644 --- a/src/Controllers/DatabaseController.js +++ b/src/Controllers/DatabaseController.js @@ -696,12 +696,12 @@ DatabaseController.prototype.find = function(className, query, { query = addReadACL(query, aclGroup); } validateQuery(query); - let mongoWhere = this.transform.transformWhere(className, query, schema); if (count) { + let mongoWhere = this.transform.transformWhere(className, query, schema); delete mongoOptions.limit; return collection.count(mongoWhere, mongoOptions); } else { - return this.adapter.find(className, mongoWhere, mongoOptions, schema) + return this.adapter.find(className, query, mongoOptions, schema) .then(objects => objects.map(object => filterSensitiveData(isMaster, aclGroup, className, object))); } });