use transaction

Author: eisbilir

src/routes/phaseMembers/updateService.js

@@ -7,13 +7,19 @@ import models from '../../models';
  * @param {String} projectId the project id
  * @param {String} phaseId the phase id
  * @param {Array<Number>} newPhaseMembers the array of userIds
+ * @param {Object} _transaction the sequelize transaction (optional)
  * @returns {Array<Number>} the array of updated phase member objects
  */
-async function update(currentUser, projectId, phaseId, newPhaseMembers) {
+async function update(currentUser, projectId, phaseId, newPhaseMembers, _transaction) {
   const createdBy = _.parseInt(currentUser.userId);
   const updatedBy = _.parseInt(currentUser.userId);
   const newMembers = _.uniq(newPhaseMembers);
-  const transaction = await models.sequelize.transaction();
+  let transaction;
+  if (_.isUndefined(_transaction)) {
+    transaction = await models.sequelize.transaction();
+  } else {
+    transaction = _transaction;
+  }
   try {
     const projectMembers = _.map(await models.ProjectMember.getActiveProjectMembers(projectId), 'userId');
     const notProjectMembers = _.difference(newMembers, projectMembers);
@@ -35,10 +41,14 @@ async function update(currentUser, projectId, phaseId, newPhaseMembers) {
       const result = await models.ProjectPhaseMember.bulkCreate(createData, { transaction });
       phaseMembers.push(..._.map(result, item => item.toJSON()));
     }
-    await transaction.commit();
+    if (_.isUndefined(_transaction)) {
+      await transaction.commit();
+    }
     return phaseMembers;
   } catch (err) {
-    await transaction.rollback();
+    if (_.isUndefined(_transaction)) {
+      await transaction.rollback();
+    }
     throw err;
   }
 }

src/routes/phases/create.js

@@ -47,7 +47,7 @@ module.exports = [
     });
 
     let newProjectPhase = null;
-    models.sequelize.transaction(() => {
+    models.sequelize.transaction((transaction) => {
       req.log.debug('Create Phase - Starting transaction');
       return models.Project.findOne({
         where: { id: projectId, deletedAt: { $eq: null } },
@@ -64,7 +64,7 @@ module.exports = [
             throw err;
           }
           return models.ProjectPhase
-            .create(_.omit(data, 'members'))
+            .create(_.omit(data, 'members'), { transaction })
             .then((_newProjectPhase) => {
               newProjectPhase = _.cloneDeep(_newProjectPhase);
               req.log.debug('new project phase created (id# %d, name: %s)',
@@ -88,7 +88,6 @@ module.exports = [
                 err.status = 400;
                 throw err;
               }
-
               // Create the phase product
               return models.PhaseProduct.create({
                 name: productTemplate.name,
@@ -98,7 +97,7 @@ module.exports = [
                 phaseId: newProjectPhase.id,
                 createdBy: req.authUser.userId,
                 updatedBy: req.authUser.userId,
-              })
+              }, { transaction })
                 .then((phaseProduct) => {
                   newProjectPhase.products = [
                     _.omit(phaseProduct.toJSON(), ['deletedAt', 'deletedBy']),
@@ -112,7 +111,7 @@ module.exports = [
             return Promise.resolve();
           }
 
-          return updatePhaseMemberService(req.authUser, projectId, newProjectPhase.id, data.members)
+          return updatePhaseMemberService(req.authUser, projectId, newProjectPhase.id, data.members, transaction)
             .then(members => _.assign(newProjectPhase, { members }));
         });
     })

src/routes/phases/delete.js

@@ -16,7 +16,7 @@ module.exports = [
     const projectId = _.parseInt(req.params.projectId);
     const phaseId = _.parseInt(req.params.phaseId);
 
-    models.sequelize.transaction(() =>
+    models.sequelize.transaction(transaction =>
       // soft delete the record
       models.ProjectPhase.findOne({
         where: {
@@ -32,9 +32,9 @@ module.exports = [
           err.status = 404;
           return Promise.reject(err);
         }
-        return existing.update({ deletedBy: req.authUser.userId });
+        return existing.update({ deletedBy: req.authUser.userId }, { transaction });
       })
-        .then(entity => entity.destroy()))
+        .then(entity => entity.destroy({ transaction })))
       .then((deleted) => {
         req.log.debug('deleted project phase', JSON.stringify(deleted, null, 2));
 

src/routes/phases/update.js

@@ -45,7 +45,7 @@ module.exports = [
     let previousValue;
     let updated;
 
-    models.sequelize.transaction(() => models.ProjectPhase.findOne({
+    models.sequelize.transaction(transaction => models.ProjectPhase.findOne({
       where: {
         id: phaseId,
         projectId,
@@ -82,7 +82,7 @@ module.exports = [
           reject(err);
         } else {
           _.extend(existing, _.omit(updatedProps, 'members'));
-          existing.save().then(accept).catch(reject);
+          existing.save({ transaction }).then(accept).catch(reject);
         }
       }
     }))
@@ -94,7 +94,7 @@ module.exports = [
           return Promise.resolve();
         }
 
-        return updatePhaseMemberService(req.authUser, projectId, phaseId, updatedProps.members)
+        return updatePhaseMemberService(req.authUser, projectId, phaseId, updatedProps.members, transaction)
           .then(members => _.assign(updated, { members }));
       }),
     )