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

Clearer names in DatabaseController

Browse Source
This commit is contained in:
Drew Gross
2016-04-25 22:12:03 -07:00
parent 5cbf3eb8dd
commit 608cba9e8c
1 changed files with 31 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Controllers/DatabaseController.js
View File

@@ -598,31 +598,23 @@ DatabaseController.prototype.find = function(className, query, {
} }
let isMaster = acl === undefined; let isMaster = acl === undefined;
let aclGroup = acl || []; let aclGroup = acl || [];
let schema = null; let op = typeof query.objectId == 'string' && Object.keys(query).length === 1 ? 'get' : 'find';
let op = typeof query.objectId == 'string' && Object.keys(query).length === 1 ? return this.loadSchema()
'get' : .then(schemaController => {
'find';
return this.loadSchema().then(s => {
schema = s;
if (sort) { if (sort) {
mongoOptions.sort = {}; mongoOptions.sort = {};
for (let key in sort) { for (let key in sort) {
let mongoKey = this.transform.transformKey(schema, className, key); let mongoKey = this.transform.transformKey(schemaController, className, key);
mongoOptions.sort[mongoKey] = sort[key]; mongoOptions.sort[mongoKey] = sort[key];
} }
} }
return (isMaster ? Promise.resolve() : schemaController.validatePermission(className, aclGroup, op))
if (!isMaster) {
return schema.validatePermission(className, aclGroup, op);
}
return Promise.resolve();
})
.then(() => this.reduceRelationKeys(className, query)) .then(() => this.reduceRelationKeys(className, query))
.then(() => this.reduceInRelation(className, query, schema)) .then(() => this.reduceInRelation(className, query, schemaController))
.then(() => this.adapter.adaptiveCollection(className)) .then(() => this.adapter.adaptiveCollection(className))
.then(collection => { .then(collection => {
if (!isMaster) { if (!isMaster) {
query = this.addPointerPermissions(schema, className, op, query, aclGroup); query = this.addPointerPermissions(schemaController, className, op, query, aclGroup);
} }
if (!query) { if (!query) {
if (op == 'get') { if (op == 'get') {
@@ -635,7 +627,7 @@ DatabaseController.prototype.find = function(className, query, {
if (!isMaster) { if (!isMaster) {
query = addReadACL(query, aclGroup); query = addReadACL(query, aclGroup);
} }
let mongoWhere = this.transform.transformWhere(schema, className, query); let mongoWhere = this.transform.transformWhere(schemaController, className, query);
if (count) { if (count) {
delete mongoOptions.limit; delete mongoOptions.limit;
return collection.count(mongoWhere, mongoOptions); return collection.count(mongoWhere, mongoOptions);
@@ -643,12 +635,12 @@ DatabaseController.prototype.find = function(className, query, {
return collection.find(mongoWhere, mongoOptions) return collection.find(mongoWhere, mongoOptions)
.then((mongoResults) => { .then((mongoResults) => {
return mongoResults.map((r) => { return mongoResults.map((r) => {
return this.untransformObject( return this.untransformObject(schemaController, isMaster, aclGroup, className, r);
schema, isMaster, aclGroup, className, r);
}); });
}); });
} }
}); });
});
}; };
DatabaseController.prototype.deleteSchema = function(className) { DatabaseController.prototype.deleteSchema = function(className) {