@outliant/sunrise-utils 1.0.9 → 1.0.11

package/CHANGELOG.md

@@ -4,8 +4,25 @@ 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.0.11](https://github.com/outliant/sunrise-utils/compare/1.0.10...1.0.11)
+
+- (task/additional date filters #860q65z6h [`#4`](https://github.com/outliant/sunrise-utils/pull/4)
+- chore: add last n  days [`bb2f94a`](https://github.com/outliant/sunrise-utils/commit/bb2f94aade4ed11845ca29cf7f9b970cac51ae42)
+- chore: add new filters for task [`3fa42e5`](https://github.com/outliant/sunrise-utils/commit/3fa42e52bc6076dfd35272b91558d9696729cfbf)
+- chore: add new filters [`6f10233`](https://github.com/outliant/sunrise-utils/commit/6f1023325c1166f046dfac50695ceb68873fbb17)
+
+#### [1.0.10](https://github.com/outliant/sunrise-utils/compare/1.0.9...1.0.10)
+
+> 30 March 2023
+
+- chore: added created and updated on project list columns #860qbm263 [`8f664f1`](https://github.com/outliant/sunrise-utils/commit/8f664f117644d97e5338f11c0f4e1a4396375b07)
+- chore(release): 1.0.10 [`08ef0d6`](https://github.com/outliant/sunrise-utils/commit/08ef0d6b47ff16e853249d21d5d0b0a962caf44b)
+
 #### [1.0.9](https://github.com/outliant/sunrise-utils/compare/1.0.8...1.0.9)
 
+> 30 March 2023
+
+- chore(release): 1.0.9 [`b866dd4`](https://github.com/outliant/sunrise-utils/commit/b866dd4b473c10534c8fe10d6a388a905fb8f0c1)
 - chore: support taskfield group #860pn480e [`9bded12`](https://github.com/outliant/sunrise-utils/commit/9bded1255c994ea01823b1b689aa38d80da76c8a)
 
 #### [1.0.8](https://github.com/outliant/sunrise-utils/compare/1.0.7...1.0.8)

package/helpers/projectFilter/index.js

@@ -59,6 +59,18 @@ module.exports.defaultCustomColumns = [
     value: 'lastPulseCommentDate',
     type: 'lastPulseCommentDate',
     field_type: 'date'
+  },
+  {
+    name: 'Created',
+    value: 'created_at',
+    type: 'created_at',
+    field_type: 'date'
+  },
+  {
+    name: 'Updated',
+    value: 'updated_at',
+    type: 'updated_at',
+    field_type: 'date'
   }
 ];
 

package/helpers/projectFilter/projectFieldFilter.js

@@ -55,6 +55,10 @@ module.exports = (filter) => {
       return module.exports.isAfterIncludeParam(filter);
     case 'between':
       return module.exports.isBetween(filter);
+    case 'next_n_days':
+      return module.exports.nextNDays(filter);
+    case 'last_n_days':
+      return module.exports.lastNDays(filter);
     default:
       return null;
   }
@@ -495,6 +499,111 @@ module.exports.isAfter = (filter) => {
   return null;
 };
 
+module.exports.nextNDays = (filter) => {
+  if (!!filter.field_id) {
+    if (isNaN(filter.value)) {
+      return null;
+    }
+
+    const today = moment()
+      .startOf('day');
+
+    const nextNDays = moment()
+      .add(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': {
+                          gt: today.valueOf(),
+                          lt: nextNDays.valueOf()
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    };
+
+    return res;
+  }
+
+  return null;
+};
+
+module.exports.lastNDays = (filter) => {
+  if (!!filter.field_id) {
+    if (isNaN(filter.value)) {
+      return null;
+    }
+
+    const today = moment()
+      .startOf('day');
+
+    const lastNDays = 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: today.valueOf(),
+                          gt: lastNDays.valueOf()
+                        }
+                      }
+                    }
+                  ]
+                }
+              }
+            }
+          }
+        ]
+      }
+    };
+
+    console.log(JSON.stringify(res, null, 2));
+    return res;
+  }
+
+  return null;
+};
+
 module.exports.isBeforeIncludeParam = (filter) => {
   if (!!filter.field_id) {
     let param;

package/helpers/taskFilter/taskFieldFilter.js

@@ -28,12 +28,15 @@ module.exports = (filter) => {
       return module.exports.isAfterIncludeParam(filter);
     case 'between':
       return module.exports.isBetween(filter);
+    case 'next_n_days':
+      return module.exports.nextNDays(filter);
+    case 'last_n_days':
+      return module.exports.lastNDays(filter);
     default:
       return null;
   }
 };
 
-
 module.exports.containsAny = (filter) => {
   /**
    * Field type is for custom columns
@@ -291,6 +294,61 @@ module.exports.isAfter = (filter) => {
   };
 };
 
+module.exports.nextNDays = (filter) => {
+  if (isNaN(filter.value)) {
+    return null;
+  }
+
+  const today = moment()
+    .startOf('day');
+
+  const nextNDays = moment()
+    .add(filter.value, 'd')
+    .endOf('day');
+
+  return {
+    range: {
+      [filter.type]: {
+        gt: today.valueOf(),
+        lt: nextNDays.valueOf()
+      }
+    }
+  };
+};
+
+module.exports.lastNDays = (filter) => {
+  if (isNaN(filter.value)) {
+    return null;
+  }
+
+  const today = moment()
+    .startOf('day');
+
+  const lastNDays = moment()
+    .subtract(filter.value, 'd')
+    .endOf('day');
+
+  const info = {
+    today: {
+      format: today.format('YYYY-MM-DD'),
+      value: today.valueOf()
+    },
+    lastNDays: {
+      format: lastNDays.format('YYYY-MM-DD'),
+      value: lastNDays.valueOf()
+    }
+  };
+
+  return {
+    range: {
+      [filter.type]: {
+        lt: today.valueOf(),
+        gt: lastNDays.valueOf()
+      }
+    }
+  };
+};
+
 module.exports.isBeforeIncludeParam = (filter) => {
   let param;
 

package/lib/fieldConditions.js

@@ -165,6 +165,14 @@ module.exports.conditions = {
     {
       label: 'Is Not Empty',
       value: 'is_not_empty'
+    },
+    {
+      label: 'In The Next N Days',
+      value: 'next_n_days'
+    },
+    {
+      label: 'In The Last N Days',
+      value: 'last_n_days'
     }
   ]
 };

package/package.json

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