mirror of
https://github.com/directus/directus.git
synced 2026-01-25 12:48:07 -05:00
* Add black box tests * Revert docker compose file * Update workflow * Try use workflow from dev repo * Increase seedDB() timeout * Disable other checks for now * Change DB sequence * Update jest moduleNameMapper * Update workflow's docker-compose.yml path * Slice array first * Remove differentiation of status code * Delete field only after foreign key constraints are removed * Add checks for different types of primary key * Test global query filter for all field types * Increase timeout for m2o seeding * Add case insensitive string operators * Update filter check to run on relational fields * Enable time field checks * Add seeded random and fix relational seeding * Add casting for integer and bigInteger * Minor fixes * Reduce bigInt values * Separate seeding of DB structure from values * Add primaryKey seeding function * Use automatic IDs except for string pk * Try fix ci * Update package-lock.json * Update common.test for concealed user tokens * Use dynamic field type for m2o.test relational fields * Temporary disable missing nicontains for string type * Add support for alias type filtering * Fix relational filter operator checks * Add initial o2m test * Remove integer pk limit * Add empty checks for string and uuid null * Limit generated integer value to 4 bytes * Patch timezone tests for MSSQL * Remove sample query filter test * Fix timezone test for sqlite * Fix MSSQL uuids * Fix MSSQL timestamp inaccuracy * Cast datetime schema to milliseconds for comparison * Fix MySQL / Maria timestamp inaccuracy * Fix MySQL / Maria between operator inconsistency for float type * Fix missing time datatype in Oracle * Skip filter testing on Oracle * Enable o2m filter tests for other collections * Run tests only on SQLite for PRs unless the Full Tests label exists * Try fix actions * Refactor github actions * Update tests flow setup to use getURL() * Start postgres docker * Reinstate package-lock * Fix geometry test * Remove .gitkeep files * Add todo.md * Rename black box to blackbox Co-authored-by: rijkvanzanten <rijkvanzanten@me.com>
319 lines
7.6 KiB
TypeScript
319 lines
7.6 KiB
TypeScript
import { getFilterOperatorsForType } from '@directus/shared/utils';
|
|
import { ClientFilterOperator } from '@directus/shared/types';
|
|
import { FilterValidator, FilterEmptyValidator } from '@query/filter';
|
|
import { GeneratedFilter } from '..';
|
|
|
|
export const type = 'integer';
|
|
export const filterOperatorList = getFilterOperatorsForType(type);
|
|
|
|
export const generateFilterForDataType = (filter: ClientFilterOperator, possibleValues: any): GeneratedFilter[] => {
|
|
if (!filterOperatorList.includes(filter)) {
|
|
throw new Error(`Invalid filter operator for ${type}: ${filter}`);
|
|
}
|
|
|
|
switch (filter) {
|
|
case 'eq':
|
|
case 'neq':
|
|
case 'lt':
|
|
case 'lte':
|
|
case 'gt':
|
|
case 'gte':
|
|
if (Array.isArray(possibleValues)) {
|
|
return possibleValues.map((value) => {
|
|
return {
|
|
operator: filter,
|
|
value: value,
|
|
filter: {
|
|
[`_${filter}`]: value,
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
};
|
|
});
|
|
}
|
|
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: possibleValues,
|
|
filter: {
|
|
[`_${filter}`]: possibleValues,
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
case 'between':
|
|
case 'nbetween':
|
|
if (Array.isArray(possibleValues)) {
|
|
// Check if other values outside of the range can be filtered
|
|
const sortedPossibleValues = [...possibleValues].sort();
|
|
const middleIndex = Math.floor(sortedPossibleValues.length / 2);
|
|
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: [sortedPossibleValues[0], sortedPossibleValues[middleIndex]],
|
|
filter: {
|
|
[`_${filter}`]: [sortedPossibleValues[0], sortedPossibleValues[middleIndex]],
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
}
|
|
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: [possibleValues, possibleValues],
|
|
filter: {
|
|
[`_${filter}`]: [possibleValues, possibleValues],
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
case 'null':
|
|
case 'nnull':
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: true,
|
|
filter: {
|
|
[`_${filter}`]: true,
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
case 'in':
|
|
case 'nin':
|
|
if (Array.isArray(possibleValues)) {
|
|
// Check if other values outside of the range can be filtered
|
|
const middleIndex = Math.floor(possibleValues.length / 2);
|
|
const partialPossibleValues = possibleValues.slice(0, middleIndex);
|
|
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: partialPossibleValues,
|
|
filter: {
|
|
[`_${filter}`]: partialPossibleValues,
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
}
|
|
|
|
return [
|
|
{
|
|
operator: filter,
|
|
value: [possibleValues],
|
|
filter: {
|
|
[`_${filter}`]: [possibleValues],
|
|
},
|
|
validatorFunction: getValidatorFunction(filter),
|
|
emptyAllowedFunction: getEmptyAllowedFunction(filter),
|
|
},
|
|
];
|
|
default:
|
|
throw new Error(`Unimplemented filter operator for ${type}: ${filter}`);
|
|
}
|
|
};
|
|
|
|
export const getValidatorFunction = (filter: ClientFilterOperator): FilterValidator => {
|
|
if (!filterOperatorList.includes(filter)) {
|
|
throw new Error(`Invalid filter operator for ${type}: ${filter}`);
|
|
}
|
|
|
|
switch (filter) {
|
|
case 'eq':
|
|
return _eq;
|
|
case 'neq':
|
|
return _neq;
|
|
case 'lt':
|
|
return _lt;
|
|
case 'lte':
|
|
return _lte;
|
|
case 'gt':
|
|
return _gt;
|
|
case 'gte':
|
|
return _gte;
|
|
case 'between':
|
|
return _between;
|
|
case 'nbetween':
|
|
return _nbetween;
|
|
case 'null':
|
|
return _null;
|
|
case 'nnull':
|
|
return _nnull;
|
|
case 'in':
|
|
return _in;
|
|
case 'nin':
|
|
return _nin;
|
|
default:
|
|
throw new Error(`Unimplemented filter operator for ${type}: ${filter}`);
|
|
}
|
|
};
|
|
|
|
const _eq = (inputValue: any, possibleValues: any): boolean => {
|
|
if (Number(inputValue) === possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _neq = (inputValue: any, possibleValues: any): boolean => {
|
|
if (Number(inputValue) !== possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _lt = (inputValue: any, possibleValues: any): boolean => {
|
|
if (Number(inputValue) < possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _lte = (inputValue: any, possibleValues: any): boolean => {
|
|
if (Number(inputValue) <= possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _gt = (inputValue: any, possibleValues: any): boolean => {
|
|
if (Number(inputValue) > possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _gte = (inputValue: any, possibleValues: any): boolean => {
|
|
if (Number(inputValue) >= possibleValues) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _between = (inputValue: any, possibleValues: any): boolean => {
|
|
if (Number(inputValue) >= possibleValues[0] && Number(inputValue) <= possibleValues[1]) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _nbetween = (inputValue: any, possibleValues: any): boolean => {
|
|
if (Number(inputValue) < possibleValues[0] || Number(inputValue) > possibleValues[1]) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _null = (inputValue: any, _possibleValues: any): boolean => {
|
|
if (inputValue === undefined || inputValue === null) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _nnull = (inputValue: any, _possibleValues: any): boolean => {
|
|
if (inputValue !== undefined && inputValue !== null) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _in = (inputValue: any, possibleValues: any): boolean => {
|
|
if (possibleValues.includes(Number(inputValue))) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
const _nin = (inputValue: any, possibleValues: any): boolean => {
|
|
if (!possibleValues.includes(Number(inputValue))) {
|
|
return true;
|
|
}
|
|
return false;
|
|
};
|
|
|
|
export const getEmptyAllowedFunction = (filter: ClientFilterOperator): FilterEmptyValidator => {
|
|
if (!filterOperatorList.includes(filter)) {
|
|
throw new Error(`Invalid filter operator for ${type}: ${filter}`);
|
|
}
|
|
|
|
switch (filter) {
|
|
case 'lt':
|
|
return empty_lt;
|
|
case 'gt':
|
|
return empty_gt;
|
|
case 'nbetween':
|
|
return empty_nbetween;
|
|
case 'null':
|
|
return empty_null;
|
|
default:
|
|
return empty_invalid;
|
|
}
|
|
};
|
|
|
|
const empty_invalid = (_inputValue: any, _possibleValues: any): boolean => {
|
|
return false;
|
|
};
|
|
|
|
const empty_lt = (inputValue: any, possibleValues: any): boolean => {
|
|
if (Array.isArray(possibleValues)) {
|
|
for (const value of possibleValues) {
|
|
if (value < Number(inputValue)) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
} else {
|
|
return Number(inputValue) >= possibleValues;
|
|
}
|
|
};
|
|
|
|
const empty_gt = (inputValue: any, possibleValues: any): boolean => {
|
|
if (Array.isArray(possibleValues)) {
|
|
for (const value of possibleValues) {
|
|
if (value > Number(inputValue)) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
} else {
|
|
return Number(inputValue) <= possibleValues;
|
|
}
|
|
};
|
|
|
|
const empty_nbetween = (inputValue: any, possibleValues: any): boolean => {
|
|
if (Array.isArray(possibleValues)) {
|
|
for (const value of possibleValues) {
|
|
if (value < Number(inputValue[0]) || value > Number(inputValue[1])) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
} else {
|
|
return Number(inputValue[0]) >= possibleValues && Number(inputValue[1]) <= possibleValues;
|
|
}
|
|
};
|
|
|
|
const empty_null = (_inputValue: any, possibleValues: any): boolean => {
|
|
if (Array.isArray(possibleValues)) {
|
|
for (const value of possibleValues) {
|
|
if (value === null) {
|
|
return false;
|
|
}
|
|
}
|
|
return true;
|
|
} else {
|
|
return possibleValues !== null;
|
|
}
|
|
};
|