@outliant/sunrise-utils 1.0.6 → 1.0.8

package/CHANGELOG.md

@@ -4,8 +4,22 @@ 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.8](https://github.com/outliant/sunrise-utils/compare/1.0.7...1.0.8)
+
+- chore: use match_phrase_prefix [`#3`](https://github.com/outliant/sunrise-utils/pull/3)
+- chore(#860q1ku0m): use match_phrase_prefix for fuzzy searching [`f607110`](https://github.com/outliant/sunrise-utils/commit/f607110d9071d02b0aeeb1a41dd0e8ee4b13d6f5)
+
+#### [1.0.7](https://github.com/outliant/sunrise-utils/compare/1.0.6...1.0.7)
+
+> 9 March 2023
+
+- chore: support multiple sorting #860px39yc [`133144d`](https://github.com/outliant/sunrise-utils/commit/133144d805126d301543e1df50510b982ea0f130)
+- chore(release): 1.0.7 [`617bf83`](https://github.com/outliant/sunrise-utils/commit/617bf83a2ac80e030b0a81e9cdce0bd719b9e27b)
+
 #### [1.0.6](https://github.com/outliant/sunrise-utils/compare/1.0.5...1.0.6)
 
+> 7 March 2023
+
 - Task/string contains filters #860pq6e4d [`#2`](https://github.com/outliant/sunrise-utils/pull/2)
 - chore: string contains filters [`2d80b31`](https://github.com/outliant/sunrise-utils/commit/2d80b31ac08ff5c1710373ccaae7c641333b5557)
 - chore: add contains  any/none filters [`eeec3bd`](https://github.com/outliant/sunrise-utils/commit/eeec3bdbce07ce6a9a782db3953c6926bfd24e4d)

package/helpers/projectFilter/projectFieldFilter.js

@@ -1,11 +1,11 @@
 const moment = require('moment');
 const { escapeElasticQuery } = require('../es');
 
-function getContainsMappingValue (filter) {
+function getContainsMappingValue(filter) {
   if (['text', 'textarea'].includes(filter.field_type)) {
     return {
       bool: {
-        must: [
+        should: [
           {
             match: {
               [`fields.text.analyzed`]: {
@@ -13,6 +13,11 @@ function getContainsMappingValue (filter) {
                 operator: 'and'
               }
             }
+          },
+          {
+            match_phrase_prefix: {
+              [`fields.text.analyzed`]: filter.value
+            }
           }
         ]
       }
@@ -85,9 +90,15 @@ module.exports.containsAny = (filter) => {
             }
           },
           {
-            nested: {
-              path: 'fields',
-              query: mapping
+            bool: {
+              should: [
+                {
+                  nested: {
+                    path: 'fields',
+                    query: mapping
+                  }
+                }
+              ]
             }
           }
         ]

package/helpers/searchFilter.js

@@ -43,6 +43,12 @@ module.exports = (query = {}, searchFields = []) => {
           fields: localFields.map((x) => `${x}^5`)
         }
       });
+
+      should.push({
+        match_phrase_prefix: {
+          name: parsedQuery
+        }
+      });
     }
   }
 

package/lib/projectPipeline.js

@@ -65,13 +65,13 @@ class ProjectPipeline {
   }
 
   buildSortScript(query = {}, customSort = []) {
-    const sort = query.sort || 'desc';
-    const sortBy = query.sortBy || 'created_at';
-    const sortByMultiple = sortBy.split(',');
+    const sortMultiple = (query.sort || 'desc').split(',');
+    const sortByMultiple = (query.sortBy || 'created_at').split(',');
     const projectPipelinesSort = [];
 
     if (sortByMultiple.length > 0) {
-      sortByMultiple.forEach((s) => {
+      sortByMultiple.forEach((s, i) => {
+        const sort = sortMultiple[i] || 'desc';
         if (isUuid(s)) {
           projectPipelinesSort.push(sortScript.projectFieldNumeric(sort, s));
           projectPipelinesSort.push(sortScript.projectFieldText(sort, s));
@@ -81,11 +81,11 @@ class ProjectPipeline {
           projectPipelinesSort.push(sortScript.criticalPathStage(sort));
         } else if (s === 'name') {
           projectPipelinesSort.push({
-            'name.raw': { order: query.sort, missing: '_last' }
+            'name.raw': { order: sort, missing: '_last' }
           });
         } else {
           projectPipelinesSort.push({
-            [s]: { order: query.sort, missing: '_last' }
+            [s]: { order: sort, missing: '_last' }
           });
         }
       });

package/lib/taskPipeline.js

@@ -84,46 +84,41 @@ class TaskPipeline {
   }
 
   buildSortScript(query = {}, customSort = []) {
-    const sort = query.sort || 'desc';
-    const sortBy = query.sortBy || 'created_at';
-    const sortByMultiple = sortBy.split(',');
+    const sortMultiple = (query.sort || 'desc').split(',');
+    const sortByMultiple = (query.sortBy || 'created_at').split(',');
     let taskPipelinesSort = [];
 
-    if (sortByMultiple.length > 0) {
-      if (sortByMultiple[0] === 'default') {
-        taskPipelinesSort = sortScript.default;
-      } else {
-        sortByMultiple.forEach((s) => {
-          if (s === 'region') {
-            taskPipelinesSort.push(sortScript.region(sort));
-          } else if (s === 'owner' || s === 'completed_by') {
-            taskPipelinesSort.push(sortScript.owner(sort));
-          } else if (s === 'status') {
-            taskPipelinesSort.push(sortScript.status(sort));
-          } else if (s === 'critical_path_stage') {
-            taskPipelinesSort.push(sortScript.criticalPathStage(sort));
-          } else if (s === 'project_id') {
-            // Sort numeric part of the Project ID
-            taskPipelinesSort.push(sortScript.projectId(sort));
-          } else if (s === 'ready_at') {
-            taskPipelinesSort.push(sortScript.readyAt(sort));
-          } else if (s === 'was_marked_incomplete') {
-            taskPipelinesSort.push(sortScript.wasMarkedIncomplete(sort));
-          } else if (s === 'last_comment_date') {
-            taskPipelinesSort.push(sortScript.lastCommentDate(sort));
-          } else if (isUuid(s)) {
-            taskPipelinesSort.push(sortScript.projectFieldNumeric(sort, s));
-            taskPipelinesSort.push(sortScript.projectFieldText(sort, s));
-          } else {
-            taskPipelinesSort.push({
-              [s]: { order: sort, missing: '_last' }
-            });
-          }
-        });
-      }
-    } else {
-      // Default sorting
+    if (sortByMultiple[0] === 'default') {
       taskPipelinesSort = sortScript.default;
+    } else {
+      sortByMultiple.forEach((s, i) => {
+        const sort = sortMultiple[i] || 'desc';
+        if (s === 'region') {
+          taskPipelinesSort.push(sortScript.region(sort));
+        } else if (s === 'owner' || s === 'completed_by') {
+          taskPipelinesSort.push(sortScript.owner(sort));
+        } else if (s === 'status') {
+          taskPipelinesSort.push(sortScript.status(sort));
+        } else if (s === 'critical_path_stage') {
+          taskPipelinesSort.push(sortScript.criticalPathStage(sort));
+        } else if (s === 'project_id') {
+          // Sort numeric part of the Project ID
+          taskPipelinesSort.push(sortScript.projectId(sort));
+        } else if (s === 'ready_at') {
+          taskPipelinesSort.push(sortScript.readyAt(sort));
+        } else if (s === 'was_marked_incomplete') {
+          taskPipelinesSort.push(sortScript.wasMarkedIncomplete(sort));
+        } else if (s === 'last_comment_date') {
+          taskPipelinesSort.push(sortScript.lastCommentDate(sort));
+        } else if (isUuid(s)) {
+          taskPipelinesSort.push(sortScript.projectFieldNumeric(sort, s));
+          taskPipelinesSort.push(sortScript.projectFieldText(sort, s));
+        } else {
+          taskPipelinesSort.push({
+            [s]: { order: sort, missing: '_last' }
+          });
+        }
+      });
     }
 
     if (customSort.length > 0) {

package/package.json

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

package/test/lib/taskPipeline.spec.js

@@ -159,4 +159,222 @@ describe('taskPipeline', function () {
       done();
     });
   });
+
+  describe('buildSortScript', () => {
+    it('should format sorting with default', (done) => {
+      const sort = taskPipeline.buildSortScript({
+        sort: 'desc',
+        sortBy: 'default'
+      });
+      expect(sort).to.deep.equal([
+        {
+          _script: {
+            type: 'number',
+            script: {
+              lang: 'painless',
+              source:
+                "\n          try {\n            boolean isReady = doc['is_ready'].value;\n            boolean isComplete = doc['is_complete'].value;\n\n            if (isReady == true && isComplete == false) {\n              return 1;\n            }\n\n            return 0;\n          } catch (Exception err) {\n            return 0;\n          }\n        "
+            },
+            order: 'desc'
+          }
+        },
+        {
+          _script: {
+            type: 'string',
+            script: {
+              lang: 'painless',
+              source:
+                "\n          try {\n            boolean isReady = doc['is_ready'].value;\n            boolean isComplete = doc['is_complete'].value;\n\n            if (isReady == true && isComplete == false) {\n              return doc['name'].value.raw;\n            }\n\n            return 'zzzzzzzz';\n          } catch (Exception err) {\n            return 'zzzzzzzz';\n          }\n        "
+            },
+            order: 'asc'
+          }
+        },
+        {
+          _script: {
+            type: 'number',
+            script: {
+              lang: 'painless',
+              source:
+                "\n          try {\n            boolean isReady = doc['is_ready'].value;\n            boolean isComplete = doc['is_complete'].value;\n\n            if (isReady == true && isComplete == true) {\n              return 1;\n            }\n\n            return 0;\n          } catch (Exception err) {\n            return 0;\n          }\n        "
+            },
+            order: 'desc'
+          }
+        },
+        {
+          _script: {
+            type: 'string',
+            script: {
+              lang: 'painless',
+              source:
+                "\n          try {\n            boolean isReady = doc['is_ready'].value;\n            boolean isComplete = doc['is_complete'].value;\n\n            if (isReady == true && isComplete == true) {\n              return doc['name'].value.raw;\n            }\n\n            return 'zzzzzzzz';\n          } catch (Exception err) {\n            return 'zzzzzzzz';\n          }\n        "
+            },
+            order: 'asc'
+          }
+        },
+        {
+          _script: {
+            type: 'number',
+            script: {
+              lang: 'painless',
+              source:
+                "\n          try {\n            boolean isReady = doc['is_ready'].value;\n            boolean isComplete = doc['is_complete'].value;\n\n            if (isReady == true && isComplete == true) {\n              return doc['completed_at'].value.millis;\n            }\n\n            return 0;\n          } catch (Exception err) {\n            return 0;\n          }\n        "
+            },
+            order: 'desc'
+          }
+        },
+        { 'name.raw': { order: 'asc' } },
+        { id: { order: 'asc' } }
+      ]);
+      done();
+    });
+    it('should format sorting and custom sort', (done) => {
+      const sort = taskPipeline.buildSortScript(
+        {
+          sort: 'asc,asc,asc',
+          sortBy:
+            'region,owner,completed_by,status,critical_path_stage,project_id,ready_at,was_marked_incomplete,last_comment_date,38d423bf-fc24-4183-b8b7-15420c89e318,id'
+        },
+        [
+          {
+            _script: {
+              type: 'number',
+              script: {
+                lang: 'painless',
+                source: `
+              if (params.starredTaskIds.contains(doc._id.value)) {
+                return 1;
+              } else {
+                return 0;
+              }
+            `,
+                params: {
+                  starredTaskIds: ['task-1', 'task-2']
+                }
+              },
+              order: 'desc'
+            }
+          }
+        ]
+      );
+      expect(sort).to.deep.equal([
+        {
+          _script: {
+            type: 'number',
+            script: {
+              lang: 'painless',
+              source:
+                '\n              if (params.starredTaskIds.contains(doc._id.value)) {\n                return 1;\n              } else {\n                return 0;\n              }\n            ',
+              params: { starredTaskIds: ['task-1', 'task-2'] }
+            },
+            order: 'desc'
+          }
+        },
+        { region_name: { order: 'asc' } },
+        {
+          _script: {
+            type: 'string',
+            script: {
+              lang: 'painless',
+              source:
+                "\n        try {\n          String owner = doc['owner'].value;\n\n          if (owner != '' && owner != null) {\n            return owner.toLowerCase();\n          }\n        } catch (Exception err) {}\n\n        return '';\n      "
+            },
+            order: 'asc'
+          }
+        },
+        {
+          _script: {
+            type: 'string',
+            script: {
+              lang: 'painless',
+              source:
+                "\n        try {\n          String owner = doc['owner'].value;\n\n          if (owner != '' && owner != null) {\n            return owner.toLowerCase();\n          }\n        } catch (Exception err) {}\n\n        return '';\n      "
+            },
+            order: 'asc'
+          }
+        },
+        {
+          _script: {
+            type: 'string',
+            script: {
+              lang: 'painless',
+              source:
+                "\n        try {\n          boolean isReady = doc['is_ready'].value;\n          boolean isComplete = doc['is_complete'].value;\n\n          if (isReady == true) {\n            if (isComplete == true) {\n              return 'completed';\n            }\n\n            return 'pending';\n          }\n\n          return 'new';\n        } catch (Exception err) {\n          return '';\n        }\n      "
+            },
+            order: 'desc'
+          }
+        },
+        {
+          _script: {
+            type: 'number',
+            script: {
+              lang: 'painless',
+              source:
+                "\n        try {\n          def stageIndex = doc['critical_path.stage_index'].value;\n          if (stageIndex != null) {\n            return stageIndex;\n          }\n          \n          return 9999999;\n        } catch (Exception err) {\n          return 9999999;\n        }\n      "
+            },
+            order: 'desc'
+          }
+        },
+        {
+          _script: {
+            type: 'number',
+            script: {
+              lang: 'painless',
+              source:
+                "\n        def projectNumber = params._source.project_id;\n        projectNumber = /[^0-9]/.matcher(projectNumber).replaceAll('');\n        return Integer.parseInt(projectNumber);\n      "
+            },
+            order: 'desc'
+          }
+        },
+        {
+          _script: {
+            type: 'number',
+            script: {
+              lang: 'painless',
+              source:
+                "\n        try {\n          boolean isReady = doc['is_ready'].value;\n          boolean isComplete = doc['is_complete'].value;\n\n          if (isReady == true && isComplete == true && doc.containsKey('completed_at') && !doc['completed_at'].empty) {\n            return doc['completed_at'].value.millis;\n          } else if (isReady == true && doc.containsKey('ready_at') && !doc['ready_at'].empty) {\n            return doc['ready_at'].value.millis;\n          }\n\n          return doc['created_at'].value.millis;\n        } catch (Exception err) {\n          return 0;\n        }\n      "
+            },
+            order: 'desc'
+          }
+        },
+        {
+          _script: {
+            type: 'number',
+            script: {
+              lang: 'painless',
+              source:
+                "\n        return doc['was_marked_incomplete'].empty\n          ? 0\n          : doc['was_marked_incomplete'].value ? 1 : 0;\n      "
+            },
+            order: 'desc'
+          }
+        },
+        { 'last_comment_data.created_at': { order: 'desc' } },
+        {
+          _script: {
+            type: 'number',
+            script: {
+              lang: 'painless',
+              source:
+                '\n        try {\n          def fields = params._source.fields;\n\n          for (int i=0; i<fields.size(); i++) {\n            if (fields[i].id.equals(params.value)) {\n              if (fields[i].number != null) {\n                return fields[i].number;\n              } else {\n                return -999999;\n              }\n            }\n          }\n\n          return -999999;\n        } catch (Exception err) {\n          return -999999;\n        }\n      ',
+              params: { value: '38d423bf-fc24-4183-b8b7-15420c89e318' }
+            },
+            order: 'desc'
+          }
+        },
+        {
+          _script: {
+            type: 'string',
+            script: {
+              lang: 'painless',
+              source:
+                "\n        try {\n          String textInfo = '';\n          def fields = params._source.fields;\n\n          for (int i=0; i<fields.size(); i++) {\n            if (fields[i].id.equals(params.value)) {\n\n              if (fields[i].number != null) {\n                return '';\n              }\n              \n              textInfo = fields[i].text == null ? '' : fields[i].text;\n            }\n\n          }\n\n          return textInfo;\n        } catch (Exception err) {\n          return '';\n        }\n      ",
+              params: { value: '38d423bf-fc24-4183-b8b7-15420c89e318' }
+            },
+            order: 'desc'
+          }
+        },
+        { id: { order: 'desc', missing: '_last' } }
+      ]);
+      done();
+    });
+  });
 });