@outliant/sunrise-utils 1.1.8 → 1.1.9

package/CHANGELOG.md

@@ -4,13 +4,22 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.1.9](https://github.com/outliant/sunrise-utils/compare/1.1.8...1.1.9)
+
+- Task/task new columns #85ztbmnkf [`#14`](https://github.com/outliant/sunrise-utils/pull/14)
+- chore: add filter for days to complete [`f2fdf97`](https://github.com/outliant/sunrise-utils/commit/f2fdf977c6b5c5f22c17b3fffb7a6a2024a3c38c)
+- chore: add test [`847deb3`](https://github.com/outliant/sunrise-utils/commit/847deb3d2eebba343b865bb69cb6dc642096160d)
+- chore: fix test [`ad49d34`](https://github.com/outliant/sunrise-utils/commit/ad49d3451ff523426672528f42f65f77f2d05c5f)
+
 #### [1.1.8](https://github.com/outliant/sunrise-utils/compare/1.1.7...1.1.8)
 
+> 29 September 2023
+
 - chore: use split string helper [`#13`](https://github.com/outliant/sunrise-utils/pull/13)
 - chore: update logic for user pipeline [`#12`](https://github.com/outliant/sunrise-utils/pull/12)
+- chore(release): 1.1.8 [`aa38c1a`](https://github.com/outliant/sunrise-utils/commit/aa38c1abac2d22fddb329fc18e071881b15837b3)
 - chore: update users pipeline [`c0de2e6`](https://github.com/outliant/sunrise-utils/commit/c0de2e6bbacbeb1b8b96597473679f7f2424880e)
 - chore: fix unit test [`84b880d`](https://github.com/outliant/sunrise-utils/commit/84b880d39497aa03257869702ecd0aa9f05b1d77)
-- chore: fix test [`d7e1659`](https://github.com/outliant/sunrise-utils/commit/d7e1659d478e1787153deb0c6db79ebdf3105263)
 
 #### [1.1.7](https://github.com/outliant/sunrise-utils/compare/1.1.6...1.1.7)
 

package/helpers/sortScript.js

@@ -210,7 +210,7 @@ module.exports.criticalPathStage = (order) => {
           if (stageIndex != null) {
             return stageIndex;
           }
-          
+
           return 9999999;
         } catch (Exception err) {
           return 9999999;
@@ -318,6 +318,39 @@ module.exports.projectFieldNumeric = (order, value) => {
   };
 };
 
+module.exports.daysToComplete = (order) => {
+  return {
+    _script: {
+      type: 'number',
+      script: {
+        lang: 'painless',
+        source: `
+          try {
+            def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;
+            def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;
+
+            if (isEmptyReadyAt || isEmptyCompletedAt) {
+              return -999999;
+            }
+
+            def readyAt = doc['ready_at'].value.toInstant().toEpochMilli();
+            def completedAt = doc['completed_at'].value.toInstant().toEpochMilli();
+
+            if (readyAt == null || completedAt == null) {
+              return -999999;
+            }
+
+            return completedAt - readyAt;
+          } catch (Exception err) {
+            return -999999;
+          }
+        `
+      },
+      order
+    }
+  };
+};
+
 module.exports.projectFieldText = (order, value) => {
   return {
     _script: {

package/helpers/taskFilter/daysToComplete.js

@@ -0,0 +1,220 @@
+const _ = require('lodash');
+
+const commonOperatorTemplate = (conditionCallback) => {
+  const condition = conditionCallback({
+    daysToComplete: 'daysToComplete',
+    value: 'params.value',
+    secondValue: 'params.second_value'
+  });
+
+  return `
+    try {
+      def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;
+      def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;
+
+      if (isEmptyReadyAt || isEmptyCompletedAt) {
+        return false;
+      }
+
+      def readyAt = doc['ready_at'].value.toInstant().toEpochMilli();
+      def completedAt = doc['completed_at'].value.toInstant().toEpochMilli();
+
+      if (readyAt == null || completedAt == null) {
+        return false;
+      }
+
+      def daysToComplete = (completedAt - readyAt) / (1000 * 3600 * 24);
+
+      return ${condition}
+    } catch (Exception err) {
+      return false;
+    }
+  `;
+};
+
+module.exports = (filter) => {
+  filter.value = _.parseInt(filter.value);
+  filter.second_value = _.parseInt(filter.second_value);
+
+  switch (filter.condition) {
+    case 'is_equal':
+      return module.exports.isEqual(filter);
+    case 'not_equal':
+      return module.exports.isNotEqual(filter);
+    case 'less_than':
+      return module.exports.lessThan(filter);
+    case 'less_than_or_equal':
+      return module.exports.lessThanOrEqual(filter);
+    case 'greater_than':
+      return module.exports.greaterThan(filter);
+    case 'greater_than_or_equal':
+      return module.exports.greaterThanOrEqual(filter);
+    case 'between':
+      return module.exports.between(filter);
+    case 'is_empty':
+      return module.exports.isEmpty(filter);
+    case 'is_not_empty':
+      return module.exports.isNotEmpty(filter);
+    default:
+      return null;
+  }
+};
+
+module.exports.isEqual = (filter) => {
+  return {
+    script: {
+      script: {
+        source: commonOperatorTemplate(({ daysToComplete, value }) => {
+          return `${daysToComplete} == ${value}`;
+        }),
+        lang: "painless",
+        params: {
+          value: filter.value,
+        }
+      }
+    }
+  };
+
+};
+
+module.exports.isNotEqual = (filter) => {
+  return {
+    script: {
+      script: {
+        source: commonOperatorTemplate(({ daysToComplete, value }) => {
+          return `${daysToComplete} != ${value}`;
+        }),
+        lang: "painless",
+        params: {
+          value: filter.value,
+        }
+      }
+    }
+  };
+
+};
+
+module.exports.greaterThan = (filter) => {
+  return {
+    script: {
+      script: {
+        source: commonOperatorTemplate(({ daysToComplete, value }) => {
+          return `${daysToComplete} > ${value}`;
+        }),
+        lang: "painless",
+        params: {
+          value: filter.value,
+        }
+      }
+    }
+  };
+};
+
+module.exports.greaterThanOrEqual = (filter) => {
+  return {
+    script: {
+      script: {
+        source: commonOperatorTemplate(({ daysToComplete, value }) => {
+          return `${daysToComplete} >= ${value}`;
+        }),
+        lang: "painless",
+        params: {
+          value: filter.value,
+        }
+      }
+    }
+  };
+};
+
+module.exports.lessThan = (filter) => {
+  return {
+    script: {
+      script: {
+        source: commonOperatorTemplate(({ daysToComplete, value }) => {
+          return `${daysToComplete} < ${value}`;
+        }),
+        lang: "painless",
+        params: {
+          value: filter.value,
+        }
+      }
+    }
+  };
+};
+
+module.exports.lessThanOrEqual = (filter) => {
+  return {
+    script: {
+      script: {
+        source: commonOperatorTemplate(({ daysToComplete, value }) => {
+          return `${daysToComplete} <= ${value}`;
+        }),
+        lang: "painless",
+        params: {
+          value: filter.value,
+          second_value: filter.second_value
+        }
+      }
+    }
+  };
+};
+
+module.exports.between = (filter) => {
+  return {
+    script: {
+      script: {
+        source: commonOperatorTemplate(({ daysToComplete, value, secondValue }) => {
+          return `
+            ${daysToComplete} >= ${value} &&
+            ${daysToComplete} <= ${secondValue}
+          `;
+        }),
+        lang: "painless",
+        params: {
+          value: filter.value,
+          second_value: filter.second_value
+        }
+      }
+    }
+  };
+};
+
+module.exports.isEmpty = () => {
+  return {
+    script: {
+      script: {
+        source: `
+          try {
+            def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;
+            def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;
+
+            return isEmptyReadyAt || isEmptyCompletedAt;
+          } catch (Exception err) {
+            return false;
+          }
+        `,
+        lang: "painless"
+      }
+    }
+  };
+};
+
+module.exports.isNotEmpty = () => {
+  return {
+    script: {
+      script: {
+        source: `
+          try {
+            def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;
+            def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;
+
+            return !isEmptyReadyAt && !isEmptyCompletedAt;
+          } catch (Exception err) {
+            return false;
+          }
+        `,
+        lang: "painless"
+      }
+    }
+  };
+};

package/helpers/taskFilter/index.js

@@ -5,6 +5,7 @@ const buildRegionFilter = require('./regionFilter');
 const buildTaskFieldFilter = require('./taskFieldFilter');
 const buildCriticalPathFilter = require('./criticalPathFilter');
 const buildOnHoldFilter = require('./onHoldFilter');
+const buildDaysToCompleteFilter = require('./daysToComplete');
 const buildAgeColorFilter = require('./buildAgeColorFilter');
 const buildProjectFieldFilter = require('../projectFilter/projectFieldFilter');
 const { PROJECT_BANNERS } = require('../../constants');
@@ -66,6 +67,18 @@ module.exports.defaultCustomColumns = [
     type: 'ready_at',
     field_type: 'date'
   },
+  {
+    name: 'Days to Complete',
+    value: 'days_to_complete',
+    type: 'days_to_complete',
+    field_type: 'number'
+  },
+  {
+    name: 'Pending Date',
+    value: 'pending_date',
+    type: 'pending_date',
+    field_type: 'date'
+  },
   {
     name: 'Project ID',
     value: 'project_id',
@@ -222,11 +235,18 @@ module.exports.buildTaskPipelineFilter = (filter) => {
       return buildCriticalPathFilter(filter);
     case 'on_hold':
       return buildOnHoldFilter(filter);
+    case 'days_to_complete':
+      return buildDaysToCompleteFilter(filter);
     // Always expected as is_equal condition
     case 'path_age':
       return buildPathAgeFilter(filter);
     case 'task_age':
       return buildAgeColorFilter(filter);
+    case 'pending_date':
+      return buildTaskFieldFilter({
+        ...filter,
+        type: 'ready_at'
+      });
     // Always expected as is_equal condition with array of task template ids
     case 'task_templates':
       let value = filter.value;

package/lib/taskPipeline.js

@@ -98,30 +98,61 @@ class TaskPipeline {
     } else {
       sortByMultiple.forEach((s, i) => {
         const sort = sortMultiple[i] || 'desc';
-        if (s === 'region') {
-          taskPipelinesSort.push(sortScript.region(sort));
-        } else if (s === 'owner' || s === 'completed_by') {
-          taskPipelinesSort.push(sortScript.owner(sort));
-        } else if (s === 'status') {
-          taskPipelinesSort.push(sortScript.status(sort));
-        } else if (s === 'critical_path_stage') {
-          taskPipelinesSort.push(sortScript.criticalPathStage(sort));
-        } else if (s === 'project_id') {
-          // Sort numeric part of the Project ID
-          taskPipelinesSort.push(sortScript.projectId(sort));
-        } else if (s === 'ready_at') {
-          taskPipelinesSort.push(sortScript.readyAt(sort));
-        } else if (s === 'was_marked_incomplete') {
-          taskPipelinesSort.push(sortScript.wasMarkedIncomplete(sort));
-        } else if (s === 'last_comment_date') {
-          taskPipelinesSort.push(sortScript.lastCommentDate(sort));
-        } else if (isUuid(s)) {
-          taskPipelinesSort.push(sortScript.projectFieldNumeric(sort, s));
-          taskPipelinesSort.push(sortScript.projectFieldText(sort, s));
-        } else {
-          taskPipelinesSort.push({
-            [s]: { order: sort, missing: '_last' }
-          });
+
+        switch (true) {
+          case s === 'region':
+            taskPipelinesSort.push(sortScript.region(sort));
+            break;
+
+          case s === 'owner' :
+          case s === 'completed_by' :
+            taskPipelinesSort.push(sortScript.owner(sort));
+            break;
+
+          case s === 'status':
+            taskPipelinesSort.push(sortScript.status(sort));
+            break;
+
+          case s === 'critical_path_stage':
+            taskPipelinesSort.push(sortScript.criticalPathStage(sort));
+            break;
+
+          case s === 'project_id':
+            taskPipelinesSort.push(sortScript.projectId(sort));
+            break;
+
+          case s === 'ready_at':
+            taskPipelinesSort.push(sortScript.readyAt(sort));
+            break;
+
+          case s === 'pending_date':
+            taskPipelinesSort.push({
+              ready_at: { order: sort, missing: '_last' }
+            });
+            break;
+
+          case s === 'days_to_complete':
+            taskPipelinesSort.push(sortScript.daysToComplete(sort));
+            break;
+
+          case s === 'was_marked_incomplete':
+            taskPipelinesSort.push(sortScript.wasMarkedIncomplete(sort));
+            break;
+
+          case s === 'last_comment_date':
+            taskPipelinesSort.push(sortScript.lastCommentDate(sort));
+            break;
+
+          case isUuid(s):
+            taskPipelinesSort.push(sortScript.projectFieldNumeric(sort, s));
+            taskPipelinesSort.push(sortScript.projectFieldText(sort, s));
+            break;
+
+          default:
+            taskPipelinesSort.push({
+              [s]: { order: sort, missing: '_last' }
+            });
+            break;
         }
       });
     }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@outliant/sunrise-utils",
   "description": "Helper functions for project Sunrise",
-  "version": "1.1.8",
+  "version": "1.1.9",
   "license": "ISC",
   "author": "Outliant",
   "main": "index.js",

package/test/helpers/taskFilter/daysToComplete.spec.js

@@ -0,0 +1,160 @@
+'use strict';
+
+/* eslint-env node, mocha */
+const { expect } = require('chai');
+
+// To test
+const daysToComplete = require('../../../helpers/taskFilter/daysToComplete');
+
+describe('taskFilter/daysToComplete', function () {
+  const commonInput = {
+    field_id: '',
+    type: 'days_to_complete',
+    field_type: 'number',
+    value: 1,
+    second_value: 5
+  };
+
+  const filters = [
+    {
+      input: {
+        ...commonInput,
+        condition: 'not_equal'
+      },
+      expected: {
+        script: {
+          script: {
+            source: "\n    try {\n      def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;\n      def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;\n\n      if (isEmptyReadyAt || isEmptyCompletedAt) {\n        return false;\n      }\n\n      def readyAt = doc['ready_at'].value.toInstant().toEpochMilli();\n      def completedAt = doc['completed_at'].value.toInstant().toEpochMilli();\n\n      if (readyAt == null || completedAt == null) {\n        return false;\n      }\n\n      def daysToComplete = (completedAt - readyAt) / (1000 * 3600 * 24);\n\n      return daysToComplete != params.value\n    } catch (Exception err) {\n      return false;\n    }\n  ",
+            lang: "painless",
+            params: {
+              value: 1
+            }
+          }
+        }
+      }
+    },
+    {
+      input: {
+        ...commonInput,
+        condition: 'less_than'
+      },
+      expected: {
+        script: {
+          script: {
+            source: "\n    try {\n      def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;\n      def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;\n\n      if (isEmptyReadyAt || isEmptyCompletedAt) {\n        return false;\n      }\n\n      def readyAt = doc['ready_at'].value.toInstant().toEpochMilli();\n      def completedAt = doc['completed_at'].value.toInstant().toEpochMilli();\n\n      if (readyAt == null || completedAt == null) {\n        return false;\n      }\n\n      def daysToComplete = (completedAt - readyAt) / (1000 * 3600 * 24);\n\n      return daysToComplete < params.value\n    } catch (Exception err) {\n      return false;\n    }\n  ",
+            lang: "painless",
+            params: {
+              value: 1
+            }
+          }
+        }
+      }
+    },
+    {
+      input: {
+        ...commonInput,
+        condition: 'less_than_or_equal'
+      },
+      expected: {
+        script: {
+          script: {
+            source: "\n    try {\n      def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;\n      def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;\n\n      if (isEmptyReadyAt || isEmptyCompletedAt) {\n        return false;\n      }\n\n      def readyAt = doc['ready_at'].value.toInstant().toEpochMilli();\n      def completedAt = doc['completed_at'].value.toInstant().toEpochMilli();\n\n      if (readyAt == null || completedAt == null) {\n        return false;\n      }\n\n      def daysToComplete = (completedAt - readyAt) / (1000 * 3600 * 24);\n\n      return daysToComplete <= params.value\n    } catch (Exception err) {\n      return false;\n    }\n  ",
+            lang: "painless",
+            params: {
+              value: 1,
+              second_value: 5
+            }
+          }
+        }
+      }
+    },
+    {
+      input: {
+        ...commonInput,
+        condition: 'greater_than'
+      },
+      expected: {
+        script: {
+          script: {
+            source: "\n    try {\n      def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;\n      def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;\n\n      if (isEmptyReadyAt || isEmptyCompletedAt) {\n        return false;\n      }\n\n      def readyAt = doc['ready_at'].value.toInstant().toEpochMilli();\n      def completedAt = doc['completed_at'].value.toInstant().toEpochMilli();\n\n      if (readyAt == null || completedAt == null) {\n        return false;\n      }\n\n      def daysToComplete = (completedAt - readyAt) / (1000 * 3600 * 24);\n\n      return daysToComplete > params.value\n    } catch (Exception err) {\n      return false;\n    }\n  ",
+            lang: "painless",
+            params: {
+              value: 1
+            }
+          }
+        }
+      }
+    },
+    {
+      input: {
+        ...commonInput,
+        condition: 'greater_than_or_equal'
+      },
+      expected: {
+        script: {
+          script: {
+            source: "\n    try {\n      def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;\n      def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;\n\n      if (isEmptyReadyAt || isEmptyCompletedAt) {\n        return false;\n      }\n\n      def readyAt = doc['ready_at'].value.toInstant().toEpochMilli();\n      def completedAt = doc['completed_at'].value.toInstant().toEpochMilli();\n\n      if (readyAt == null || completedAt == null) {\n        return false;\n      }\n\n      def daysToComplete = (completedAt - readyAt) / (1000 * 3600 * 24);\n\n      return daysToComplete >= params.value\n    } catch (Exception err) {\n      return false;\n    }\n  ",
+            lang: "painless",
+            params: {
+              value: 1
+            }
+          }
+        }
+      }
+    },
+    {
+      input: {
+        ...commonInput,
+        condition: 'between'
+      },
+      expected: {
+        script: {
+          script: {
+            source: "\n    try {\n      def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;\n      def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;\n\n      if (isEmptyReadyAt || isEmptyCompletedAt) {\n        return false;\n      }\n\n      def readyAt = doc['ready_at'].value.toInstant().toEpochMilli();\n      def completedAt = doc['completed_at'].value.toInstant().toEpochMilli();\n\n      if (readyAt == null || completedAt == null) {\n        return false;\n      }\n\n      def daysToComplete = (completedAt - readyAt) / (1000 * 3600 * 24);\n\n      return \n            daysToComplete >= params.value &&\n            daysToComplete <= params.second_value\n          \n    } catch (Exception err) {\n      return false;\n    }\n  ",
+            lang: "painless",
+            params: {
+              value: 1,
+              second_value: 5
+            }
+          }
+        }
+      }
+    },
+    {
+      input: {
+        ...commonInput,
+        condition: 'is_empty'
+      },
+      expected: {
+        script: {
+          script: {
+            source: "\n          try {\n            def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;\n            def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;\n\n            return isEmptyReadyAt || isEmptyCompletedAt;\n          } catch (Exception err) {\n            return false;\n          }\n        ",
+            lang: "painless"
+          }
+        }
+      }
+    },
+    {
+      input: {
+        ...commonInput,
+        condition: 'is_not_empty'
+      },
+      expected: {
+        script: {
+          script: {
+            source: "\n          try {\n            def isEmptyReadyAt = doc.containsKey('ready_at') && doc['ready_at'].empty;\n            def isEmptyCompletedAt = doc.containsKey('completed_at') && doc['completed_at'].empty;\n\n            return !isEmptyReadyAt && !isEmptyCompletedAt;\n          } catch (Exception err) {\n            return false;\n          }\n        ",
+            lang: "painless"
+          }
+        }
+      }
+    }
+  ];
+
+  filters.forEach((filter) => {
+    it(filter.input.condition, (done) => {
+      expect(daysToComplete(filter.input)).to.deep.equal(filter.expected);
+
+      done();
+    });
+  });
+});

package/test/lib/taskPipeline.spec.js

@@ -257,123 +257,136 @@ describe('taskPipeline', function () {
           }
         ]
       );
+
       expect(sort).to.deep.equal([
         {
           _script: {
-            type: 'number',
+            type: "number",
             script: {
-              lang: 'painless',
-              source:
-                '\n              if (params.starredTaskIds.contains(doc._id.value)) {\n                return 1;\n              } else {\n                return 0;\n              }\n            ',
-              params: { starredTaskIds: ['task-1', 'task-2'] }
+              lang: "painless",
+              source: "\n              if (params.starredTaskIds.contains(doc._id.value)) {\n                return 1;\n              } else {\n                return 0;\n              }\n            ",
+              params: {
+                starredTaskIds: [
+                  "task-1",
+                  "task-2"
+                ]
+              }
             },
-            order: 'desc'
+            order: "desc"
+          }
+        },
+        {
+          region_name: {
+            order: "asc"
           }
         },
-        { region_name: { order: 'asc' } },
         {
           _script: {
-            type: 'string',
+            type: "string",
             script: {
-              lang: 'painless',
-              source:
-                "\n        try {\n          String owner = doc['owner'].value;\n\n          if (owner != '' && owner != null) {\n            return owner.toLowerCase();\n          }\n        } catch (Exception err) {}\n\n        return '';\n      "
+              lang: "painless",
+              source: "\n        try {\n          String owner = doc['owner'].value;\n\n          if (owner != '' && owner != null) {\n            return owner.toLowerCase();\n          }\n        } catch (Exception err) {}\n\n        return '';\n      "
             },
-            order: 'asc'
+            order: "asc"
           }
         },
         {
           _script: {
-            type: 'string',
+            type: "string",
             script: {
-              lang: 'painless',
-              source:
-                "\n        try {\n          String owner = doc['owner'].value;\n\n          if (owner != '' && owner != null) {\n            return owner.toLowerCase();\n          }\n        } catch (Exception err) {}\n\n        return '';\n      "
+              lang: "painless",
+              source: "\n        try {\n          String owner = doc['owner'].value;\n\n          if (owner != '' && owner != null) {\n            return owner.toLowerCase();\n          }\n        } catch (Exception err) {}\n\n        return '';\n      "
             },
-            order: 'asc'
+            order: "asc"
           }
         },
         {
           _script: {
-            type: 'string',
+            type: "string",
             script: {
-              lang: 'painless',
-              source:
-                "\n        try {\n          boolean isReady = doc['is_ready'].value;\n          boolean isComplete = doc['is_complete'].value;\n\n          if (isReady == true) {\n            if (isComplete == true) {\n              return 'completed';\n            }\n\n            return 'pending';\n          }\n\n          return 'new';\n        } catch (Exception err) {\n          return '';\n        }\n      "
+              lang: "painless",
+              source: "\n        try {\n          boolean isReady = doc['is_ready'].value;\n          boolean isComplete = doc['is_complete'].value;\n\n          if (isReady == true) {\n            if (isComplete == true) {\n              return 'completed';\n            }\n\n            return 'pending';\n          }\n\n          return 'new';\n        } catch (Exception err) {\n          return '';\n        }\n      "
             },
-            order: 'desc'
+            order: "desc"
           }
         },
         {
           _script: {
-            type: 'number',
+            type: "number",
             script: {
-              lang: 'painless',
-              source:
-                "\n        try {\n          def stageIndex = doc['critical_path.stage_index'].value;\n          if (stageIndex != null) {\n            return stageIndex;\n          }\n          \n          return 9999999;\n        } catch (Exception err) {\n          return 9999999;\n        }\n      "
+              lang: "painless",
+              source: "\n        try {\n          def stageIndex = doc['critical_path.stage_index'].value;\n          if (stageIndex != null) {\n            return stageIndex;\n          }\n\n          return 9999999;\n        } catch (Exception err) {\n          return 9999999;\n        }\n      "
             },
-            order: 'desc'
+            order: "desc"
           }
         },
         {
           _script: {
-            type: 'number',
+            type: "number",
             script: {
-              lang: 'painless',
-              source:
-                "\n        def projectNumber = params._source.project_id;\n        projectNumber = /[^0-9]/.matcher(projectNumber).replaceAll('');\n        return Integer.parseInt(projectNumber);\n      "
+              lang: "painless",
+              source: "\n        def projectNumber = params._source.project_id;\n        projectNumber = /[^0-9]/.matcher(projectNumber).replaceAll('');\n        return Integer.parseInt(projectNumber);\n      "
             },
-            order: 'desc'
+            order: "desc"
           }
         },
         {
           _script: {
-            type: 'number',
+            type: "number",
             script: {
-              lang: 'painless',
-              source:
-                "\n        try {\n          boolean isReady = doc['is_ready'].value;\n          boolean isComplete = doc['is_complete'].value;\n\n          if (isReady == true && isComplete == true && doc.containsKey('completed_at') && !doc['completed_at'].empty) {\n            return doc['completed_at'].value.millis;\n          } else if (isReady == true && doc.containsKey('ready_at') && !doc['ready_at'].empty) {\n            return doc['ready_at'].value.millis;\n          }\n\n          return doc['created_at'].value.millis;\n        } catch (Exception err) {\n          return 0;\n        }\n      "
+              lang: "painless",
+              source: "\n        try {\n          boolean isReady = doc['is_ready'].value;\n          boolean isComplete = doc['is_complete'].value;\n\n          if (isReady == true && isComplete == true && doc.containsKey('completed_at') && !doc['completed_at'].empty) {\n            return doc['completed_at'].value.millis;\n          } else if (isReady == true && doc.containsKey('ready_at') && !doc['ready_at'].empty) {\n            return doc['ready_at'].value.millis;\n          }\n\n          return doc['created_at'].value.millis;\n        } catch (Exception err) {\n          return 0;\n        }\n      "
             },
-            order: 'desc'
+            order: "desc"
           }
         },
         {
           _script: {
-            type: 'number',
+            type: "number",
             script: {
-              lang: 'painless',
-              source:
-                "\n        return doc['was_marked_incomplete'].empty\n          ? 0\n          : doc['was_marked_incomplete'].value ? 1 : 0;\n      "
+              lang: "painless",
+              source: "\n        return doc['was_marked_incomplete'].empty\n          ? 0\n          : doc['was_marked_incomplete'].value ? 1 : 0;\n      "
             },
-            order: 'desc'
+            order: "desc"
+          }
+        },
+        {
+          "last_comment_data.created_at": {
+            order: "desc"
           }
         },
-        { 'last_comment_data.created_at': { order: 'desc' } },
         {
           _script: {
-            type: 'number',
+            type: "number",
             script: {
-              lang: 'painless',
-              source:
-                '\n        try {\n          def fields = params._source.fields;\n\n          for (int i=0; i<fields.size(); i++) {\n            if (fields[i].id.equals(params.value)) {\n              if (fields[i].number != null) {\n                return fields[i].number;\n              } else {\n                return -999999;\n              }\n            }\n          }\n\n          return -999999;\n        } catch (Exception err) {\n          return -999999;\n        }\n      ',
-              params: { value: '38d423bf-fc24-4183-b8b7-15420c89e318' }
+              lang: "painless",
+              source: "\n        try {\n          def fields = params._source.fields;\n\n          for (int i=0; i<fields.size(); i++) {\n            if (fields[i].id.equals(params.value)) {\n              if (fields[i].number != null) {\n                return fields[i].number;\n              } else {\n                return -999999;\n              }\n            }\n          }\n\n          return -999999;\n        } catch (Exception err) {\n          return -999999;\n        }\n      ",
+              params: {
+                value: "38d423bf-fc24-4183-b8b7-15420c89e318"
+              }
             },
-            order: 'desc'
+            order: "desc"
           }
         },
         {
           _script: {
-            type: 'string',
+            type: "string",
             script: {
-              lang: 'painless',
-              source:
-                "\n        try {\n          String textInfo = '';\n          def fields = params._source.fields;\n\n          for (int i=0; i<fields.size(); i++) {\n            if (fields[i].id.equals(params.value)) {\n\n              if (fields[i].number != null) {\n                return '';\n              }\n\n              textInfo = fields[i].text == null ? '' : fields[i].text;\n              if (fields[i].containsKey('computedText')) {\n                textInfo = fields[i].computedText == null ? textInfo : fields[i].computedText;\n              }\n            }\n          }\n\n          return textInfo;\n        } catch (Exception err) {\n          return '';\n        }\n      ",
-              params: { value: '38d423bf-fc24-4183-b8b7-15420c89e318' }
+              lang: "painless",
+              source: "\n        try {\n          String textInfo = '';\n          def fields = params._source.fields;\n\n          for (int i=0; i<fields.size(); i++) {\n            if (fields[i].id.equals(params.value)) {\n\n              if (fields[i].number != null) {\n                return '';\n              }\n\n              textInfo = fields[i].text == null ? '' : fields[i].text;\n              if (fields[i].containsKey('computedText')) {\n                textInfo = fields[i].computedText == null ? textInfo : fields[i].computedText;\n              }\n            }\n          }\n\n          return textInfo;\n        } catch (Exception err) {\n          return '';\n        }\n      ",
+              params: {
+                value: "38d423bf-fc24-4183-b8b7-15420c89e318"
+              }
             },
-            order: 'desc'
+            order: "desc"
           }
         },
-        { id: { order: 'desc', missing: '_last' } }
+        {
+          id: {
+            order: "desc",
+            missing: "_last"
+          }
+        }
       ]);
       done();
     });