yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-12-26 06:35:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move hasDeepFilters to utils

Browse Source 
Signed-off-by: Alexandre Bodin <bodin.alex@gmail.com>
This commit is contained in:
Alexandre Bodin 2020-06-26 17:37:52 +02:00
parent c8d743ef60
commit 966d9c554f
4 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/strapi-connector-bookshelf/lib/buildQuery.js
View File

@ -138,7 +138,7 @@ const buildJoinsAndFilter = (qb, model, whereClauses) => {
};
};
// tree made to create the joins strucutre
// tree made to create the joins structure
const tree = {
alias: model.collectionName,
assoc: null,

13
packages/strapi-connector-mongoose/lib/buildQuery.js
View File

@ -3,6 +3,7 @@
const _ = require('lodash');
var semver = require('semver');
const utils = require('./utils')();
const { hasDeepFilters } = require('strapi-utils');
const combineSearchAndWhere = (search = [], wheres = []) => {
const criterias = {};
@ -64,18 +65,6 @@ const buildSearchOr = (model, query) => {
const BOOLEAN_OPERATORS = ['or'];
const hasDeepFilters = (whereClauses = []) => {
return (
whereClauses.filter(({ field, operator, value }) => {
if (BOOLEAN_OPERATORS.includes(operator)) {
return value.filter(hasDeepFilters).length > 0;
}
return field.split('.').length > 1;
}).length > 0
);
};
/**
* Build a mongo query
* @param {Object} options - Query options

7
packages/strapi-utils/lib/build-query.js
View File

@ -90,7 +90,7 @@ const normalizeFieldName = ({ model, field }) => {
const BOOLEAN_OPERATORS = ['or'];
const hasDeepFilters = whereClauses => {
const hasDeepFilters = (whereClauses = []) => {
return (
whereClauses.filter(({ field, operator, value }) => {
if (BOOLEAN_OPERATORS.includes(operator)) {
@ -156,4 +156,7 @@ const buildQuery = ({ model, filters = {}, ...rest }) => {
return strapi.db.connectors.get(model.orm).buildQuery({ model, filters, ...rest });
};
module.exports = buildQuery;
module.exports = {
buildQuery,
hasDeepFilters,
};

3
packages/strapi-utils/lib/index.js
View File

@ -4,7 +4,7 @@
* Export shared utilities
*/
const convertRestQueryParams = require('./convert-rest-query-params');
const buildQuery = require('./build-query');
const { buildQuery, hasDeepFilters } = require('./build-query');
const parseMultipartData = require('./parse-multipart');
const sanitizeEntity = require('./sanitize-entity');
const parseType = require('./parse-type');
@ -36,6 +36,7 @@ module.exports = {
templateConfiguration,
convertRestQueryParams,
buildQuery,
hasDeepFilters,
parseMultipartData,
sanitizeEntity,
parseType,