yujunjun/strapi
1
0
Fork 0
mirror of https://github.com/strapi/strapi.git synced 2025-09-25 08:19:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13350 from strapi/ML-folder/transactions

Browse Source 
Ml folder/transactions
This commit is contained in:
Pierre Noël 2022-05-31 18:58:22 +02:00 committed by GitHub
commit a9f53dc53b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 246 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/database/lib/index.js
View File

@ -58,6 +58,10 @@ class Database {
return schema ? trx.schema.withSchema(schema) : trx.schema;
}
transaction() {
return this.connection.transaction();
}
queryBuilder(uid) {
return this.entityManager.createQueryBuilder(uid);
}

20
packages/core/database/lib/query/query-builder.js
View File

@ -19,6 +19,8 @@ const createQueryBuilder = (uid, db) => {
populate: null,
limit: null,
offset: null,
transaction: null,
forUpdate: false,
orderBy: [],
groupBy: [],
};
@ -115,6 +117,16 @@ const createQueryBuilder = (uid, db) => {
return this;
},
transacting(transaction) {
state.transaction = transaction;
return this;
},
forUpdate() {
state.forUpdate = true;
return this;
},
init(params = {}) {
const { _q, filters, where, select, limit, offset, orderBy, groupBy, populate } = params;
@ -308,6 +320,14 @@ const createQueryBuilder = (uid, db) => {
}
}
if (state.transaction) {
qb.transacting(state.transaction);
}
if (state.forUpdate) {
qb.forUpdate();
}
if (state.limit) {
qb.limit(state.limit);
}

146
packages/core/upload/server/controllers/admin-folder-file.js
View File

