@outliant/sunrise-utils 1.1.22 → 1.1.24

package/CHANGELOG.md

@@ -4,9 +4,24 @@ 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.24](https://github.com/outliant/sunrise-utils/compare/1.1.23...1.1.24)
+
+- chore: fix task status filtering #86azhkzeb [`#32`](https://github.com/outliant/sunrise-utils/pull/32)
+- chore: add due date sort script #86az9tt26 [`#33`](https://github.com/outliant/sunrise-utils/pull/33)
+
+#### [1.1.23](https://github.com/outliant/sunrise-utils/compare/1.1.22...1.1.23)
+
+> 28 February 2024
+
+- chore: fix task pipeline last comment date filtering #86azcxk24 [`#29`](https://github.com/outliant/sunrise-utils/pull/29)
+- chore(release): 1.1.23 [`b806236`](https://github.com/outliant/sunrise-utils/commit/b80623635b5eb5ddfe9566458fcb493de4daed7b)
+
 #### [1.1.22](https://github.com/outliant/sunrise-utils/compare/1.1.21...1.1.22)
 
+> 27 February 2024
+
 - chore: update sticky filters migration sort rule #86azcbz94 [`#28`](https://github.com/outliant/sunrise-utils/pull/28)
+- chore(release): 1.1.22 [`9383476`](https://github.com/outliant/sunrise-utils/commit/9383476cdd89b29a56fce8c2269b11f1eae7db3d)
 
 #### [1.1.21](https://github.com/outliant/sunrise-utils/compare/1.1.20...1.1.21)
 

package/helpers/sortScript.js

@@ -284,6 +284,25 @@ module.exports.readyAt = (order) => {
   };
 };
 
+module.exports.dueDate = (order) => {
+  return {
+    _script: {
+      type: 'number',
+      script: {
+        lang: 'painless',
+        source: `
+          if (!doc['due_date'].empty) {
+            return doc['due_date'].value.millis;
+          } else {
+            return -999999;
+          }
+        `
+      },
+      order
+    }
+  };
+};
+
 module.exports.wasMarkedIncomplete = (order) => {
   return {
     _script: {

package/helpers/taskFilter/index.js

@@ -298,6 +298,11 @@ module.exports.buildTaskPipelineFilter = (filter) => {
         ...filter,
         type: 'ready_at'
       });
+    case 'last_comment_date':
+      return buildTaskFieldFilter({
+        ...filter,
+        type: 'last_comment_data.created_at'
+      });
     // Always expected as is_equal condition with array of task template ids
     case 'task_templates':
       let value = filter.value;

package/helpers/taskFilter/statusFilter.js

@@ -89,6 +89,26 @@ module.exports.isEqual = (filter) => {
               term: {
                 is_complete: false
               }
+            },
+            {
+              bool: {
+                should: [
+                  {
+                    term: {
+                      is_paused: false
+                    }
+                  },
+                  {
+                    bool: {
+                      must_not: {
+                        exists: {
+                          field: 'is_paused'
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
             }
           ]
         }

package/lib/taskPipeline.js

@@ -149,6 +149,10 @@ class TaskPipeline {
             taskPipelinesSort.push(sortScript.lastCommentDate(sort));
             break;
 
+          case s === 'due_date':
+            taskPipelinesSort.push(sortScript.dueDate(sort));
+            break;
+
           case isUuid(s):
             taskPipelinesSort.push(sortScript.projectFieldNumeric(sort, s));
             taskPipelinesSort.push(sortScript.projectFieldText(sort, s));

package/package.json

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

package/test/helpers/sortScript.spec.js

@@ -0,0 +1,34 @@
+'use strict';
+
+/* eslint-env node, mocha */
+const { expect } = require('chai');
+
+// To test
+const sortScript = require('../../helpers/sortScript');
+
+describe('sortScript', function () {
+  describe('dueDate', function () {
+    const orders = ['desc', 'asc'];
+    for (const order of orders) {
+      it(`should handle \`${order}\` sort order`, () => {
+        const sort = sortScript.dueDate(order);
+        expect(sort).to.be.deep.equal({
+          _script: {
+            type: 'number',
+            script: {
+              lang: 'painless',
+              source: '\n' +
+                "          if (!doc['due_date'].empty) {\n" +
+                "            return doc['due_date'].value.millis;\n" +
+                '          } else {\n' +
+                '            return -999999;\n' +
+                '          }\n' +
+                '        '
+            },
+            order
+          }
+        });
+      });
+    }
+  });
+});

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

@@ -19,7 +19,38 @@ describe('taskFilter', function () {
       });
       expect(filter).to.be.deep.equal({
         bool: {
-          must: [{ term: { is_ready: true } }, { term: { is_complete: false } }]
+          must: [
+            {
+              term: {
+                is_ready: true
+              }
+            },
+            {
+              term: {
+                is_complete: false
+              }
+            },
+            {
+              bool: {
+                should: [
+                  {
+                    term: {
+                      is_paused: false
+                    }
+                  },
+                  {
+                    bool: {
+                      must_not: {
+                        exists: {
+                          field: 'is_paused'
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          ]
         }
       });
       done();
@@ -357,5 +388,109 @@ describe('taskFilter', function () {
       });
       done();
     });
+
+    describe('last_comment_date', () => {
+      it('should handle `is_equal` filter', () => {
+        const filter = taskFilter.buildTaskPipelineFilter({
+          field_id: '',
+          field_type: 'date',
+          type: 'last_comment_date',
+          condition: 'is_equal',
+          value: 1704067200000,
+          second_value: null
+        });
+
+        expect(filter).to.be.deep.equal({
+          range: {
+            'last_comment_data.created_at': {
+              gte: 1704038400000,
+              lte: 1704124799999
+            }
+          }
+        });
+      });
+
+      it('should handle `not_equal` filter', () => {
+        const filter = taskFilter.buildTaskPipelineFilter({
+          field_id: '',
+          field_type: 'date',
+          type: 'last_comment_date',
+          condition: 'not_equal',
+          value: 1704067200000,
+          second_value: null
+        });
+
+        expect(filter).to.be.deep.equal({
+          bool: {
+            must_not: {
+              range: {
+                'last_comment_data.created_at': {
+                    gte: 1704038400000,
+                    lte: 1704124799999
+                  }
+                }
+              }
+            }
+        });
+      });
+
+      it('should handle `after` filter', () => {
+        const filter = taskFilter.buildTaskPipelineFilter({
+          field_id: '',
+          field_type: 'date',
+          type: 'last_comment_date',
+          condition: 'after',
+          value: 1704067200000,
+          second_value: null
+        });
+
+        expect(filter).to.be.deep.equal({
+          range: {
+            'last_comment_data.created_at': {
+                gt: 1704124799999
+              }
+            }
+        });
+      });
+
+      it('should handle `before` filter', () => {
+        const filter = taskFilter.buildTaskPipelineFilter({
+          field_id: '',
+          field_type: 'date',
+          type: 'last_comment_date',
+          condition: 'before',
+          value: 1704067200000,
+          second_value: null
+        });
+
+        expect(filter).to.be.deep.equal({
+          range: {
+            'last_comment_data.created_at': {
+                lt: 1704038400000
+              }
+            }
+        });
+      });
+
+      it('should handle `between` filter', () => {
+        const filter = taskFilter.buildTaskPipelineFilter({
+          field_id: '',
+          field_type: 'date',
+          type: 'last_comment_date',
+          condition: 'between',
+          value: '01/19/2024',
+          second_value: '02/29/2024'
+        });
+
+        expect(filter).to.be.deep.equal({
+          range: {
+            'last_comment_data.created_at': {
+                gte: 1705593600000,
+                lte: 1709222399999
+              }
+            }
+        });
+      });
+    });
   });
 });

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

@@ -31,7 +31,38 @@ describe('taskFilter/statusFilter', function () {
       },
       output: {
         bool: {
-          must: [{ term: { is_ready: true } }, { term: { is_complete: false } }]
+          must: [
+            {
+              term: {
+                is_ready: true
+              }
+            },
+            {
+              term: {
+                is_complete: false
+              }
+            },
+            {
+              bool: {
+                should: [
+                  {
+                    term: {
+                      is_paused: false
+                    }
+                  },
+                  {
+                    bool: {
+                      must_not: {
+                        exists: {
+                          field: 'is_paused'
+                        }
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          ]
         }
       }
     },

package/test/lib/taskPipeline.spec.js

@@ -72,22 +72,80 @@ describe('taskPipeline', function () {
       expect(filter).to.deep.equal({
         bool: {
           must: [
-            { term: { organization_id: { value: 'test-org' } } },
-            { term: { department_id: { value: 'test-department' } } },
-            { term: { project_id: { value: 'test-project' } } },
+            {
+              term: {
+                organization_id: {
+                  value: 'test-org'
+                }
+              }
+            },
+            {
+              term: {
+                department_id: {
+                  value: 'test-department'
+                }
+              }
+            },
+            {
+              term: {
+                project_id: {
+                  value: 'test-project'
+                }
+              }
+            },
             {
               bool: {
                 must: [
-                  { term: { is_ready: true } },
-                  { term: { is_complete: false } }
+                  {
+                    term: {
+                      is_ready: true
+                    }
+                  },
+                  {
+                    term: {
+                      is_complete: false
+                    }
+                  },
+                  {
+                    bool: {
+                      should: [
+                        {
+                          term: {
+                            is_paused: false
+                          }
+                        },
+                        {
+                          bool: {
+                            must_not: {
+                              exists: {
+                                field: 'is_paused'
+                              }
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  }
                 ]
               }
             },
             {
               bool: {
                 should: [
-                  { term: { on_hold: false } },
-                  { bool: { must_not: { exists: { field: 'on_hold' } } } }
+                  {
+                    term: {
+                      on_hold: false
+                    }
+                  },
+                  {
+                    bool: {
+                      must_not: {
+                        exists: {
+                          field: 'on_hold'
+                        }
+                      }
+                    }
+                  }
                 ]
               }
             }