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

Cast numeric filter values as number for _eq and _neq operators (#16657)

Browse Source 
* Cast numeric filter values as number for _eq and _neq operators

* Add check for empty string

* Add check for booleans
This commit is contained in:
ian
2023-01-07 04:06:39 +07:00
committed by GitHub
parent f0e8f0bef0
commit bcbbd81257
2 changed files with 138 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

120
packages/shared/src/utils/generate-joi.test.ts
View File

@@ -67,6 +67,126 @@ describe(`generateJoi`, () => {
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for an integer _eq match`, () => {
const mockFieldFilter = { field: { _eq: '123' } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().equal('123', 123),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for an integer _neq match`, () => {
const mockFieldFilter = { field: { _neq: '123' } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().not('123', 123),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for a float _eq match`, () => {
const mockFieldFilter = { field: { _eq: '123.456' } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().equal('123.456', 123.456),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for a float _neq match`, () => {
const mockFieldFilter = { field: { _neq: '123.456' } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().not('123.456', 123.456),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for a null _eq match`, () => {
const mockFieldFilter = { field: { _eq: null } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().equal(null),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for a null _neq match`, () => {
const mockFieldFilter = { field: { _neq: null } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().not(null),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for an empty string _eq match`, () => {
const mockFieldFilter = { field: { _eq: '' } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().equal(''),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for an empty string _neq match`, () => {
const mockFieldFilter = { field: { _neq: '' } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().not(''),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for a true _eq match`, () => {
const mockFieldFilter = { field: { _eq: true } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().equal(true),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for a true _neq match`, () => {
const mockFieldFilter = { field: { _neq: true } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().not(true),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for a false _eq match`, () => {
const mockFieldFilter = { field: { _eq: false } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().equal(false),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for a false _neq match`, () => {
const mockFieldFilter = { field: { _neq: false } } as FieldFilter;
const mockSchema = Joi.object({
field: Joi.any().not(false),
})
.unknown()
.describe();
expect(generateJoi(mockFieldFilter).describe()).toStrictEqual(mockSchema);
});
it(`returns the correct schema for an _ncontains contain match`, () => {
const mockFieldFilter = { field: { _ncontains: 'field' } } as FieldFilter;
const mockSchema = Joi.object({

20
packages/shared/src/utils/generate-joi.ts
View File

@@ -104,11 +104,27 @@ export function generateJoi(filter: FieldFilter | null, options?: JoiOptions): A
const getDateSchema = () => (schema[key] ?? Joi.date()) as DateSchema;
if (operator === '_eq') {
schema[key] = getAnySchema().equal(compareValue);
const numericValue =
compareValue === null || compareValue === '' || compareValue === true || compareValue === false
? NaN
: Number(compareValue);
if (isNaN(numericValue)) {
schema[key] = getAnySchema().equal(compareValue);
} else {
schema[key] = getAnySchema().equal(compareValue, numericValue);
}
}
if (operator === '_neq') {
schema[key] = getAnySchema().not(compareValue);
const numericValue =
compareValue === null || compareValue === '' || compareValue === true || compareValue === false
? NaN
: Number(compareValue);
if (isNaN(numericValue)) {
schema[key] = getAnySchema().not(compareValue);
} else {
schema[key] = getAnySchema().not(compareValue, numericValue);
}
}
if (operator === '_contains') {