@ -1,5 +1,6 @@
'use strict';
const { joinBy } = require('@strapi/utils');
const { getService } = require('../utils');
const { ACTIONS, FOLDER_MODEL_UID, FILE_MODEL_UID } = require('../constants');
const {
@ -43,7 +44,7 @@ module.exports = {
async moveMany(ctx) {
const { body } = ctx.request;
const {
state: { userAbility, user },
state: { userAbility },
} = ctx;
const pmFolder = strapi.admin.services.permission.createPermissionsManager({
@ -60,25 +61,136 @@ module.exports = {
await validateMoveManyFoldersFiles(body);
const { folderIds = [], fileIds = [], destinationFolderId } = body;
const uploadService = getService('upload');
const folderService = getService('folder');
const trx = await strapi.db.transaction();
try {
// fetch folders
const existingFolders = await strapi.db
.queryBuilder(FOLDER_MODEL_UID)
.select(['id', 'uid', 'path'])
.where({ id: { $in: folderIds } })
.transacting(trx)
.forUpdate()
.execute();
const updatedFolders = [];
// updates are done in order (not in parallele) to avoid mixing queries (path)
for (let folderId of folderIds) {
const updatedFolder = await folderService.update(
folderId,
{ parent: destinationFolderId },
{ user }
);
updatedFolders.push(updatedFolder);
// fetch files
const existingFiles = await strapi.db
.queryBuilder(FILE_MODEL_UID)
.select(['id'])
.where({ id: { $in: fileIds } })
.transacting(trx)
.forUpdate()
.execute();
// fetch destinationFolder path
let destinationFolderPath = '/';
if (destinationFolderId !== null) {
const destinationFolder = await strapi.db
.queryBuilder(FOLDER_MODEL_UID)
.select('path')
.where({ id: destinationFolderId })
.transacting(trx)
.first()
.execute();
destinationFolderPath = destinationFolder.path;
}
const fileTable = strapi.getModel(FILE_MODEL_UID).collectionName;
const folderTable = strapi.getModel(FOLDER_MODEL_UID).collectionName;
const folderPathColName = strapi.db.metadata.get(FILE_MODEL_UID).attributes.folderPath
.columnName;
const pathColName = strapi.db.metadata.get(FOLDER_MODEL_UID).attributes.path.columnName;
if (existingFolders.length > 0) {
// update folders' parent relation (delete + insert; upsert not possible)
const joinTable = strapi.db.metadata.get(FOLDER_MODEL_UID).attributes.parent.joinTable;
await strapi.db
.queryBuilder(joinTable.name)
.transacting(trx)
.delete()
.where({ [joinTable.joinColumn.name]: { $in: folderIds } })
.execute();
await strapi.db
.queryBuilder(joinTable.name)
.transacting(trx)
.insert(
existingFolders.map(folder => ({
[joinTable.inverseJoinColumn.name]: destinationFolderId,
[joinTable.joinColumn.name]: folder.id,
}))
)
.execute();
for (const existingFolder of existingFolders) {
// update path for folders themselves & folders below
await strapi.db
.connection(folderTable)
.transacting(trx)
.where(pathColName, 'like', `${existingFolder.path}%`)
.update(
pathColName,
strapi.db.connection.raw('REPLACE(??, ?, ?)', [
pathColName,
existingFolder.path,
joinBy('/', destinationFolderPath, existingFolder.uid),
])
);
// update path of files below
await strapi.db
.connection(fileTable)
.transacting(trx)
.where(folderPathColName, 'like', `${existingFolder.path}%`)
.update(
folderPathColName,
strapi.db.connection.raw('REPLACE(??, ?, ?)', [
folderPathColName,
existingFolder.path,
joinBy('/', destinationFolderPath, existingFolder.uid),
])
);
}
}
if (existingFiles.length > 0) {
// update files' folder relation (delete + insert; upsert not possible)
const fileJoinTable = strapi.db.metadata.get(FILE_MODEL_UID).attributes.folder.joinTable;
await strapi.db
.queryBuilder(fileJoinTable.name)
.transacting(trx)
.delete()
.where({ [fileJoinTable.joinColumn.name]: { $in: fileIds } })
.execute();
await strapi.db
.queryBuilder(fileJoinTable.name)
.transacting(trx)
.insert(
existingFiles.map(file => ({
[fileJoinTable.inverseJoinColumn.name]: destinationFolderId,
[fileJoinTable.joinColumn.name]: file.id,
}))
)
.execute();
// update files main fields (path + updatedBy)
await strapi.db
.connection(fileTable)
.transacting(trx)
.whereIn('id', fileIds)
.update(folderPathColName, destinationFolderPath);
}
await trx.commit();
} catch (e) {
await trx.rollback();
throw e;
}
const updatedFiles = await Promise.all(
fileIds.map(fileId =>
uploadService.updateFileInfo(fileId, { folder: destinationFolderId }, { user })
)
);
const updatedFolders = await strapi.entityService.findMany(FOLDER_MODEL_UID, {
filters: { id: { $in: folderIds } },
});
const updatedFiles = await strapi.entityService.findMany(FILE_MODEL_UID, {
filters: { id: { $in: fileIds } },
});
ctx.body = {
data: {

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

@ -74,53 +74,107 @@ const deleteByIds = async (ids = []) => {
* @returns {Promise<boolean>}
*/
const update = async (id, { name, parent }, { user }) => {
const existingFolder = await strapi.entityService.findOne(FOLDER_MODEL_UID, id);
// only name is updated
if (isUndefined(parent)) {
const existingFolder = await strapi.entityService.findOne(FOLDER_MODEL_UID, id);
if (!existingFolder) {
return undefined;
}
if (!existingFolder) {
return undefined;
}
if (!isUndefined(parent)) {
const folderPathColumnName = strapi.db.metadata.get(FILE_MODEL_UID).attributes.folderPath
.columnName;
const pathColumnName = strapi.db.metadata.get(FOLDER_MODEL_UID).attributes.path.columnName;
const newFolder = setCreatorFields({ user, isEdition: true })({ name, parent });
// Todo wrap into a transaction
const destinationFolder =
parent === null ? '/' : (await strapi.entityService.findOne(FOLDER_MODEL_UID, parent)).path;
if (isUndefined(parent)) {
const folder = await strapi.entityService.update(FOLDER_MODEL_UID, id, { data: newFolder });
return folder;
}
// location is updated => using transaction
} else {
const trx = await strapi.db.transaction();
try {
// fetch existing folder
const existingFolder = await strapi.db
.queryBuilder(FOLDER_MODEL_UID)
.select(['uid', 'path'])
.where({ id })
.transacting(trx)
.forUpdate()
.first()
.execute();
const folderTable = strapi.getModel(FOLDER_MODEL_UID).collectionName;
const fileTable = strapi.getModel(FILE_MODEL_UID).collectionName;
// update parent folder (delete + insert; upsert not possible)
const joinTable = strapi.db.metadata.get(FOLDER_MODEL_UID).attributes.parent.joinTable;
await strapi.db
.queryBuilder(joinTable.name)
.transacting(trx)
.delete()
.where({ [joinTable.joinColumn.name]: id })
.execute();
await strapi.db
.queryBuilder(joinTable.name)
.transacting(trx)
.insert({ [joinTable.inverseJoinColumn.name]: parent, [joinTable.joinColumn.name]: id })
.where({ [joinTable.joinColumn.name]: id })
.execute();
await strapi.db
.connection(folderTable)
.where(pathColumnName, 'like', `${existingFolder.path}%`)
.update(
pathColumnName,
strapi.db.connection.raw('REPLACE(??, ?, ?)', [
// fetch destinationFolder path
let destinationFolderPath = '/';
if (parent !== null) {
const destinationFolder = await strapi.db
.queryBuilder(FOLDER_MODEL_UID)
.select('path')
.where({ id: parent })
.transacting(trx)
.first()
.execute();
destinationFolderPath = destinationFolder.path;
}
const folderTable = strapi.getModel(FOLDER_MODEL_UID).collectionName;
const fileTable = strapi.getModel(FILE_MODEL_UID).collectionName;
const folderPathColumnName = strapi.db.metadata.get(FILE_MODEL_UID).attributes.folderPath
.columnName;
const pathColumnName = strapi.db.metadata.get(FOLDER_MODEL_UID).attributes.path.columnName;
// update folders below
await strapi.db
.connection(folderTable)
.transacting(trx)
.where(pathColumnName, 'like', `${existingFolder.path}%`)
.update(
pathColumnName,
existingFolder.path,
joinBy('/', destinationFolder, existingFolder.uid),
])
);
strapi.db.connection.raw('REPLACE(??, ?, ?)', [
pathColumnName,
existingFolder.path,
joinBy('/', destinationFolderPath, existingFolder.uid),
])
);
await strapi.db
.connection(fileTable)
.where(folderPathColumnName, 'like', `${existingFolder.path}%`)
.update(
folderPathColumnName,
strapi.db.connection.raw('REPLACE(??, ?, ?)', [
// update files below
await strapi.db
.connection(fileTable)
.transacting(trx)
.where(folderPathColumnName, 'like', `${existingFolder.path}%`)
.update(
folderPathColumnName,
existingFolder.path,
joinBy('/', destinationFolder, existingFolder.uid),
])
);
strapi.db.connection.raw('REPLACE(??, ?, ?)', [
folderPathColumnName,
existingFolder.path,
joinBy('/', destinationFolderPath, existingFolder.uid),
])
);
await trx.commit();
} catch (e) {
await trx.rollback();
throw e;
}
// update less critical information (name + updatedBy)
const newFolder = setCreatorFields({ user, isEdition: true })({ name });
const folder = await strapi.entityService.update(FOLDER_MODEL_UID, id, { data: newFolder });
return folder;
}
const newFolder = setCreatorFields({ user, isEdition: true })({ name, parent });
const folder = await strapi.entityService.update(FOLDER_MODEL_UID, id, { data: newFolder });
return folder;
};
/**

2
packages/core/upload/tests/admin/folder-structure.test.e2e.js
View File

@ -29,7 +29,7 @@ describe('Folder structure', () => {
// delete all possibly existing folders
const res = await rq({
method: 'GET',
url: '/upload/folders?pagination[pageSize]=-1',
url: '/upload/folders',
});
await rq({