github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-03 03:00:39 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix nested union query filter (#9726)

Browse Source 
Fixes #9578
This commit is contained in:
Rijk van Zanten
2021-11-11 13:22:11 -05:00
committed by GitHub
parent 153c3d55a3
commit 3cd1224795
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
api/src/utils/apply-query.ts
View File

@@ -1,5 +1,5 @@
import { Knex } from 'knex';
import { clone, get, isPlainObject, set } from 'lodash';
import { clone, cloneDeep, get, isPlainObject, set } from 'lodash';
import { customAlphabet } from 'nanoid';
import validate from 'uuid-validate';
import { InvalidQueryException } from '../exceptions';
@@ -71,17 +71,19 @@ export default function applyQuery(
const [field, keys] = query.union as [string, (string | number)[]];
const queries = keys.map((key) => {
let filter = { [field]: { _eq: key } } as Filter;
const unionFilter = { [field]: { _eq: key } } as Filter;
let filter: Filter | null | undefined = cloneDeep(query.filter);
if (query.filter) {
if ('_and' in query.filter) {
(query.filter as LogicalFilterAND)._and.push(filter);
filter = query.filter;
if (filter) {
if ('_and' in filter) {
(filter as LogicalFilterAND)._and.push(unionFilter);
} else {
filter = {
_and: [query.filter, filter],
_and: [filter, unionFilter],
} as LogicalFilterAND;
}
} else {
filter = unionFilter;
}
return knex.select('*').from(applyFilter(knex, schema, dbQuery.clone(), filter, collection, subQuery).as('foo'));