ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: call rollback in catch

Browse Source
This commit is contained in:
chenos 2021-08-26 22:03:16 +08:00
parent a0fc7a17d1
commit 0ef730d7e4
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
packages/actions/src/actions/common.ts
View File

@ -255,21 +255,26 @@ export async function create(ctx: Context, next: Next) {
const transaction = await ctx.db.sequelize.transaction(); const transaction = await ctx.db.sequelize.transaction();
const options = { transaction, context: ctx }; const options = { transaction, context: ctx };
let model: Model; let model: Model;
if (associated && resourceField) { try {
const AssociatedModel = ctx.db.getModel(associatedName); if (associated && resourceField) {
if (!(associated instanceof AssociatedModel)) { const AssociatedModel = ctx.db.getModel(associatedName);
throw new Error(`${associatedName} associated model invalid`); if (!(associated instanceof AssociatedModel)) {
throw new Error(`${associatedName} associated model invalid`);
}
const { create } = resourceField.getAccessors();
model = await associated[create](values, options);
} else {
const ResourceModel = ctx.db.getModel(resourceName);
model = await ResourceModel.create(values, options);
} }
const { create } = resourceField.getAccessors(); await model.updateAssociations(values, options);
model = await associated[create](values, options); await transaction.commit();
} else { ctx.body = model;
const ResourceModel = ctx.db.getModel(resourceName); await next();
model = await ResourceModel.create(values, options); } catch (error) {
await transaction.rollback();
throw error;
} }
await model.updateAssociations(values, options);
await transaction.commit();
ctx.body = model;
await next();
} }
/** /**