@outliant/sunrise-utils 1.1.5 → 1.1.7

package/CHANGELOG.md

@@ -4,8 +4,23 @@ 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.7](https://github.com/outliant/sunrise-utils/compare/1.1.6...1.1.7)
+
+- chore: update users pipeline [`#11`](https://github.com/outliant/sunrise-utils/pull/11)
+- chore: remove map [`6c6972b`](https://github.com/outliant/sunrise-utils/commit/6c6972b89bd60cb44bb48613ad206b785e1f1771)
+- chore: use buildProjectFilter [`0cae6ce`](https://github.com/outliant/sunrise-utils/commit/0cae6ce4ca13dc56b98e9b98a6c6cff9881824c2)
+
+#### [1.1.6](https://github.com/outliant/sunrise-utils/compare/1.1.5...1.1.6)
+
+> 20 September 2023
+
+- chore: change logic for last/next n days filter [`#10`](https://github.com/outliant/sunrise-utils/pull/10)
+- chore(release): 1.1.6 [`1158429`](https://github.com/outliant/sunrise-utils/commit/1158429285eeb1f80d2dd7c55bd21b1291248469)
+
 #### [1.1.5](https://github.com/outliant/sunrise-utils/compare/1.1.4...1.1.5)
 
+> 19 May 2023
+
 - Task/project banner #866a3c0ug [`#9`](https://github.com/outliant/sunrise-utils/pull/9)
 - chore: filter checkbox [`fb8d601`](https://github.com/outliant/sunrise-utils/commit/fb8d6015b1ee2092fc69b64d10b0a26b59958574)
 - chore: update spec [`bcbfd9a`](https://github.com/outliant/sunrise-utils/commit/bcbfd9ad5a21b412c160a85b05d63a43771bc084)

package/helpers/taskFilter/taskFieldFilter.js

@@ -334,18 +334,11 @@ module.exports.nextNDays = (filter) => {
     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()
+        lt: `now/d+${filter.value}d`,
+        gt: 'now/d'
       }
     }
   };
@@ -356,18 +349,11 @@ module.exports.lastNDays = (filter) => {
     return null;
   }
 
-  const today = moment()
-    .startOf('day');
-
-  const lastNDays = moment()
-    .subtract(filter.value, 'd')
-    .endOf('day');
-
   return {
     range: {
       [filter.type]: {
-        lt: today.valueOf(),
-        gt: lastNDays.valueOf()
+        gt: `now/d-${filter.value}d`,
+        lt: 'now/d'
       }
     }
   };

package/helpers/users/filters/status.js

@@ -0,0 +1,77 @@
+module.exports = (filter) => {
+  switch (filter.condition) {
+    case 'is_equal':
+      return module.exports.isEqual(filter);
+    case 'not_equal':
+      return module.exports.isNotEqual(filter);
+    default:
+      return null;
+  }
+};
+
+module.exports.isEqual = (filter) => {
+  switch (filter.value) {
+    case 'active':
+      return {
+        bool: {
+          must: [
+            {
+              term: {
+                pending: false
+              }
+            },
+            {
+              term: {
+                disabled: false
+              }
+            }
+          ]
+        }
+      };
+    case 'pending':
+      return {
+        bool: {
+          must: [
+            {
+              term: {
+                pending: true
+              }
+            },
+            {
+              term: {
+                disabled: false
+              }
+            }
+          ]
+        }
+      };
+    case 'disabled':
+      return {
+        bool: {
+          must: [
+            {
+              term: {
+                disabled: true
+              }
+            }
+          ]
+        }
+      };
+    default:
+      return null;
+  }
+};
+
+module.exports.isNotEqual = (filter) => {
+  const equalFilter = module.exports.isEqual(filter);
+
+  if (equalFilter) {
+    return {
+      bool: {
+        must_not: equalFilter
+      }
+    };
+  }
+
+  return null;
+};

package/helpers/users/sortScript.js

@@ -0,0 +1,27 @@
+const status = (order) => {
+  return {
+    _script: {
+      type: 'string',
+      order,
+      script: {
+        lang: 'painless',
+        source: `
+          def isPending = doc['pending'].value;
+          def isDisabled = doc['disabled'].value;
+
+          if (isPending) {
+            return 'pending';
+          } else if (isDisabled) {
+            return 'disabled';
+          } else {
+            return 'active';
+          }
+        `
+      }
+    }
+  };
+};
+
+module.exports = {
+  status,
+};

package/index.js

@@ -2,10 +2,12 @@ const log = require('./lib/logger');
 const fieldConditions = require('./lib/fieldConditions');
 const taskPipeline = require('./lib/taskPipeline');
 const projectPipeline = require('./lib/projectPipeline');
+const usersPipeline = require('./lib/usersPipeline');
 
 module.exports = {
   log,
   fieldConditions,
   taskPipeline,
-  projectPipeline
+  projectPipeline,
+  usersPipeline
 };

package/lib/usersPipeline.js

@@ -0,0 +1,53 @@
+const sortScript = require('../helpers/users/sortScript');
+const buildProjectFilter = require('../helpers/projectFilter/projectFilter');
+
+// customer filters
+const buildStatusFilter = require('../helpers/users/filters/status');
+
+class UsersPipeline {
+  buildFiltersQuery({ filters }) {
+    const mustQuery = [];
+
+    for (const filter of filters) {
+      switch (filter.type) {
+        case 'status':
+          mustQuery.push(buildStatusFilter(filter));
+          break;
+
+        default: {
+          const queryFilter = buildProjectFilter(filter);
+
+          if (queryFilter) {
+            mustQuery.push(queryFilter);
+          }
+          break;
+        }
+      }
+    }
+
+    return { bool: { must: mustQuery } };
+  }
+
+  buildSortScript ({ sorts }) {
+    const usersPipelineSorts = [];
+
+    sorts.forEach(sort => {
+      switch (sort.field) {
+        case 'status':
+          usersPipelineSorts.push(sortScript.status(sort.direction));
+          break;
+
+        default:
+          usersPipelineSorts.push({
+            [sort.field]: { order: sort.direction }
+          });
+          break;
+      }
+
+    });
+
+    return usersPipelineSorts;
+  }
+}
+
+module.exports = new UsersPipeline();

package/package.json

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