Merge pull request #380 from topcoder-platform/feature/update_timeline_in_ES_milestones_cascade

Fix: update timeline in es milestones cascade

Author: vikasrohit

src/events/milestones/index.js

@@ -82,35 +82,14 @@ const milestoneUpdatedHandler = Promise.coroutine(function* (logger, msg, channe
       });
     }
 
-    // if (data.original.order !== data.updated.order) {
-    //   const milestoneWithSameOrder =
-    //     _.find(milestones, milestone => milestone.id !== data.updated.id && milestone.order === data.updated.order);
-    //   if (milestoneWithSameOrder) {
-    //     // 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 (data.original.order < data.updated.order) {
-    //       _.each(milestones, (single) => {
-    //         if (single.id !== data.updated.id
-    //           && (data.original.order + 1) <= single.order
-    //           && single.order <= data.updated.order) {
-    //           single.order -= 1; // eslint-disable-line no-param-reassign
-    //         }
-    //       });
-    //     } else {
-    //       // 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
-    //       _.each(milestones, (single) => {
-    //         if (single.id !== data.updated.id
-    //           && data.updated.order <= single.order
-    //           && single.order <= (data.original.order - 1)) {
-    //           single.order += 1; // eslint-disable-line no-param-reassign
-    //         }
-    //       });
-    //     }
-    //   }
-    // }
+    let updatedTimeline = doc._source; // eslint-disable-line no-underscore-dangle
+    // if timeline has been modified during milestones updates
+    if (data.cascadedUpdates && data.cascadedUpdates.timeline && data.cascadedUpdates.timeline.updated) {
+      // merge updated timeline with the object in ES index, the same way as we do when updating timeline in ES using timeline endpoints
+      updatedTimeline = _.merge(doc._source, data.cascadedUpdates.timeline.updated);  // eslint-disable-line no-underscore-dangle
+    }
 
-    const merged = _.assign(doc._source, { milestones }); // eslint-disable-line no-underscore-dangle
+    const merged = _.assign(updatedTimeline, { milestones });
     yield eClient.update({
       index: ES_TIMELINE_INDEX,
       type: ES_TIMELINE_TYPE,