@outliant/sunrise-utils 1.1.2 → 1.1.4

package/CHANGELOG.md

@@ -4,9 +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.1.4](https://github.com/outliant/sunrise-utils/compare/1.1.3...1.1.4)
+
+- chore: support user field type project fields #860qfghzp [`7f4688b`](https://github.com/outliant/sunrise-utils/commit/7f4688b270fe8734153613650c87eef28483068a)
+
+#### [1.1.3](https://github.com/outliant/sunrise-utils/compare/1.1.2...1.1.3)
+
+> 28 April 2023
+
+- Task/project filter #860qjddeg [`#8`](https://github.com/outliant/sunrise-utils/pull/8)
+- wip: project filter [`0dec4e1`](https://github.com/outliant/sunrise-utils/commit/0dec4e1830bab4470c0b2d23bdfd8cbafe8fc6a7)
+- chore: fix specs [`4d0474c`](https://github.com/outliant/sunrise-utils/commit/4d0474c74bb6a545b66a821cf63376b323393e58)
+- chore: before and after [`91b8c0f`](https://github.com/outliant/sunrise-utils/commit/91b8c0f0e7bf3912a069628563746332683cc06f)
+
 #### [1.1.2](https://github.com/outliant/sunrise-utils/compare/1.1.1...1.1.2)
 
+> 19 April 2023
+
 - chore: set departmentId to optional [`#7`](https://github.com/outliant/sunrise-utils/pull/7)
+- chore(release): 1.1.2 [`f9770a2`](https://github.com/outliant/sunrise-utils/commit/f9770a21f9b31d3acbb5e4c36b11013b5ba4951c)
 
 #### [1.1.1](https://github.com/outliant/sunrise-utils/compare/1.1.0...1.1.1)
 

package/helpers/projectFilter/index.js

@@ -4,6 +4,7 @@ const buildOnHoldFilter = require('./onHoldFilter');
 const buildIsGeneratedFilter = require('./isGeneratedFilter');
 const buildTagFilter = require('./tagFilter');
 const buildProjectFieldFilter = require('./projectFieldFilter');
+const buildProjectFilter = require('./projectFilter');
 
 module.exports.defaultCustomColumns = [
   {
@@ -91,6 +92,6 @@ module.exports.buildProjectPipelineFilter = (filter) => {
     case 'contactPropertyMappings':
       return buildProjectFieldFilter(filter);
     default:
-      return null;
+      return buildProjectFilter(filter);
   }
 };

package/helpers/projectFilter/projectFilter.js

@@ -0,0 +1,367 @@
+const moment = require('moment');
+const { escapeElasticQuery } = require('../es');
+
+module.exports = (filter) => {
+  switch (filter.condition) {
+    case 'is_equal':
+      return module.exports.isEqual(filter);
+    case 'not_equal':
+      return module.exports.isNotEqual(filter);
+    case 'before':
+    case 'less_than':
+      return module.exports.isBefore(filter);
+    case 'after':
+    case 'greater_than':
+      return module.exports.isAfter(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);
+    case 'is_empty':
+      return module.exports.isEmpty(filter);
+    case 'is_not_empty':
+      return module.exports.isNotEmpty(filter);
+    default:
+      return null;
+  }
+};
+
+module.exports.isEmpty = (filter) => {
+  if (!filter.type) {
+    return null;
+  }
+
+  return {
+    bool: {
+      must: [
+        {
+          term: {
+            [filter.type]: {
+              value: ''
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isNotEmpty = (filter) => {
+  if (!filter.type) {
+    return null;
+  }
+
+  return {
+    bool: {
+      must_not: [
+        {
+          term: {
+            [filter.type]: {
+              value: ''
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isEqual = (filter) => {
+  if (!filter.type) {
+    return null;
+  }
+
+  const param = (() => {
+    if (filter.field_type === 'date') {
+      const startOfDay = moment(filter.value).startOf('day').valueOf();
+      const endOfDay = moment(filter.value).endOf('day').valueOf();
+
+      return {
+        range: {
+          [filter.type]: {
+            gte: startOfDay,
+            lte: endOfDay
+          }
+        }
+      };
+    }
+
+    if (filter.field_type === 'number') {
+      return {
+        term: {
+          [filter.type]: {
+            value: parseInt(filter.value)
+          }
+        }
+      };
+    }
+
+    if (filter.field_type === 'textarea') {
+      return {
+        query_string: {
+          fields: [filter.type],
+          query: `*${escapeElasticQuery(filter.value.trim())}*`
+        }
+      };
+    }
+
+    if (filter.field_type === 'checkbox') {
+      const value =
+        typeof filter.value === 'string' ? value.split(';') : filter.value;
+
+      return {
+        bool: {
+          should: value.map((x) => {
+            return {
+              match: {
+                [`${filter.type}.analyzed`]: {
+                  query: x,
+                  operator: 'and'
+                }
+              }
+            };
+          })
+        }
+      };
+    }
+
+    return {
+      term: {
+        'fields.text': {
+          value: filter.value
+        }
+      }
+    };
+  })();
+
+  return {
+    bool: {
+      must: [param]
+    }
+  };
+};
+
+module.exports.isBefore = (filter) => {
+  if (!filter.type) {
+    return null;
+  }
+
+  const param = (() => {
+    if (filter.field_type === 'date') {
+      return moment(filter.value).startOf('day').valueOf();
+    }
+
+    if (filter.field_type === 'number') {
+      return parseInt(filter.value);
+    }
+
+    return null;
+  })();
+
+  if (!param) {
+    return null;
+  }
+
+  return {
+    bool: {
+      must: [
+        {
+          range: {
+            [filter.type]: {
+              lt: param
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isAfter = (filter) => {
+  if (!filter.type) {
+    return null;
+  }
+
+  const param = (() => {
+    if (filter.field_type === 'date') {
+      return moment(filter.value).endOf('day').valueOf();
+    }
+
+    if (filter.field_type === 'number') {
+      return parseInt(filter.value);
+    }
+
+    return null;
+  })();
+
+  if (!param) {
+    return null;
+  }
+
+  return {
+    bool: {
+      must: [
+        {
+          range: {
+            [filter.type]: {
+              gt: param
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.nextNDays = (filter) => {
+  if (!filter.type) {
+    return null;
+  }
+
+  if (isNaN(filter.value)) {
+    return null;
+  }
+
+  const today = moment().startOf('day');
+
+  const nextNDays = moment().add(filter.value, 'd').endOf('day');
+
+  const res = {
+    bool: {
+      must: [
+        {
+          range: {
+            [filter.type]: {
+              gt: today.valueOf(),
+              lt: nextNDays.valueOf()
+            }
+          }
+        }
+      ]
+    }
+  };
+
+  return res;
+};
+
+module.exports.lastNDays = (filter) => {
+  if (!filter.type) {
+    return null;
+  }
+
+  if (isNaN(filter.value)) {
+    return null;
+  }
+
+  const today = moment().startOf('day');
+
+  const lastNDays = moment().subtract(filter.value, 'd').endOf('day');
+
+  const res = {
+    bool: {
+      must: [
+        {
+          range: {
+            [filter.type]: {
+              lt: today.valueOf(),
+              gt: lastNDays.valueOf()
+            }
+          }
+        }
+      ]
+    }
+  };
+
+  return res;
+};
+
+module.exports.isBetween = (filter) => {
+  if (!filter.type) {
+    return null;
+  }
+
+  const param = (() => {
+    if (filter.field_type === 'date') {
+      return {
+        from: moment(filter.value).startOf('day').valueOf(),
+        to: moment(filter.second_value).endOf('day').valueOf()
+      };
+    }
+
+    if (filter.field_type === 'number') {
+      return {
+        from: parseInt(filter.value),
+        to: parseInt(filter.second_value)
+      };
+    }
+
+    return null;
+  })();
+
+  if (!param) {
+    return null;
+  }
+
+  return {
+    bool: {
+      must: [
+        {
+          range: {
+            [filter.type]: {
+              gte: param.from,
+              lte: param.to
+            }
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isNotEqual = (filter) => {
+  if (!filter.type) {
+    return null;
+  }
+
+  const mappingValue = (() => {
+    if (filter.field_type === 'date') {
+      const startOfDay = moment(filter.value).startOf('day').valueOf();
+      const endOfDay = moment(filter.value).endOf('day').valueOf();
+
+      return {
+        range: {
+          [filter.type]: {
+            gte: startOfDay,
+            lte: endOfDay
+          }
+        }
+      };
+    }
+
+    if (filter.field_type === 'number') {
+      return {
+        term: {
+          [filter.type]: {
+            value: parseInt(filter.value)
+          }
+        }
+      };
+    }
+
+    return {
+      term: {
+        [filter.type]: {
+          value: filter.value
+        }
+      }
+    };
+  })();
+
+  return {
+    bool: {
+      must_not: [mappingValue]
+    }
+  };
+};

package/helpers/sortScript.js

@@ -335,10 +335,12 @@ module.exports.projectFieldText = (order, value) => {
               if (fields[i].number != null) {
                 return '';
               }
-              
+
               textInfo = fields[i].text == null ? '' : fields[i].text;
+              if (fields[i].containsKey('computedText')) {
+                textInfo = fields[i].computedText == null ? textInfo : fields[i].computedText;
+              }
             }
-
           }
 
           return textInfo;

package/lib/fieldConditions.js

@@ -174,6 +174,24 @@ module.exports.conditions = {
       label: 'In The Last N Days',
       value: 'last_n_days'
     }
+  ],
+  user_select: [
+    {
+      label: 'Equals',
+      value: 'is_equal'
+    },
+    {
+      label: "Doesn't Equal",
+      value: 'not_equal'
+    },
+    {
+      label: 'Is Empty',
+      value: 'is_empty'
+    },
+    {
+      label: 'Is Not Empty',
+      value: 'is_not_empty'
+    }
   ]
 };
 

package/package.json

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

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

@@ -5,6 +5,7 @@ const { expect } = require('chai');
 
 // To test
 const projectFieldFilter = require('../../../helpers/projectFilter/projectFieldFilter');
+const projectFilter = require('../../../helpers/projectFilter/projectFilter');
 
 describe('projectFilter/projectFieldFilter', function () {
   const filters = [
@@ -879,3 +880,231 @@ describe('projectFilter/projectFieldFilter', function () {
     });
   });
 });
+
+describe('projectFilter/projectFilter', () => {
+  const filters = [
+    {
+      input: {
+        condition: 'is_equal',
+        field_id: '5a681cb0-0682-48a8-875f-a525c795d398',
+        type: 'created_at',
+        field_type: 'date',
+        value: 1677196800000,
+        second_value: ''
+      },
+      output: {
+        bool: {
+          must: [
+            {
+              range: {
+                created_at: {
+                  gte: 1677168000000,
+                  lte: 1677254399999
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      input: {
+        condition: 'not_equal',
+        field_id: '5a681cb0-0682-48a8-875f-a525c795d398',
+        type: 'created_at',
+        field_type: 'date',
+        value: 1677196800000,
+        second_value: ''
+      },
+      output: {
+        bool: {
+          must_not: [
+            {
+              range: {
+                created_at: {
+                  gte: 1677168000000,
+                  lte: 1677254399999
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    ...['before', 'less_than'].map(condition => ({
+      input: {
+        condition: condition,
+        field_id: '5a681cb0-0682-48a8-875f-a525c795d398',
+        type: 'created_at',
+        field_type: 'date',
+        value: 1677196800000,
+        second_value: ''
+      },
+      output: {
+        bool: {
+          must: [
+            {
+              range: {
+                created_at: {
+                  lt: 1677168000000
+                }
+              }
+            }
+          ]
+        }
+      }
+    })),
+    ...['after', 'greater_than'].map(condition => ({
+      input: {
+        condition: condition,
+        field_id: '5a681cb0-0682-48a8-875f-a525c795d398',
+        type: 'created_at',
+        field_type: 'date',
+        value: 1677196800000,
+        second_value: ''
+      },
+      output: {
+        bool: {
+          must: [
+            {
+              range: {
+                created_at: {
+                  gt: 1677254399999
+                }
+              }
+            }
+          ]
+        }
+      }
+    })),
+    {
+      input: {
+        condition: 'between',
+        field_id: '5a681cb0-0682-48a8-875f-a525c795d398',
+        type: 'created_at',
+        field_type: 'date',
+        value: 1677196800000,
+        second_value: 1677196800000
+      },
+      output: {
+        bool: {
+          must: [
+            {
+              range: {
+                created_at: {
+                  gte: 1677168000000,
+                  lte: 1677254399999
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      input: {
+        condition: 'next_n_days',
+        field_id: '5a681cb0-0682-48a8-875f-a525c795d398',
+        type: 'created_at',
+        field_type: 'date',
+        value: 5,
+        second_value: ''
+      },
+      output: {
+        bool: {
+          must: [
+            {
+              range: {
+                created_at: {
+                  gt: 1682524800000,
+                  lt: 1683043199999
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      input: {
+        condition: 'last_n_days',
+        field_id: '5a681cb0-0682-48a8-875f-a525c795d398',
+        type: 'created_at',
+        field_type: 'date',
+        value: 3,
+        second_value: ''
+      },
+      output: {
+        bool: {
+          must: [
+            {
+              range: {
+                created_at: {
+                  lt: 1682524800000,
+                  gt: 1682351999999
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      input: {
+        condition: 'is_empty',
+        field_id: '',
+        type: 'created_at',
+        field_type: 'date',
+        value: '',
+        second_value: ''
+      },
+      output: {
+        bool: {
+          must: [
+            {
+              term: {
+                created_at: {
+                  value: ""
+                }
+              }
+            }
+          ]
+        }
+      }
+    },
+    {
+      input: {
+        condition: 'is_not_empty',
+        field_id: '',
+        type: 'created_at',
+        field_type: 'date',
+        value: '',
+        second_value: ''
+      },
+      output: {
+        bool: {
+          must_not: [
+            {
+              term: {
+                created_at: {
+                  value: ""
+                }
+              }
+            }
+          ]
+        }
+      }
+    }
+  ];
+
+  filters.forEach((filter) => {
+    it(`${filter.input.condition}: ${JSON.stringify(
+      filter.input.value
+    )}`, (done) => {
+      const observed = projectFilter(filter.input);
+
+      expect(observed).to.deep.equal(filter.output);
+      done();
+    });
+  });
+});