diff --git a/src/routes/milestoneTemplates/clone.js b/src/routes/milestoneTemplates/clone.js index bfe95a46..147f6dd1 100644 --- a/src/routes/milestoneTemplates/clone.js +++ b/src/routes/milestoneTemplates/clone.js @@ -30,7 +30,7 @@ module.exports = [ (req, res, next) => { let result; - return models.sequelize.transaction(tx => + return models.sequelize.transaction(() => // Find the product template models.MilestoneTemplate.findAll({ where: { @@ -48,7 +48,7 @@ module.exports = [ milestone.createdBy = req.authUser.userId; // eslint-disable-line no-param-reassign milestone.updatedBy = req.authUser.userId; // eslint-disable-line no-param-reassign }); - return models.MilestoneTemplate.bulkCreate(newMilestoneTemplates, { transaction: tx }); + return models.MilestoneTemplate.bulkCreate(newMilestoneTemplates); }) .then(() => { // eslint-disable-line arrow-body-style return models.MilestoneTemplate.findAll({ diff --git a/src/routes/milestoneTemplates/create.js b/src/routes/milestoneTemplates/create.js index 321c9b65..32ab860a 100644 --- a/src/routes/milestoneTemplates/create.js +++ b/src/routes/milestoneTemplates/create.js @@ -51,9 +51,9 @@ module.exports = [ }); let result; - return models.sequelize.transaction(tx => + return models.sequelize.transaction(() => // Create the milestone template - models.MilestoneTemplate.create(entity, { transaction: tx }) + models.MilestoneTemplate.create(entity) .then((createdEntity) => { // Omit deletedAt and deletedBy result = _.omit(createdEntity.toJSON(), 'deletedAt', 'deletedBy'); @@ -67,7 +67,6 @@ module.exports = [ id: { $ne: result.id }, order: { $gte: result.order }, }, - transaction: tx, }); }), ) diff --git a/src/routes/milestones/create.js b/src/routes/milestones/create.js index eadec1f4..e7a713e7 100644 --- a/src/routes/milestones/create.js +++ b/src/routes/milestones/create.js @@ -73,9 +73,9 @@ module.exports = [ return next(apiErr); } - return models.sequelize.transaction(tx => + return models.sequelize.transaction(() => // Save to DB - models.Milestone.create(entity, { transaction: tx }) + models.Milestone.create(entity) .then((createdEntity) => { // Omit deletedAt, deletedBy result = _.omit(createdEntity.toJSON(), 'deletedAt', 'deletedBy'); @@ -88,7 +88,6 @@ module.exports = [ id: { $ne: result.id }, order: { $gte: result.order }, }, - transaction: tx, }); }), ) diff --git a/src/routes/milestones/delete.js b/src/routes/milestones/delete.js index 45e5a41b..c2cf2bce 100644 --- a/src/routes/milestones/delete.js +++ b/src/routes/milestones/delete.js @@ -29,11 +29,10 @@ module.exports = [ id: req.params.milestoneId, }; - return models.sequelize.transaction(tx => + return models.sequelize.transaction(() => // Find the milestone models.Milestone.findOne({ where, - transaction: tx, }) .then((milestone) => { // Not found @@ -44,8 +43,8 @@ module.exports = [ } // Update the deletedBy, and soft delete - return milestone.update({ deletedBy: req.authUser.userId }, { transaction: tx }) - .then(() => milestone.destroy({ transaction: tx })); + return milestone.update({ deletedBy: req.authUser.userId }) + .then(() => milestone.destroy()); }), ) .then((deleted) => { diff --git a/src/routes/timelines/create.js b/src/routes/timelines/create.js index a37b7adb..b001f2f4 100644 --- a/src/routes/timelines/create.js +++ b/src/routes/timelines/create.js @@ -51,9 +51,9 @@ module.exports = [ let result; // Save to DB - models.sequelize.transaction((tx) => { + return models.sequelize.transaction(() => { req.log.debug('Started transaction'); - return models.Timeline.create(entity, { transaction: tx }) + return models.Timeline.create(entity) .then((createdEntity) => { // Omit deletedAt, deletedBy result = _.omit(createdEntity.toJSON(), 'deletedAt', 'deletedBy'); @@ -97,7 +97,7 @@ module.exports = [ } return milestone; }); - return models.Milestone.bulkCreate(milestones, { returning: true, transaction: tx }) + return models.Milestone.bulkCreate(milestones, { returning: true }) .then((createdMilestones) => { req.log.debug('Milestones created for timeline with template id %d', templateId); result.milestones = _.map(createdMilestones, cm => _.omit(cm.toJSON(), 'deletedAt', 'deletedBy')); @@ -109,8 +109,7 @@ module.exports = [ }); } return Promise.resolve(); - }) - .catch(next); + }); }) .then(() => { // Send event to bus