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

remove schema from transformWhere

Browse Source
This commit is contained in:
Drew Gross
2016-04-26 10:20:17 -07:00
parent a926712951
commit d4bd21fcbc
4 changed files with 10 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Adapters/Storage/Mongo/MongoStorageAdapter.js
View File

@@ -177,13 +177,7 @@ export class MongoStorageAdapter {
deleteObjectsByQuery(className, query, schemaController, validate, parseFormatSchema) {
return this.adaptiveCollection(className)
.then(collection => {
let mongoWhere = transform.transformWhere(
schemaController,
className,
query,
{ validate },
parseFormatSchema
);
let mongoWhere = transform.transformWhere(className, query, { validate }, parseFormatSchema);
return collection.deleteMany(mongoWhere)
})
.then(({ result }) => {

10
src/Adapters/Storage/Mongo/MongoTransform.js
View File

@@ -139,7 +139,7 @@ const valueAsDate = value => {
return false;
}
function transformQueryKeyValue(schema, className, key, value, { validate } = {}, parseFormatSchema) {
function transformQueryKeyValue(className, key, value, { validate } = {}, parseFormatSchema) {
switch(key) {
case 'createdAt':
if (valueAsDate(value)) {
@@ -168,12 +168,12 @@ function transformQueryKeyValue(schema, className, key, value, { validate } = {}
if (!(value instanceof Array)) {
throw new Parse.Error(Parse.Error.INVALID_QUERY, 'bad $or format - use an array value');
}
return {key: '$or', value: value.map(subQuery => transformWhere(schema, className, subQuery, {}, parseFormatSchema))};
return {key: '$or', value: value.map(subQuery => transformWhere(className, subQuery, {}, parseFormatSchema))};
case '$and':
if (!(value instanceof Array)) {
throw new Parse.Error(Parse.Error.INVALID_QUERY, 'bad $and format - use an array value');
}
return {key: '$and', value: value.map(subQuery => transformWhere(schema, className, subQuery, {}, parseFormatSchema))};
return {key: '$and', value: value.map(subQuery => transformWhere(className, subQuery, {}, parseFormatSchema))};
default:
// Other auth data
const authDataMatch = key.match(/^authData\.([a-zA-Z0-9_]+)\.id$/);
@@ -222,13 +222,13 @@ function transformQueryKeyValue(schema, className, key, value, { validate } = {}
// restWhere is the "where" clause in REST API form.
// Returns the mongo form of the query.
// Throws a Parse.Error if the input query is invalid.
function transformWhere(schema, className, restWhere, { validate = true } = {}, parseFormatSchema) {
function transformWhere(className, restWhere, { validate = true } = {}, parseFormatSchema) {
let mongoWhere = {};
if (restWhere['ACL']) {
throw new Parse.Error(Parse.Error.INVALID_QUERY, 'Cannot query on ACL.');
}
for (let restKey in restWhere) {
let out = transformQueryKeyValue(schema, className, restKey, restWhere[restKey], { validate }, parseFormatSchema);
let out = transformQueryKeyValue(className, restKey, restWhere[restKey], { validate }, parseFormatSchema);
mongoWhere[out.key] = out.value;
}
return mongoWhere;