Fixing wrong handling of transactions in phaseProduct model.

Author: Vikas Agarwal

src/routes/phaseProducts/create.js

@@ -91,25 +91,27 @@ module.exports = [
         err.status = 400;
         throw err;
       }
-      return models.PhaseProduct.create(data);
-    })
+      return models.PhaseProduct.create(data)
       .then((_newPhaseProduct) => {
         newPhaseProduct = _.cloneDeep(_newPhaseProduct);
         req.log.debug('new phase product created (id# %d, name: %s)',
           newPhaseProduct.id, newPhaseProduct.name);
         newPhaseProduct = newPhaseProduct.get({ plain: true });
         newPhaseProduct = _.omit(newPhaseProduct, ['deletedAt', 'utm']);
+      });
+    }))
+    .then(() => {
+      // Send events to buses
+      req.log.debug('Sending event to RabbitMQ bus for phase product %d', newPhaseProduct.id);
+      req.app.services.pubsub.publish(EVENT.ROUTING_KEY.PROJECT_PHASE_PRODUCT_ADDED,
+        newPhaseProduct,
+        { correlationId: req.id },
+      );
+      req.log.debug('Sending event to Kafka bus for phase product %d', newPhaseProduct.id);
+      req.app.emit(EVENT.ROUTING_KEY.PROJECT_PHASE_PRODUCT_ADDED, { req, created: newPhaseProduct });
 
-        // Send events to buses
-        req.log.debug('Sending event to RabbitMQ bus for phase product %d', newPhaseProduct.id);
-        req.app.services.pubsub.publish(EVENT.ROUTING_KEY.PROJECT_PHASE_PRODUCT_ADDED,
-          newPhaseProduct,
-          { correlationId: req.id },
-        );
-        req.log.debug('Sending event to Kafka bus for phase product %d', newPhaseProduct.id);
-        req.app.emit(EVENT.ROUTING_KEY.PROJECT_PHASE_PRODUCT_ADDED, { req, created: newPhaseProduct });
-
-        res.status(201).json(util.wrapResponse(req.id, newPhaseProduct, 1, 201));
-      })).catch((err) => { next(err); });
+      res.status(201).json(util.wrapResponse(req.id, newPhaseProduct, 1, 201));
+    })
+    .catch((err) => { next(err); });
   },
 ];

src/routes/phaseProducts/delete.js

@@ -36,7 +36,8 @@ module.exports = [
           _.extend(existing, { deletedBy: req.authUser.userId, deletedAt: Date.now() });
           existing.save().then(accept).catch(reject);
         }
-      })).then((deleted) => {
+      })))
+      .then((deleted) => {
         req.log.debug('deleted phase product', JSON.stringify(deleted, null, 2));
 
         // Send events to buses
@@ -48,6 +49,6 @@ module.exports = [
         req.app.emit(EVENT.ROUTING_KEY.PROJECT_PHASE_PRODUCT_REMOVED, { req, deleted });
 
         res.status(204).json({});
-      }).catch(err => next(err)));
+      }).catch(err => next(err));
   },
 ];

src/routes/phaseProducts/update.js

@@ -62,7 +62,8 @@ module.exports = [
         _.extend(existing, updatedProps);
         existing.save().then(accept).catch(reject);
       }
-    })).then((updated) => {
+    })))
+    .then((updated) => {
       req.log.debug('updated phase product', JSON.stringify(updated, null, 2));
 
       const updatedValue = updated.get({ plain: true });
@@ -77,6 +78,6 @@ module.exports = [
         { req, original: previousValue, updated: updatedValue });
 
       res.json(util.wrapResponse(req.id, updated));
-    }).catch(err => next(err)));
+    }).catch(err => next(err));
   },
 ];