yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-11-18 02:58:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: filter folder by eq and startswith

Browse Source
This commit is contained in:
Marc-Roig 2023-05-17 17:31:38 +02:00
parent 1ff71db3f6
commit 008d82f8f7
No known key found for this signature in database
GPG Key ID: FB4E2C43A0BEE249
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
packages/core/upload/server/services/folder.js
View File

@ -56,16 +56,22 @@ const deleteByIds = async (ids = []) => {
// delete files // delete files
const filesToDelete = await strapi.db.query(FILE_MODEL_UID).findMany({ const filesToDelete = await strapi.db.query(FILE_MODEL_UID).findMany({
where: { where: {
$or: pathsToDelete.map((path) => ({ folderPath: { $startsWith: path } })), $or: pathsToDelete.flatMap((path) => [
{ folderPath: { $eq: path } },
{ folderPath: { $startsWith: `${path}/` } },
]),
}, },
}); });
await Promise.all(filesToDelete.map((file) => getService('upload').remove(file))); await Promise.all(filesToDelete.map((file) => getService('upload').remove(file)));
// delete folders // delete folders and subfolders
const { count: totalFolderNumber } = await strapi.db.query(FOLDER_MODEL_UID).deleteMany({ const { count: totalFolderNumber } = await strapi.db.query(FOLDER_MODEL_UID).deleteMany({
where: { where: {
$or: pathsToDelete.map((path) => ({ path: { $startsWith: path } })), $or: pathsToDelete.flatMap((path) => [
{ path: { $eq: path } },
{ path: { $startsWith: `${path}/` } },
]),
}, },
}); });