mirror of
https://github.com/strapi/strapi.git
synced 2025-11-09 14:51:29 +00:00
refactor: apply review suggestion of generic parsing
This commit is contained in:
parent
ef888f0f81
commit
506cf9e15b
@ -4,7 +4,7 @@
|
|||||||
* Converts the standard Strapi REST query params to a more usable format for querying
|
* Converts the standard Strapi REST query params to a more usable format for querying
|
||||||
* You can read more here: https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/rest-api.html#filters
|
* You can read more here: https://docs.strapi.io/developer-docs/latest/developer-resources/database-apis-reference/rest-api.html#filters
|
||||||
*/
|
*/
|
||||||
const { has, isEmpty, isObject, cloneDeep, get } = require('lodash/fp');
|
const { has, isEmpty, isObject, isPlainObject, cloneDeep, get } = require('lodash/fp');
|
||||||
const _ = require('lodash');
|
const _ = require('lodash');
|
||||||
const parseType = require('./parse-type');
|
const parseType = require('./parse-type');
|
||||||
const contentTypesUtils = require('./content-types');
|
const contentTypesUtils = require('./content-types');
|
||||||
@ -286,7 +286,7 @@ const convertFiltersQueryParams = (filters, schema) => {
|
|||||||
};
|
};
|
||||||
|
|
||||||
const convertAndSanitizeFilters = (filters, schema) => {
|
const convertAndSanitizeFilters = (filters, schema) => {
|
||||||
if (!isObject(filters)) {
|
if (!isPlainObject(filters)) {
|
||||||
return filters;
|
return filters;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -339,11 +339,6 @@ const convertAndSanitizeFilters = (filters, schema) => {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle dates
|
|
||||||
else if (value instanceof Date) {
|
|
||||||
return filters;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Handle operators
|
// Handle operators
|
||||||
else {
|
else {
|
||||||
if (['$null', '$notNull'].includes(key)) {
|
if (['$null', '$notNull'].includes(key)) {
|
||||||
@ -354,7 +349,7 @@ const convertAndSanitizeFilters = (filters, schema) => {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Remove empty objects & arrays
|
// Remove empty objects & arrays
|
||||||
if (isObject(filters[key]) && isEmpty(filters[key])) {
|
if (isPlainObject(filters[key]) && isEmpty(filters[key])) {
|
||||||
removeOperator(key);
|
removeOperator(key);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user