@outliant/sunrise-utils 1.1.28 → 1.1.31

package/CHANGELOG.md

@@ -4,10 +4,28 @@ 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.31](https://github.com/outliant/sunrise-utils/compare/1.1.29...1.1.31)
+
+- Feature: Added Greater than N days ago filter #86b09hc0u [`#40`](https://github.com/outliant/sunrise-utils/pull/40)
+- feature: Added Greater than N days ago filter #86b09hc0u [`7c917aa`](https://github.com/outliant/sunrise-utils/commit/7c917aa02896b008114aa1791eee4598ab115bdb)
+- chore(release): 1.1.30 [`d738803`](https://github.com/outliant/sunrise-utils/commit/d738803831b98a9dca0f1b65c37943ed64911f24)
+- chore(release): 1.1.30 [`ba31d9b`](https://github.com/outliant/sunrise-utils/commit/ba31d9b3d14596fe4d632dc0a7989622ede49ec3)
+
+#### [1.1.29](https://github.com/outliant/sunrise-utils/compare/1.1.28...1.1.29)
+
+> 6 June 2024
+
+- chore: fix task field date filter #86b0j0q70 [`#38`](https://github.com/outliant/sunrise-utils/pull/38)
+- chore: update task field date filter #86b0j0q70 [`3e806ba`](https://github.com/outliant/sunrise-utils/commit/3e806bac4a3144a9aa77ade67f980e6b583759c2)
+- chore(release): 1.1.29 [`4ccbc43`](https://github.com/outliant/sunrise-utils/commit/4ccbc43eb40174c643b03478ec8bd7c2482b35d7)
+
 #### [1.1.28](https://github.com/outliant/sunrise-utils/compare/1.1.27...1.1.28)
 
+> 4 April 2024
+
 - task starred column #86azquc2z [`#36`](https://github.com/outliant/sunrise-utils/pull/36)
 - banners name and options update #85ztcymgr [`#37`](https://github.com/outliant/sunrise-utils/pull/37)
+- chore(release): 1.1.28 [`980137b`](https://github.com/outliant/sunrise-utils/commit/980137bef447c8c0fac3b9a116bc72c972bc13fd)
 - starredTaskIds parameter default value [`d1f69b5`](https://github.com/outliant/sunrise-utils/commit/d1f69b59611dc6b31d7c68a43e18b2920ea46c27)
 
 #### [1.1.27](https://github.com/outliant/sunrise-utils/compare/1.1.26...1.1.27)

package/helpers/projectFilter/projectFieldFilter.js

@@ -66,6 +66,8 @@ module.exports = (filter) => {
       return module.exports.nextNDays(filter);
     case 'last_n_days':
       return module.exports.lastNDays(filter);
+    case 'greater_n_days_ago':
+      return module.exports.greaterNDaysAgo(filter);
     default:
       return null;
   }
@@ -610,6 +612,50 @@ module.exports.lastNDays = (filter) => {
   return null;
 };
 
+module.exports.greaterNDaysAgo = (filter) => {
+  if (!filter.field_id || isNaN(filter.value)) {
+    return null;
+  }
+
+  const greaterNDaysAgo = moment()
+    .subtract(filter.value, 'd')
+    .endOf('day');
+
+  const res = {
+    bool: {
+      must: [
+        {
+          nested: {
+            path: 'fields',
+            query: {
+              bool: {
+                must: [
+                  {
+                    term: {
+                      'fields.id': {
+                        value: filter.field_id
+                      }
+                    }
+                  },
+                  {
+                    range: {
+                      'fields.number': {
+                        lt: greaterNDaysAgo.valueOf()
+                      }
+                    }
+                  }
+                ]
+              }
+            }
+          }
+        }
+      ]
+    }
+  };
+
+  return res;
+}
+
 module.exports.isBeforeIncludeParam = (filter) => {
   if (!!filter.field_id) {
     let param;

package/helpers/projectFilter/projectFilter.js

@@ -26,6 +26,8 @@ module.exports = (filter) => {
       return module.exports.nextNDays(filter);
     case 'last_n_days':
       return module.exports.lastNDays(filter);
+    case 'greater_n_days_ago':
+      return module.exports.greaterNDaysAgo(filter);
     case 'is_empty':
       return module.exports.isEmpty(filter);
     case 'is_not_empty':
@@ -315,6 +317,28 @@ module.exports.lastNDays = (filter) => {
   return res;
 };
 
+module.exports.greaterNDaysAgo = (filter) => {
+  if (!filter.type || isNaN(filter.value)) {
+    return null;
+  }
+
+  const greaterNDaysAgo = moment().subtract(filter.value, 'd').endOf('day');
+
+  return {
+    bool: {
+      must: [
+        {
+          range: {
+            [filter.type]: {
+              lt: greaterNDaysAgo.valueOf()
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
 module.exports.isBetween = (filter) => {
   if (!filter.type) {
     return null;

package/helpers/taskFilter/taskFieldFilter.js

@@ -16,6 +16,9 @@ module.exports = (filter) => {
     case 'is_not_empty':
       return module.exports.isNotEmpty(filter);
     case 'is_equal':
+      if (filter.type === 'ready_at') {
+        return module.exports.isReadyAt(filter);
+      }
       return module.exports.isEqual(filter);
     case 'not_equal':
       return module.exports.isNotEqual(filter);
@@ -40,6 +43,8 @@ module.exports = (filter) => {
       return module.exports.nextNDays(filter);
     case 'last_n_days':
       return module.exports.lastNDays(filter);
+    case 'greater_n_days_ago':
+      return module.exports.greaterNDaysAgo(filter);
     default:
       return null;
   }
@@ -297,6 +302,51 @@ module.exports.isEqual = (filter) => {
   };
 };
 
+module.exports.isReadyAt = (filter) => {
+  const startOfDay = moment(filter.value).startOf('day').valueOf();
+  const endOfDay = moment(filter.value).endOf('day').valueOf();
+
+  return {
+    script: {
+      script: {
+        source: `
+          try {
+            def filterType = params.filterType;
+            def taskFilter = doc[filterType];
+
+            if (taskFilter.size() == 0) {
+              return false;
+            }
+
+            long startOfDay = params.startOfDay;
+            long endOfDay = params.endOfDay;
+
+            if (
+              filterType == 'ready_at' &&
+              doc['is_complete'].size() != 0 &&
+              doc['is_complete'].value == true &&
+              doc['completed_at'].size() != 0
+            ) {
+              long completedAt = doc['completed_at'].value.millis;
+              return completedAt >= startOfDay && completedAt <= endOfDay;
+            } else {
+              long taskFilterValue = taskFilter.value.millis;
+              return taskFilterValue >= startOfDay && taskFilterValue <= endOfDay;
+            }
+          } catch(Exception err){
+            return false;
+          }`,
+        lang: 'painless',
+        params: {
+          startOfDay,
+          endOfDay,
+          filterType: filter.type
+        }
+      }
+    }
+  };
+};
+
 module.exports.isBefore = (filter) => {
   let param;
 
@@ -367,6 +417,20 @@ module.exports.lastNDays = (filter) => {
   };
 };
 
+module.exports.greaterNDaysAgo = (filter) => {
+  if (isNaN(filter.value)) {
+    return null;
+  }
+
+  return {
+    range: {
+      [filter.type]: {
+        lt: `now/d-${filter.value}d`
+      }
+    }
+  };
+};
+
 module.exports.isBeforeIncludeParam = (filter) => {
   let param;
 

package/lib/fieldConditions.js

@@ -189,6 +189,10 @@ module.exports.conditions = {
     {
       label: 'In The Last N Days',
       value: 'last_n_days'
+    },
+    {
+      label: 'Greater than N Days Ago',
+      value: 'greater_n_days_ago'
     }
   ],
   user_select: [

package/package.json

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

package/test/helpers/projectFilter/projectFieldFilter.spec.js

@@ -1236,6 +1236,29 @@ describe('projectFilter/projectFilter', () => {
         }
       }
     },
+    {
+      input: {
+        condition: 'greater_n_days_ago',
+        field_id: '5a681cb0-0682-48a8-875f-a525c795d398',
+        type: 'created_at',
+        field_type: 'date',
+        value: 4,
+        second_value: ''
+      },
+      output: {
+        bool: {
+          must: [
+            {
+              range: {
+                created_at: {
+                  lt: moment().subtract(4, 'd').endOf('day').valueOf()
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
     {
       input: {
         condition: 'is_empty',

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

@@ -435,6 +435,53 @@ describe('taskFieldFilter', function () {
         second_value: ''
       },
       output: null
+    },
+    {
+      input: {
+        condition: 'is_equal',
+        field_id: '',
+        type: 'ready_at',
+        field_type: 'date',
+        value: 1675296000000,
+        second_value: ''
+      },
+      output: {
+        script:{
+          script: {
+            source: "\n          try {\n            def filterType = params.filterType;\n            def taskFilter = doc[filterType];\n\n            if (taskFilter.size() == 0) {\n              return false;\n            }\n\n            long startOfDay = params.startOfDay;\n            long endOfDay = params.endOfDay;\n\n            if (\n              filterType == 'ready_at' &&\n              doc['is_complete'].size() != 0 &&\n              doc['is_complete'].value == true &&\n              doc['completed_at'].size() != 0\n            ) {\n              long completedAt = doc['completed_at'].value.millis;\n              return completedAt >= startOfDay && completedAt <= endOfDay;\n            } else {\n              long taskFilterValue = taskFilter.value.millis;\n              return taskFilterValue >= startOfDay && taskFilterValue <= endOfDay;\n            }\n          } catch(Exception err){\n            return false;\n          }",
+            lang: 'painless',
+            params: {
+              startOfDay: 1675267200000,
+              endOfDay: 1675353599999,
+              filterType: 'ready_at'
+            }
+          }
+        }
+      }
+    },
+    {
+      input: {
+        condition: 'greater_n_days_ago',
+        field_id: '',
+        type: 'created_at',
+        field_type: 'number',
+        value: '30',
+        second_value: ''
+      },
+      output: {
+        range: {
+          created_at: {
+            lt: 'now/d-30d'
+          }
+        }
+      }
+    },
+    {
+      input: {
+        type: 'greater_n_days_ago',
+        value: 'not_a_number'
+      },
+      output: null
     }
   ];