@outliant/sunrise-utils 1.1.7 → 1.1.8

package/CHANGELOG.md

@@ -4,9 +4,20 @@ 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.8](https://github.com/outliant/sunrise-utils/compare/1.1.7...1.1.8)
+
+- 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: 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)
 
+> 26 September 2023
+
 - chore: update users pipeline [`#11`](https://github.com/outliant/sunrise-utils/pull/11)
+- chore(release): 1.1.7 [`056a962`](https://github.com/outliant/sunrise-utils/commit/056a962aedcd0f9ee8e71cca2d1003db01a69057)
 - chore: remove map [`6c6972b`](https://github.com/outliant/sunrise-utils/commit/6c6972b89bd60cb44bb48613ad206b785e1f1771)
 - chore: use buildProjectFilter [`0cae6ce`](https://github.com/outliant/sunrise-utils/commit/0cae6ce4ca13dc56b98e9b98a6c6cff9881824c2)
 

package/helpers/isEmailValid.js

@@ -0,0 +1,9 @@
+const isEmailValid = (email) => {
+  // The regular expression to match a valid email address.
+  const regex = /^[a-zA-Z0-9_.+-]+@[a-zA-Z0-9-]+\.[a-zA-Z]+$/;
+
+  // Return true if the string matches the regular expression, false otherwise.
+  return regex.test(email);
+};
+
+module.exports = isEmailValid;

package/helpers/projectFilter/criticalPathFilter.js

@@ -1,3 +1,5 @@
+const splitString = require('../splitString');
+
 module.exports = (filter) => {
   switch (filter.condition) {
     case 'is_equal':
@@ -21,7 +23,7 @@ module.exports.isEqual = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(',');
+    value = splitString(value);
   }
 
   return {
@@ -43,7 +45,7 @@ module.exports.containsAny = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(',');
+    value = splitString(value);
   }
 
   return {
@@ -65,7 +67,7 @@ module.exports.containsNone = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(',');
+    value = splitString(value);
   }
 
   return {

package/helpers/projectFilter/projectFieldFilter.js

@@ -1,5 +1,6 @@
 const moment = require('moment');
 const { escapeElasticQuery } = require('../es');
+const splitString = require('../splitString');
 
 function getContainsMappingValue(filter) {
   if (['text', 'textarea'].includes(filter.field_type)) {
@@ -162,7 +163,7 @@ module.exports.isAnyOf = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(';');
+    value = splitString(value);
   }
 
   if (filter.field_id) {
@@ -356,7 +357,7 @@ module.exports.isEqual = (filter) => {
       let value = filter.value;
 
       if (typeof value === 'string') {
-        value = value.split(';');
+        value = splitString(value);
       }
 
       mappingValue = {

package/helpers/projectFilter/projectFilter.js

@@ -1,5 +1,6 @@
 const moment = require('moment');
 const { escapeElasticQuery } = require('../es');
+const splitString = require('../splitString');
 
 module.exports = (filter) => {
   switch (filter.condition) {
@@ -127,7 +128,7 @@ module.exports.isEqual = (filter) => {
 
     if (filter.field_type === 'checkbox') {
       const value = typeof filter.value === 'string'
-        ? filter.value.split(';')
+        ? splitString(filter.value)
         : filter.value;
 
       const should = [];
@@ -160,7 +161,7 @@ module.exports.isEqual = (filter) => {
 
     return {
       term: {
-        'fields.text': {
+        [filter.type]: {
           value: filter.value
         }
       }
@@ -383,7 +384,7 @@ module.exports.isNotEqual = (filter) => {
 
     if (filter.field_type === 'checkbox') {
       const value = typeof filter.value === 'string'
-        ? filter.value.split(';')
+        ? splitString(filter.value)
         : filter.value;
 
       const should = [];

package/helpers/projectFilter/regionFilter.js

@@ -1,3 +1,5 @@
+const splitString = require('../splitString');
+
 module.exports = (filter) => {
   switch (filter.condition) {
     case 'contains_any':
@@ -15,7 +17,7 @@ module.exports.containsAny = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(',');
+    value = splitString(value);
   }
 
   return {
@@ -37,7 +39,7 @@ module.exports.containsNone = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(',');
+    value = splitString(value);
   }
 
   return {

package/helpers/projectFilter/tagFilter.js

@@ -1,3 +1,5 @@
+const splitString = require('../splitString');
+
 module.exports = (filter) => {
   switch (filter.condition) {
     case 'contains_any':
@@ -18,7 +20,7 @@ module.exports.containsAny = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(',');
+    value = splitString(value);
   }
 
   return {
@@ -40,7 +42,7 @@ module.exports.containsNone = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(',');
+    value = splitString(value);
   }
 
   return {
@@ -62,7 +64,7 @@ module.exports.containsAll = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(',');
+    value = splitString(value);
   }
 
   return {

package/helpers/splitString.js

@@ -0,0 +1,6 @@
+function splitString(str, pattern = /[,;]/) {
+  const delimiterPattern = pattern; // Match either ',' or ';'
+  return str.split(delimiterPattern);
+}
+
+module.exports = splitString;

package/helpers/taskFilter/criticalPathFilter.js

@@ -1,3 +1,5 @@
+const splitString = require('../splitString');
+
 module.exports = (filter) => {
   switch (filter.condition) {
     case 'is_empty':
@@ -106,7 +108,7 @@ module.exports.isAnyOf = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(';');
+    value = splitString(value);
   }
 
   return {

package/helpers/taskFilter/index.js

@@ -8,6 +8,7 @@ const buildOnHoldFilter = require('./onHoldFilter');
 const buildAgeColorFilter = require('./buildAgeColorFilter');
 const buildProjectFieldFilter = require('../projectFilter/projectFieldFilter');
 const { PROJECT_BANNERS } = require('../../constants');
+const splitString = require('../splitString');
 
 module.exports.taskStatusOptions = [
   {
@@ -231,7 +232,7 @@ module.exports.buildTaskPipelineFilter = (filter) => {
       let value = filter.value;
 
       if (typeof value === 'string') {
-        value = value.split(';');
+        value = splitString(value);
       }
 
       return {

package/helpers/taskFilter/onHoldFilter.js

@@ -1,3 +1,5 @@
+const splitString = require('../splitString');
+
 module.exports = (filter) => {
   switch (filter.condition) {
     case 'is_empty':
@@ -79,7 +81,7 @@ module.exports.isAnyOf = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(';');
+    value = splitString(value);
   }
 
   const should = [];

package/helpers/taskFilter/ownerFilter.js

@@ -1,5 +1,7 @@
 const { validate: isUuid } = require('uuid');
 
+const splitString = require('../splitString');
+
 module.exports = (filter) => {
   switch (filter.condition) {
     case 'is_empty':
@@ -101,7 +103,7 @@ module.exports.isAnyOf = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(';');
+    value = splitString(value);
   }
 
   const should = [];

package/helpers/taskFilter/regionFilter.js

@@ -1,3 +1,5 @@
+const splitString = require('../splitString');
+
 module.exports = (filter) => {
   switch (filter.condition) {
     case 'is_empty':
@@ -45,7 +47,7 @@ module.exports.isEqual = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(';');
+    value = splitString(value);
   }
 
   return {

package/helpers/taskFilter/statusFilter.js

@@ -1,3 +1,5 @@
+const splitString = require('../splitString');
+
 module.exports = (filter) => {
   switch (filter.condition) {
     case 'is_empty':
@@ -142,7 +144,7 @@ module.exports.isAnyOf = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(';');
+    value = splitString(value);
   }
 
   const should = [];

package/helpers/taskFilter/taskFieldFilter.js

@@ -1,5 +1,7 @@
 const moment = require('moment');
 
+const splitString = require('../splitString');
+
 module.exports = (filter) => {
   switch (filter.condition) {
     case 'contains_any':
@@ -97,7 +99,7 @@ module.exports.isAnyOf = (filter) => {
   let value = filter.value;
 
   if (typeof value === 'string') {
-    value = value.split(';');
+    value = splitString(value);
   }
 
   return {

package/lib/usersPipeline.js

@@ -1,12 +1,44 @@
 const sortScript = require('../helpers/users/sortScript');
 const buildProjectFilter = require('../helpers/projectFilter/projectFilter');
+const isEmailValid = require('../helpers/isEmailValid');
 
 // customer filters
 const buildStatusFilter = require('../helpers/users/filters/status');
 
 class UsersPipeline {
-  buildFiltersQuery({ filters }) {
-    const mustQuery = [];
+  buildFiltersQuery (
+    organizationId,
+    filters,
+    search
+  ) {
+    const mustQuery = [
+      {
+        term: {
+          organizationId: {
+            value: organizationId
+          }
+        }
+      }
+    ];
+
+    if (search) {
+      if (isEmailValid(search)) {
+        mustQuery.push({
+          match: {
+            email: search
+          }
+        });
+      } else {
+        mustQuery.push(
+          {
+            query_string: {
+              fields: ['name.raw', 'email.raw'],
+              query: `*${search}*`,
+              default_operator: 'AND'
+            }
+          });
+      }
+    }
 
     for (const filter of filters) {
       switch (filter.type) {

package/package.json

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