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

add transaction for folder update

Browse Source
This commit is contained in:
Pierre Noël 2022-05-18 19:00:43 +02:00
parent 27bd19bb0d
commit cd69fca6f9
3 changed files with 110 additions and 38 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);
}

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

@ -74,53 +74,101 @@ 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
const joinTable = strapi.db.metadata.get(FOLDER_MODEL_UID).attributes.parent.joinTable;
await strapi.db
.queryBuilder(joinTable.name)
.transacting(trx)
.update({ [joinTable.inverseJoinColumn.name]: parent })
.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;
};
/**