feat: removed phase order cascading updates

maxceem · maxceem · commit c5a01ed880a5 · 2020-10-20T14:12:40.000+03:00
diff --git a/src/routes/phases/create.js b/src/routes/phases/create.js
@@ -1,7 +1,6 @@
 import validate from 'express-validation';
 import _ from 'lodash';
 import Joi from 'joi';
-import Sequelize from 'sequelize';
 
 import models from '../../models';
 import util from '../../util';
@@ -45,7 +44,6 @@ module.exports = [
     });
 
     let newProjectPhase = null;
-    let otherUpdated = null;
     models.sequelize.transaction(() => {
       req.log.debug('Create Phase - Starting transaction');
       return models.Project.findOne({
@@ -73,39 +71,8 @@ module.exports = [
               newProjectPhase = _.omit(newProjectPhase, ['deletedAt', 'deletedBy', 'utm']);
             });
         })
+        // create product if `productTemplateId` is defined
         .then(() => {
-          req.log.debug('re-ordering the other phases');
-
-          if (_.isNil(newProjectPhase.order)) {
-            return Promise.resolve();
-          }
-
-          // Increase the order of the other phases in the same project,
-          // which have `order` >= this phase order
-          return models.ProjectPhase.update({ order: Sequelize.literal('"order" + 1') }, {
-            where: {
-              projectId,
-              id: { $ne: newProjectPhase.id },
-              order: { $gte: newProjectPhase.order },
-            },
-          });
-        })
-        .then((updatedCount) => {
-          if (updatedCount) {
-            return models.ProjectPhase.findAll({
-              where: {
-                projectId,
-                id: { $ne: newProjectPhase.id },
-                order: { $gte: newProjectPhase.order },
-              },
-              order: [['updatedAt', 'DESC']],
-              limit: updatedCount[0],
-            });
-          }
-          return Promise.resolve();
-        })
-        .then((_otherUpdated) => {
-          otherUpdated = _otherUpdated || [];
           if (_.isNil(data.productTemplateId)) {
             return Promise.resolve();
           }
@@ -144,20 +111,6 @@ module.exports = [
           RESOURCES.PHASE,
           newProjectPhase);
 
-        // send updated event for all other phases which have been cascading updated
-        _.map(otherUpdated, phase =>
-          util.sendResourceToKafkaBus(
-            req,
-            EVENT.ROUTING_KEY.PROJECT_PHASE_UPDATED,
-            RESOURCES.PHASE,
-            _.assign(_.pick(phase.toJSON(), 'id', 'order', 'updatedBy', 'updatedAt')),
-            // Pass the same object as original phase even though, the order has changed.
-            // So far we don't use the order so it's ok. But in general, we should pass
-            // the original phases. <- TODO
-            _.assign(_.pick(phase.toJSON(), 'id', 'order', 'updatedBy', 'updatedAt'))),
-        true, // don't send event to Notification Service as the main event here is updating one phase
-        );
-
         res.status(201).json(newProjectPhase);
       })
       .catch((err) => {
diff --git a/src/routes/phases/create.spec.js b/src/routes/phases/create.spec.js
@@ -279,49 +279,6 @@ describe('Project Phases', () => {
         });
     });
 
-    it('should return 201 if payload has order specified', (done) => {
-      request(server)
-        .post(`/v5/projects/${projectId}/phases/`)
-        .set({
-          Authorization: `Bearer ${testUtil.jwts.copilot}`,
-        })
-        .send(_.assign({ order: 1 }, body))
-        .expect('Content-Type', /json/)
-        .expect(201)
-        .end((err, res) => {
-          if (err) {
-            done(err);
-          } else {
-            const resJson = res.body;
-            validatePhase(resJson, body);
-            resJson.order.should.be.eql(1);
-
-            const firstPhaseId = resJson.id;
-
-            // Create second phase
-            request(server)
-              .post(`/v5/projects/${projectId}/phases/`)
-              .set({
-                Authorization: `Bearer ${testUtil.jwts.copilot}`,
-              })
-              .send(_.assign({ order: 1 }, body))
-              .expect('Content-Type', /json/)
-              .expect(201)
-              .end((err2, res2) => {
-                const resJson2 = res2.body;
-                validatePhase(resJson2, body);
-                resJson2.order.should.be.eql(1);
-
-                models.ProjectPhase.findOne({ where: { id: firstPhaseId } })
-                  .then((firstPhase) => {
-                    firstPhase.order.should.be.eql(2);
-                    done();
-                  });
-              });
-          }
-        });
-    });
-
     it('should return 201 if payload has productTemplateId specified', (done) => {
       request(server)
         .post(`/v5/projects/${projectId}/phases/`)
@@ -336,6 +293,7 @@ describe('Project Phases', () => {
             done(err);
           } else {
             const resJson = res.body;
+            console.log(resJson);
             validatePhase(resJson, body);
             resJson.products.should.have.length(1);
 
diff --git a/src/routes/phases/update.js b/src/routes/phases/update.js
@@ -2,7 +2,6 @@
 import validate from 'express-validation';
 import _ from 'lodash';
 import Joi from 'joi';
-import Sequelize from 'sequelize';
 import { middleware as tcMiddleware } from 'tc-core-library-js';
 import models from '../../models';
 import util from '../../util';
@@ -88,80 +87,9 @@ module.exports = [
     }))
       .then((updatedPhase) => {
         updated = updatedPhase;
-
-        // Ignore re-ordering if there's no order specified for this phase
-        if (_.isNil(updated.order)) {
-          return Promise.resolve();
-        }
-
-        // Update order of the other phases only if the order was changed
-        if (previousValue.order === updated.order) {
-          return Promise.resolve();
-        }
-
-        return models.ProjectPhase.count({
-          where: {
-            projectId,
-            id: { $ne: updated.id },
-            order: updated.order,
-          },
-        })
-          .then((count) => {
-            if (count === 0) {
-              return Promise.resolve();
-            }
-
-            // Increase the order from M to K: if there is an item with order K,
-            // orders from M+1 to K should be made M to K-1
-            if (!_.isNil(previousValue.order) && previousValue.order < updated.order) {
-              return models.ProjectPhase.update({ order: Sequelize.literal('"order" - 1') }, {
-                where: {
-                  projectId,
-                  id: { $ne: updated.id },
-                  order: { $between: [previousValue.order + 1, updated.order] },
-                },
-              });
-            }
-
-            // Decrease the order from M to K: if there is an item with order K,
-            // orders from K to M-1 should be made K+1 to M
-            return models.ProjectPhase.update({ order: Sequelize.literal('"order" + 1') }, {
-              where: {
-                projectId,
-                id: { $ne: updated.id },
-                order: {
-                  $between: [
-                    updated.order,
-                    (previousValue.order ? previousValue.order : Number.MAX_SAFE_INTEGER) - 1,
-                  ],
-                },
-              },
-            });
-          });
       }),
     )
-      .then((updatedCount) => {
-        if (updatedCount) {
-          return models.ProjectPhase.findAll({
-            where: {
-              projectId,
-              id: { $ne: updated.id },
-              order: {
-                $between: !_.isNil(previousValue.order) && previousValue.order < updated.order
-                  ? [previousValue.order + 1, updated.order]
-                  : [
-                    updated.order,
-                    (previousValue.order ? previousValue.order : Number.MAX_SAFE_INTEGER) - 1,
-                  ],
-              },
-            },
-            order: [['updatedAt', 'DESC']],
-            limit: updatedCount[0],
-          });
-        }
-        return Promise.resolve([]);
-      })
-      .then((otherUpdated) => {
+      .then(() => {
         req.log.debug('updated project phase', JSON.stringify(updated, null, 2));
 
         const updatedValue = updated.get({ plain: true });
@@ -175,20 +103,6 @@ module.exports = [
           previousValue,
           ROUTES.PHASES.UPDATE);
 
-        // send updated event for all other phases which have been cascading updated
-        _.map(otherUpdated, phase =>
-          util.sendResourceToKafkaBus(
-            req,
-            EVENT.ROUTING_KEY.PROJECT_PHASE_UPDATED,
-            RESOURCES.PHASE,
-            _.assign(_.pick(phase.toJSON(), 'id', 'order', 'updatedBy', 'updatedAt')),
-            // Pass the same object as original phase even though, the order has changed.
-            // So far we don't use the order so it's ok. But in general, we should pass
-            // the original phases. <- TODO
-            _.assign(_.pick(phase.toJSON(), 'id', 'order', 'updatedBy', 'updatedAt'))),
-        true, // don't send event to Notification Service as the main event here is updating one phase
-        );
-
         res.json(updated);
       })
       .catch(err => next(err));
diff --git a/src/routes/phases/update.spec.js b/src/routes/phases/update.spec.js
@@ -60,7 +60,6 @@ describe('Project Phases', () => {
   let projectId;
   let projectName;
   let phaseId;
-  let phaseId2;
   let phaseId3;
   const memberUser = {
     handle: testUtil.getDecodedToken(testUtil.jwts.member).handle,
@@ -122,7 +121,6 @@ describe('Project Phases', () => {
             models.ProjectPhase.bulkCreate(phases, { returning: true })
               .then((createdPhases) => {
                 phaseId = createdPhases[0].id;
-                phaseId2 = createdPhases[1].id;
                 phaseId3 = createdPhases[2].id;
 
                 done();
@@ -252,33 +250,6 @@ describe('Project Phases', () => {
         });
     });
 
-    it('should return updated phase if the order is specified', (done) => {
-      request(server)
-        .patch(`/v5/projects/${projectId}/phases/${phaseId}`)
-        .set({
-          Authorization: `Bearer ${testUtil.jwts.copilot}`,
-        })
-        .send(_.assign({ order: 1 }, updateBody))
-        .expect('Content-Type', /json/)
-        .expect(200)
-        .end((err, res) => {
-          if (err) {
-            done(err);
-          } else {
-            const resJson = res.body;
-            validatePhase(resJson, updateBody);
-            resJson.order.should.be.eql(1);
-
-            // Check the order of the other phase
-            models.ProjectPhase.findOne({ where: { id: phaseId2 } })
-              .then((phase2) => {
-                phase2.order.should.be.eql(2);
-                done();
-              });
-          }
-        });
-    });
-
     it('should return 200 if requested by admin', (done) => {
       request(server)
         .patch(`/v5/projects/${projectId}/phases/${phaseId}`)
