joe/kami-parse-server
Public Access
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Kill mongoOptions

Browse Source
This commit is contained in:
Drew Gross
2016-05-23 20:28:12 -07:00
parent d428041a83
commit 05ae010b91
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Controllers/DatabaseController.js
View File

@@ -631,13 +631,6 @@ DatabaseController.prototype.find = function(className, query, {
sort, sort,
count, count,
} = {}) { } = {}) {
let mongoOptions = {};
if (skip) {
mongoOptions.skip = skip;
}
if (limit) {
mongoOptions.limit = limit;
}
let isMaster = acl === undefined; let isMaster = acl === undefined;
let aclGroup = acl || []; let aclGroup = acl || [];
let op = typeof query.objectId == 'string' && Object.keys(query).length === 1 ? 'get' : 'find'; let op = typeof query.objectId == 'string' && Object.keys(query).length === 1 ? 'get' : 'find';
@@ -653,8 +646,8 @@ DatabaseController.prototype.find = function(className, query, {
throw error; throw error;
}) })
.then(schema => { .then(schema => {
const transformedSort = {};
if (sort) { if (sort) {
mongoOptions.sort = {};
for (let fieldName in sort) { for (let fieldName in sort) {
// Parse.com treats queries on _created_at and _updated_at as if they were queries on createdAt and updatedAt, // Parse.com treats queries on _created_at and _updated_at as if they were queries on createdAt and updatedAt,
// so duplicate that behaviour here. // so duplicate that behaviour here.
@@ -673,7 +666,7 @@ DatabaseController.prototype.find = function(className, query, {
throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, `Cannot sort by ${fieldName}`); throw new Parse.Error(Parse.Error.INVALID_KEY_NAME, `Cannot sort by ${fieldName}`);
} }
const mongoKey = this.transform.transformKey(className, fieldName, schema); const mongoKey = this.transform.transformKey(className, fieldName, schema);
mongoOptions.sort[mongoKey] = sort[fieldName]; transformedSort[mongoKey] = sort[fieldName];
} }
} }
return (isMaster ? Promise.resolve() : schemaController.validatePermission(className, aclGroup, op)) return (isMaster ? Promise.resolve() : schemaController.validatePermission(className, aclGroup, op))
@@ -698,7 +691,7 @@ DatabaseController.prototype.find = function(className, query, {
if (count) { if (count) {
return this.adapter.count(className, query, schema); return this.adapter.count(className, query, schema);
} else { } else {
return this.adapter.find(className, query, schema, mongoOptions) return this.adapter.find(className, query, schema, { skip, limit, sort: transformedSort })
.then(objects => objects.map(object => filterSensitiveData(isMaster, aclGroup, className, object))); .then(objects => objects.map(object => filterSensitiveData(isMaster, aclGroup, className, object)));
} }
}); });