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

nits

Browse Source
This commit is contained in:
Florent Vilmart
2016-03-02 15:16:48 -05:00
parent 3629c40036
commit 43f014a47d
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/Controllers/DatabaseController.js
View File

@@ -396,15 +396,14 @@ DatabaseController.prototype.owningIds = function(className, key, relatedIds) {
// equal-to-pointer constraints on relation fields. // equal-to-pointer constraints on relation fields.
// Returns a promise that resolves when query is mutated // Returns a promise that resolves when query is mutated
DatabaseController.prototype.reduceInRelation = function(className, query, schema) { DatabaseController.prototype.reduceInRelation = function(className, query, schema) {
// Search for an in-relation or equal-to-relation // Search for an in-relation or equal-to-relation
// Make it sequential for now, not sure of paralleization side effects // Make it sequential for now, not sure of paralleization side effects
if (query['$or']) { if (query['$or']) {
let ors = query['$or']; let ors = query['$or'];
return Promise.all(ors.map((aQuery, index) => { return Promise.all(ors.map((aQuery, index) => {
return this.reduceInRelation(className, aQuery, schema).then((aQuery) => { return this.reduceInRelation(className, aQuery, schema).then((aQuery) => {
if (aQuery) { query['$or'][index] = aQuery;
query['$or'][index] = aQuery;
}
}) })
})); }));
} }
@@ -416,7 +415,7 @@ DatabaseController.prototype.reduceInRelation = function(className, query, schem
let t = schema.getExpectedType(className, key); let t = schema.getExpectedType(className, key);
let match = t ? t.match(/^relation<(.*)>$/) : false; let match = t ? t.match(/^relation<(.*)>$/) : false;
if (!match) { if (!match) {
return; return Promise.resolve(query);
} }
let relatedClassName = match[1]; let relatedClassName = match[1];
let relatedIds; let relatedIds;
@@ -455,7 +454,10 @@ DatabaseController.prototype.reduceRelationKeys = function(className, query) {
relatedTo.key, relatedTo.key,
relatedTo.object.objectId).then((ids) => { relatedTo.object.objectId).then((ids) => {
delete query['$relatedTo']; delete query['$relatedTo'];
query['objectId'] = {'$in': ids}; query.objectId = query.objectId || {};
let queryIn = query.objectId['$in'] || [];
queryIn = queryIn.concat(ids);
query['objectId'] = {'$in': queryIn};
return this.reduceRelationKeys(className, query); return this.reduceRelationKeys(className, query);
}); });
} }