yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-11 07:39:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix tests & handle scalars shortcuts

Browse Source
This commit is contained in:
Convly 2022-01-10 12:35:08 +01:00
parent 04ec37e36e
commit 2670d37ddc
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
packages/core/utils/lib/convert-query-params.js
View File

@ -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 } = require('lodash/fp'); const { has, isEmpty, isObject } = 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');
@ -221,11 +221,15 @@ const convertFieldsQueryParams = (fields, depth = 0) => {
const convertFiltersQueryParams = (filters, schema) => { const convertFiltersQueryParams = (filters, schema) => {
// Filters need to be either an array or an object // Filters need to be either an array or an object
// Here we're only checking for 'object' type since typeof [] => object and typeof {} => object // Here we're only checking for 'object' type since typeof [] => object and typeof {} => object
if (typeof filters !== 'object') { if (!isObject(filters)) {
throw new Error('The filters parameter must be an object or an array'); throw new Error('The filters parameter must be an object or an array');
} }
const sanitizeFilters = (filters, schema) => { const sanitizeFilters = (filters, schema) => {
if (!isObject(filters)) {
return filters;
}
if (Array.isArray(filters)) { if (Array.isArray(filters)) {
return ( return (
filters filters
@ -243,7 +247,6 @@ const convertFiltersQueryParams = (filters, schema) => {
// Handle attributes // Handle attributes
if (attribute) { if (attribute) {
console.log(key, attribute.type);
// Always remove password attributes from filters object // Always remove password attributes from filters object
if (attribute.type === 'password') { if (attribute.type === 'password') {
removeOperator(); removeOperator();
@ -271,15 +274,12 @@ const convertFiltersQueryParams = (filters, schema) => {
} }
// Handle operators // Handle operators
else { else if (isObject(value)) {
if (typeof value !== 'object') {
throw new Error(`Invalid value supplied for "${key}"`);
}
filters[key] = sanitizeFilters(value, schema); filters[key] = sanitizeFilters(value, schema);
} }
if (isEmpty(filters[key])) { // Remove empty objects & arrays
if (isObject(filters[key]) && isEmpty(filters[key])) {
removeOperator(); removeOperator();
} }
} }