From 6f1f7741469b7d3d935a57d2ddba02cb43c782ca Mon Sep 17 00:00:00 2001 From: Alexandre Bodin Date: Tue, 31 Mar 2020 16:56:49 +0200 Subject: [PATCH] Refactor combineFilters Signed-off-by: Alexandre Bodin --- .../strapi-plugin-upload/services/Upload.js | 22 +++++++++---------- 1 file changed, 10 insertions(+), 12 deletions(-) diff --git a/packages/strapi-plugin-upload/services/Upload.js b/packages/strapi-plugin-upload/services/Upload.js index c4bcb52faf..72ef24c843 100644 --- a/packages/strapi-plugin-upload/services/Upload.js +++ b/packages/strapi-plugin-upload/services/Upload.js @@ -21,6 +21,14 @@ const generateFileName = name => { return `${baseName}_${randomSuffix()}`; }; +const combineFilters = params => { + // FIXME: until we support boolean operators for querying we need to make mime_ncontains use AND instead of OR + if (_.has(params, 'mime_ncontains') && Array.isArray(params.mime_ncontains)) { + params._where = params.mime_ncontains.map(val => ({ mime_ncontains: val })); + delete params.mime_ncontains; + } +}; + module.exports = { formatFileInfo({ filename, type, size }, fileInfo = {}, metas = {}) { const ext = path.extname(filename); @@ -250,12 +258,7 @@ module.exports = { }, fetchAll(params) { - // FIXME: until we support boolean operators for querying we need to make mime_ncontains use AND instead of OR - if (_.has(params, 'mime_ncontains') && Array.isArray(params.mime_ncontains)) { - params._where = params.mime_ncontains.map(val => ({ mime_ncontains: val })); - delete params.mime_ncontains; - } - + combineFilters(params); return strapi.query('file', 'upload').find(params); }, @@ -268,12 +271,7 @@ module.exports = { }, count(params) { - // FIXME: until we support boolean operators for querying we need to make mime_ncontains use AND instead of OR - if (_.has(params, 'mime_ncontains') && Array.isArray(params.mime_ncontains)) { - params._where = params.mime_ncontains.map(val => ({ mime_ncontains: val })); - delete params.mime_ncontains; - } - + combineFilters(params); return strapi.query('file', 'upload').count(params); },