@outliant/sunrise-utils 1.3.9 → 1.4.0

package/CHANGELOG.md

@@ -4,9 +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.4.0](https://github.com/outliant/sunrise-utils/compare/1.3.10...1.4.0)
+
+- chore: refactor task/project pipeline common filters #86b4dg28t [`54a12a9`](https://github.com/outliant/sunrise-utils/commit/54a12a9e80ea402825bd64589efdf91b65c207a1)
+
+#### [1.3.10](https://github.com/outliant/sunrise-utils/compare/1.3.9...1.3.10)
+
+> 27 March 2025
+
+- chore(release): 1.3.10 [`f5348f0`](https://github.com/outliant/sunrise-utils/commit/f5348f0115b50d232fb85fe4cd1f3201116da6a6)
+- chore: task_age updates [`02ad141`](https://github.com/outliant/sunrise-utils/commit/02ad141886dc8ae4a16da3173a016402316fbae3)
+
 #### [1.3.9](https://github.com/outliant/sunrise-utils/compare/1.3.8...1.3.9)
 
+> 22 March 2025
+
 - chore: updated project pipeline critical path filter [`65eab79`](https://github.com/outliant/sunrise-utils/commit/65eab7911843b69045eb5ce8e2ba43e18982c15c)
+- chore(release): 1.3.9 [`b8b7218`](https://github.com/outliant/sunrise-utils/commit/b8b7218eb9a38200f3f6f47aaec6e3ec36ea5a0a)
 
 #### [1.3.8](https://github.com/outliant/sunrise-utils/compare/1.3.7...1.3.8)
 

package/helpers/commonFilter.js

@@ -0,0 +1,630 @@
+const moment = require('moment');
+
+const splitString = require('./splitString');
+const { isNoneOf } = require('./common');
+
+module.exports = (filter) => {
+  if (!filter.type) return null;
+
+  switch (filter.condition) {
+    case 'contains_any':
+      return module.exports.containsAny(filter);
+    case 'contains_none':
+      return module.exports.containsNone(filter);
+    case 'contains_all':
+      return module.exports.containsAll(filter);
+    case 'is_any_of':
+      return module.exports.isAnyOf(filter);
+    case 'is_empty':
+      return module.exports.isEmpty(filter);
+    case 'is_any_of':
+      return module.exports.isAnyOf(filter);
+    case 'is_not_empty':
+      return module.exports.isNotEmpty(filter);
+    case 'is_equal':
+      if (filter.type === 'ready_at') {
+        return module.exports.isReadyAt(filter);
+      }
+      return module.exports.isEqual(filter);
+    case 'not_equal':
+      return module.exports.isNotEqual(filter);
+    case 'is_none_of':
+      return isNoneOf(filter, module.exports.isEqual);
+    case 'before':
+    case 'less_than':
+      return module.exports.isBefore(filter);
+    case 'after':
+    case 'greater_than':
+      return module.exports.isAfter(filter);
+    case 'less_than_or_equal':
+      return module.exports.isBeforeIncludeParam(filter);
+    case 'greater_than_or_equal':
+      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);
+    case 'greater_n_days_ago':
+      return module.exports.greaterNDaysAgo(filter);
+    case 'is_true':
+      return module.exports.isTrue(filter);
+    case 'is_false':
+      return module.exports.isFalse(filter);
+    default:
+      return null;
+  }
+};
+
+module.exports.containsAny = (filter) => {
+  const type = filter.field_type || filter.type;
+
+  if (['text', 'textarea'].includes(type)) {
+    return {
+      match: {
+        [filter.type]: {
+          query: filter.value,
+          fuzziness: 'AUTO'
+        }
+      }
+    };
+  } else if (['checkbox', 'select'].includes(type)) {
+    const value =
+      typeof filter.value === 'string'
+        ? splitString(filter.value)
+        : filter.value;
+
+    return {
+      terms: {
+        [filter.type]: value
+      }
+    };
+  }
+
+  return null;
+};
+
+module.exports.containsAll = (filter) => {
+  const type = filter.field_type || filter.type;
+
+  if (['text', 'textarea'].includes(type)) {
+    return {
+      match: {
+        [filter.type]: {
+          query: filter.value,
+          fuzziness: 'AUTO'
+        }
+      }
+    };
+  } else if (['checkbox', 'select'].includes(type)) {
+    const value =
+      typeof filter.value === 'string'
+        ? splitString(filter.value)
+        : filter.value;
+
+    return {
+      bool: {
+        must: value.map((val) => ({
+          term: {
+            [filter.type]: {
+              value: val
+            }
+          }
+        }))
+      }
+    };
+  }
+
+  return null;
+};
+
+module.exports.containsNone = (filter) => {
+  const type = filter.field_type || filter.type;
+
+  if (['text', 'textarea'].includes(type)) {
+    return {
+      bool: {
+        must_not: [
+          {
+            match: {
+              [filter.type]: {
+                query: filter.value,
+                fuzziness: 'AUTO'
+              }
+            }
+          }
+        ]
+      }
+    };
+  } else if (['checkbox', 'select'].includes(type)) {
+    const value =
+      typeof filter.value === 'string'
+        ? splitString(filter.value)
+        : filter.value;
+
+    return {
+      bool: {
+        must_not: [
+          {
+            terms: {
+              [filter.type]: value
+            }
+          }
+        ]
+      }
+    };
+  }
+
+  return null;
+};
+
+module.exports.isAnyOf = (filter) => {
+  const type = filter.field_type || filter.type;
+
+  if (['text', 'textarea'].includes(type)) {
+    return {
+      match: {
+        [filter.type]: {
+          query: filter.value,
+          fuzziness: 'AUTO'
+        }
+      }
+    };
+  } else {
+    const value =
+      typeof filter.value === 'string'
+        ? splitString(filter.value)
+        : filter.value;
+
+    return {
+      terms: {
+        [filter.type]: value
+      }
+    };
+  }
+};
+
+module.exports.isEmpty = (filter) => {
+  if (filter.field_type === 'text' || filter.field_type === 'textarea') {
+    return {
+      bool: {
+        should: [
+          {
+            bool: {
+              must_not: [
+                {
+                  exists: {
+                    field: filter.type
+                  }
+                }
+              ]
+            }
+          },
+          {
+            bool: {
+              must_not: [
+                {
+                  wildcard: {
+                    [filter.type]: {
+                      value: '?*'
+                    }
+                  }
+                }
+              ]
+            }
+          },
+          {
+            term: {
+              [filter.type]: {
+                value: ''
+              }
+            }
+          }
+        ]
+      }
+    };
+  }
+  return {
+    bool: {
+      should: [
+        {
+          term: {
+            [filter.type]: {
+              value: ''
+            }
+          }
+        },
+        {
+          bool: {
+            must_not: [
+              {
+                exists: {
+                  field: filter.type
+                }
+              }
+            ]
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isNotEmpty = (filter) => {
+  if (filter.field_type === 'text' || filter.field_type === 'textarea') {
+    return {
+      bool: {
+        must: [
+          {
+            exists: {
+              field: filter.type
+            }
+          },
+          {
+            wildcard: {
+              [filter.type]: {
+                value: '?*'
+              }
+            }
+          },
+          {
+            bool: {
+              must_not: [
+                {
+                  term: {
+                    [filter.type]: {
+                      value: ''
+                    }
+                  }
+                }
+              ]
+            }
+          }
+        ]
+      }
+    };
+  }
+
+  return {
+    bool: {
+      must_not: [
+        {
+          term: {
+            [filter.type]: {
+              value: ''
+            }
+          }
+        }
+      ],
+      must: [
+        {
+          exists: {
+            field: filter.type
+          }
+        }
+      ]
+    }
+  };
+};
+
+module.exports.isEqual = (filter) => {
+  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 === 'textarea') {
+    return {
+      query_string: {
+        fields: [filter.type],
+        query: `*${filter.value}*`
+      }
+    };
+  }
+
+  if (filter.field_type === 'checkbox') {
+    const value =
+      typeof filter.value === 'string'
+        ? splitString(filter.value)
+        : filter.value;
+
+    const should = [];
+
+    value.forEach((x) => {
+      should.push({
+        match: {
+          [`${filter.type}.analyzed`]: {
+            query: x,
+            operator: 'and'
+          }
+        }
+      });
+
+      should.push({
+        term: {
+          [filter.type]: {
+            value: x
+          }
+        }
+      });
+    });
+
+    return {
+      bool: {
+        should
+      }
+    };
+  }
+
+  if (filter.field_type === 'number') {
+    return {
+      term: {
+        [filter.type]: {
+          value: parseInt(filter.value)
+        }
+      }
+    };
+  }
+
+  return {
+    term: {
+      [filter.type]: {
+        value: filter.value
+      }
+    }
+  };
+};
+
+module.exports.isReadyAt = (filter) => {
+  const startOfDay = moment(filter.value).startOf('day').valueOf();
+  const endOfDay = moment(filter.value).endOf('day').valueOf();
+
+  return {
+    script: {
+      script: {
+        source: `
+          try {
+            def filterType = params.filterType;
+            def taskFilter = doc[filterType];
+
+            if (taskFilter.size() == 0) {
+              return false;
+            }
+
+            long startOfDay = params.startOfDay;
+            long endOfDay = params.endOfDay;
+
+            if (
+              filterType == 'ready_at' &&
+              doc['is_complete'].size() != 0 &&
+              doc['is_complete'].value == true &&
+              doc['completed_at'].size() != 0
+            ) {
+              long completedAt = doc['completed_at'].value.millis;
+              return completedAt >= startOfDay && completedAt <= endOfDay;
+            } else {
+              long taskFilterValue = taskFilter.value.millis;
+              return taskFilterValue >= startOfDay && taskFilterValue <= endOfDay;
+            }
+          } catch(Exception err){
+            return false;
+          }`,
+        lang: 'painless',
+        params: {
+          startOfDay,
+          endOfDay,
+          filterType: filter.type
+        }
+      }
+    }
+  };
+};
+
+module.exports.isBefore = (filter) => {
+  let param;
+
+  if (filter.field_type === 'date') {
+    param = moment(filter.value).startOf('day').valueOf();
+  } else if (filter.field_type === 'number') {
+    param = parseInt(filter.value);
+  } else {
+    return null;
+  }
+
+  return {
+    range: {
+      [filter.type]: {
+        lt: param
+      }
+    }
+  };
+};
+
+module.exports.isAfter = (filter) => {
+  let param;
+
+  if (filter.field_type === 'date') {
+    param = moment(filter.value).endOf('day').valueOf();
+  } else if (filter.field_type === 'number') {
+    param = parseInt(filter.value);
+  } else {
+    return null;
+  }
+
+  return {
+    range: {
+      [filter.type]: {
+        gt: param
+      }
+    }
+  };
+};
+
+module.exports.nextNDays = (filter) => {
+  if (isNaN(filter.value)) {
+    return null;
+  }
+
+  return {
+    range: {
+      [filter.type]: {
+        lt: `now/d+${filter.value}d`,
+        gt: 'now/d'
+      }
+    }
+  };
+};
+
+module.exports.lastNDays = (filter) => {
+  if (isNaN(filter.value)) {
+    return null;
+  }
+
+  return {
+    range: {
+      [filter.type]: {
+        gt: `now/d-${filter.value}d`,
+        lt: 'now/d'
+      }
+    }
+  };
+};
+
+module.exports.greaterNDaysAgo = (filter) => {
+  if (isNaN(filter.value)) {
+    return null;
+  }
+
+  return {
+    range: {
+      [filter.type]: {
+        lt: `now/d-${filter.value}d`
+      }
+    }
+  };
+};
+
+module.exports.isBeforeIncludeParam = (filter) => {
+  let param;
+
+  if (filter.field_type === 'date') {
+    param = moment(filter.value).endOf('day').valueOf();
+  } else if (filter.field_type === 'number') {
+    param = parseInt(filter.value);
+  } else {
+    return null;
+  }
+
+  return {
+    range: {
+      [filter.type]: {
+        lte: param
+      }
+    }
+  };
+};
+
+module.exports.isAfterIncludeParam = (filter) => {
+  let param;
+
+  if (filter.field_type === 'date') {
+    param = moment(filter.value).endOf('day').valueOf();
+  } else if (filter.field_type === 'number') {
+    param = parseInt(filter.value);
+  } else {
+    return null;
+  }
+
+  return {
+    range: {
+      [filter.type]: {
+        gte: param
+      }
+    }
+  };
+};
+
+module.exports.isBetween = (filter) => {
+  let firstParam;
+  let secondParam;
+
+  if (filter.field_type === 'date') {
+    firstParam = moment(filter.value).startOf('day').valueOf();
+    secondParam = moment(filter.second_value).endOf('day').valueOf();
+  } else if (filter.field_type === 'number') {
+    firstParam = parseInt(filter.value);
+    secondParam = parseInt(filter.second_value);
+  } else {
+    return null;
+  }
+
+  return {
+    range: {
+      [filter.type]: {
+        gte: firstParam,
+        lte: secondParam
+      }
+    }
+  };
+};
+
+module.exports.isNotEqual = (filter) => {
+  const equalFilter = module.exports.isEqual(filter);
+
+  if (equalFilter) {
+    return {
+      bool: {
+        must_not: equalFilter
+      }
+    };
+  }
+
+  return null;
+};
+
+module.exports.isTrue = (filter) => {
+  if (filter.field_type !== 'boolean') return null;
+
+  return {
+    term: {
+      [filter.type]: {
+        value: true
+      }
+    }
+  };
+};
+
+module.exports.isFalse = (filter) => {
+  if (filter.field_type !== 'boolean') return null;
+
+  return {
+    bool: {
+      should: [
+        {
+          match: {
+            [filter.type]: false
+          }
+        },
+        {
+          bool: {
+            must_not: {
+              exists: {
+                field: filter.type
+              }
+            }
+          }
+        }
+      ]
+    }
+  };
+};

package/helpers/projectFilter/index.js

@@ -4,9 +4,10 @@ const buildCriticalPathAgeFilter = require('./criticalPathAgeFilter');
 const buildOnHoldFilter = require('./onHoldFilter');
 const buildIsPausedFilter = require('./isPausedFilter');
 const buildIsGeneratedFilter = require('./isGeneratedFilter');
+const buildProjectIdFilter = require('./projectIdFilter');
 const buildTagFilter = require('./tagFilter');
 const buildProjectFieldFilter = require('./projectFieldFilter');
-const buildProjectFilter = require('./projectFilter');
+const buildCommonFilter = require('../commonFilter');
 const { PROJECT_BANNERS } = require('../../constants');
 
 module.exports.defaultCustomColumns = [
@@ -143,6 +144,8 @@ module.exports.defaultFilterSetting = {
 
 module.exports.buildProjectPipelineFilter = (filter) => {
   switch (filter.type) {
+    case 'project_id':
+      return buildProjectIdFilter(filter);
     case 'tags':
       return buildTagFilter(filter);
     case 'region':
@@ -162,6 +165,6 @@ module.exports.buildProjectPipelineFilter = (filter) => {
     case 'contactPropertyMappings':
       return buildProjectFieldFilter(filter);
     default:
-      return buildProjectFilter(filter);
+      return buildCommonFilter(filter);
   }
 };

package/helpers/projectFilter/projectIdFilter.js

@@ -0,0 +1,62 @@
+module.exports = (filter) => {
+  switch (filter.condition) {
+    case 'is_equal':
+      return module.exports.isEqual(filter);
+    case 'not_equal':
+      return module.exports.isNotEqual(filter);
+    case 'is_any_of':
+      return module.exports.isEqual(filter);
+    case 'is_none_of':
+      return module.exports.isNotEqual(filter);
+    case 'contains_any':
+      return module.exports.containsAny(filter);
+    case 'contains_none':
+      return module.exports.containsNone(filter);
+    default:
+      return null;
+  }
+};
+
+module.exports.isEqual = (filter) => {
+  return {
+    match: {
+      _id: filter.value
+    }
+  };
+};
+
+module.exports.isNotEqual = (filter) => {
+  return {
+    bool: {
+      must_not: {
+        match: {
+          _id: filter.value
+        }
+      }
+    }
+  };
+};
+
+module.exports.containsAny = (filter) => {
+  return {
+    wildcard: {
+      id: {
+        value: `*${(filter.value || '').toUpperCase()}*`
+      }
+    }
+  };
+};
+
+module.exports.containsNone = (filter) => {
+  return {
+    bool: {
+      must_not: {
+        wildcard: {
+          id: {
+            value: `*${(filter.value || '').toUpperCase()}*`
+          }
+        }
+      }
+    }
+  };
+};

package/helpers/searchFilter.js

@@ -1,8 +1,7 @@
 const { validate: isUuid } = require('uuid');
 const { escapeElasticQuery } = require('./es');
-const _ = require('lodash');
 
-module.exports = (query = {}, searchFields = [], isGlobalSearch = false) => {
+module.exports = (query = {}, searchFields = []) => {
   const search = query.search;
   let searchString = search.trim();
 
@@ -19,42 +18,30 @@ module.exports = (query = {}, searchFields = [], isGlobalSearch = false) => {
   const localFields = searchFields.filter((x) => x !== '_id' && !isUuid(x));
 
   if (searchFields.includes('_id')) {
-    should.push(
-      isGlobalSearch
-        ? {
-            bool: {
-              should: _.flatMap(
-                _.split(_.replace(searchString, /ser-|com-/gi, ''), ' ').filter(Boolean),
-                term => [
-                  { term: { _id: `SER-${term}` } },
-                  { term: { _id: `COM-${term}` } },
-                  { term: { _id: term } }
-                ]
-              )
-            }
-          }
-        : {
-            term: {
-              _id: {
-                value: searchString
-              }
-            }
-          }
-    );
+    should.push({
+      match: {
+        _id: searchString
+      }
+    });
   }
 
-  if (!isGlobalSearch) {
-    /**
-     * For case insensitive id search with hyphen
-     */
-    _.split(search, '-').forEach(keyword => {
-      should.push({
-        wildcard: {
-          id: {
-            value: `*${keyword}*`
-          }
+  if (searchFields.includes('id')) {
+    should.push({
+      wildcard: {
+        id: {
+          value: `*${searchString.toUpperCase()}*`
         }
-      });
+      }
+    });
+  }
+
+  if (searchFields.includes('project_id')) {
+    should.push({
+      wildcard: {
+        project_id: {
+          value: `*${searchString.toUpperCase()}*`
+        }
+      }
     });
   }
 

package/helpers/taskFilter/index.js

@@ -3,6 +3,7 @@ const buildOwnerFilter = require('./ownerFilter');
 const buildPathAgeFilter = require('./pathAgeFilter');
 const buildRegionFilter = require('./regionFilter');
 const buildTaskFieldFilter = require('./taskFieldFilter');
+const buildProjectIdFilter = require('./projectIdFilter');
 const buildCriticalPathFilter = require('./criticalPathFilter');
 const buildOnHoldFilter = require('./onHoldFilter');
 const buildIsPausedFilter = require('./isPausedFilter');
@@ -11,6 +12,7 @@ const buildDaysToCompleteFilter = require('./daysToComplete');
 const buildAgeColorFilter = require('./buildAgeColorFilter');
 const buildWasMarkedIncompleteFilter = require('./wasMarkedIncomplete');
 const buildProjectFieldFilter = require('../projectFilter/projectFieldFilter');
+const buildCommonFilter = require('../commonFilter');
 const { PROJECT_BANNERS } = require('../../constants');
 const splitString = require('../splitString');
 
@@ -274,7 +276,7 @@ module.exports.defaultCustomColumns = [
     type: 'task_age',
     field_type: 'select',
     options: module.exports.taskAgeColorOptions,
-    select_fields: []
+    select_fields: ['ready_at']
   }
 ];
 
@@ -327,6 +329,8 @@ module.exports.defaultFilterSetting = {
 
 module.exports.buildTaskPipelineFilter = (filter, starredTaskIds) => {
   switch (filter.type) {
+    case 'project_id':
+      return buildProjectIdFilter(filter);
     case 'status':
       return buildStatusFilter(filter);
     case 'owner':
@@ -390,7 +394,6 @@ module.exports.buildTaskPipelineFilter = (filter, starredTaskIds) => {
     case 'is_starred':
       return buildIsStarredFilter(filter, starredTaskIds);
     default:
-      // Task Fields
-      return buildTaskFieldFilter(filter);
+      return buildCommonFilter(filter);
   }
 };

package/helpers/taskFilter/projectIdFilter.js

@@ -0,0 +1,62 @@
+module.exports = (filter) => {
+  switch (filter.condition) {
+    case 'is_equal':
+      return module.exports.isEqual(filter);
+    case 'not_equal':
+      return module.exports.isNotEqual(filter);
+    case 'is_any_of':
+      return module.exports.isEqual(filter);
+    case 'is_none_of':
+      return module.exports.isNotEqual(filter);
+    case 'contains_any':
+      return module.exports.containsAny(filter);
+    case 'contains_none':
+      return module.exports.containsNone(filter);
+    default:
+      return null;
+  }
+};
+
+module.exports.isEqual = (filter) => {
+  return {
+    match: {
+      project_id: filter.value
+    }
+  };
+};
+
+module.exports.isNotEqual = (filter) => {
+  return {
+    bool: {
+      must_not: {
+        match: {
+          project_id: filter.value
+        }
+      }
+    }
+  };
+};
+
+module.exports.containsAny = (filter) => {
+  return {
+    wildcard: {
+      project_id: {
+        value: `*${(filter.value || '').toUpperCase()}*`
+      }
+    }
+  };
+};
+
+module.exports.containsNone = (filter) => {
+  return {
+    bool: {
+      must_not: {
+        wildcard: {
+          project_id: {
+            value: `*${(filter.value || '').toUpperCase()}*`
+          }
+        }
+      }
+    }
+  };
+};

package/lib/taskPipeline.js

@@ -129,6 +129,7 @@ class TaskPipeline {
             taskPipelinesSort.push(sortScript.projectId(sort));
             break;
 
+          case s === 'task_age':
           case s === 'ready_at':
             taskPipelinesSort.push(sortScript.readyAt(sort));
             break;

package/package.json

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

package/test/lib/projectPipeline.spec.js

@@ -2,7 +2,6 @@
 
 /* eslint-env node, mocha */
 const { expect } = require('chai');
-const _ = require('lodash');
 
 const projectPipeline = require('../../lib/projectPipeline');
 
@@ -17,48 +16,19 @@ describe('projectPipeline', function () {
         expected: {
           bool: {
             must: [
-              {
-                term: {
-                  organization_id: {
-                    value: ORG_ID
-                  }
-                }
-              },
-              {
-                term: {
-                  department_id: {
-                    value: DEPARTMENT_ID
-                  }
-                }
-              },
+              { term: { organization_id: { value: 'orgId' } } },
+              { term: { department_id: { value: 'department_id' } } },
               {
                 bool: {
                   should: [
-                    {
-                      wildcard: {
-                        id: {
-                          value: '*COM*'
-                        }
-                      }
-                    },
-                    {
-                      wildcard: {
-                        id: {
-                          value: '*41853*'
-                        }
-                      }
-                    },
+                    { wildcard: { project_id: { value: '*COM-41853*' } } },
                     {
                       multi_match: {
                         query: 'COM-41853',
                         fields: ['project_id^5']
                       }
                     },
-                    {
-                      match_phrase_prefix: {
-                        name: 'COM-41853'
-                      }
-                    }
+                    { match_phrase_prefix: { name: 'COM-41853' } }
                   ]
                 }
               }
@@ -71,48 +41,19 @@ describe('projectPipeline', function () {
         expected: {
           bool: {
             must: [
-              {
-                term: {
-                  organization_id: {
-                    value: ORG_ID
-                  }
-                }
-              },
-              {
-                term: {
-                  department_id: {
-                    value: DEPARTMENT_ID
-                  }
-                }
-              },
+              { term: { organization_id: { value: 'orgId' } } },
+              { term: { department_id: { value: 'department_id' } } },
               {
                 bool: {
                   should: [
-                    {
-                      wildcard: {
-                        id: {
-                          value: '*com*'
-                        }
-                      }
-                    },
-                    {
-                      wildcard: {
-                        id: {
-                          value: '*41853*'
-                        }
-                      }
-                    },
+                    { wildcard: { project_id: { value: '*COM-41853*' } } },
                     {
                       multi_match: {
                         query: 'com-41853',
                         fields: ['project_id^5']
                       }
                     },
-                    {
-                      match_phrase_prefix: {
-                        name: 'com-41853'
-                      }
-                    }
+                    { match_phrase_prefix: { name: 'com-41853' } }
                   ]
                 }
               }
@@ -125,41 +66,16 @@ describe('projectPipeline', function () {
         expected: {
           bool: {
             must: [
-              {
-                term: {
-                  organization_id: {
-                    value: ORG_ID
-                  }
-                }
-              },
-              {
-                term: {
-                  department_id: {
-                    value: DEPARTMENT_ID
-                  }
-                }
-              },
+              { term: { organization_id: { value: 'orgId' } } },
+              { term: { department_id: { value: 'department_id' } } },
               {
                 bool: {
                   should: [
+                    { wildcard: { project_id: { value: '*41853*' } } },
                     {
-                      wildcard: {
-                        id: {
-                          value: '*41853*'
-                        }
-                      }
-                    },
-                    {
-                      multi_match: {
-                        query: '41853',
-                        fields: ['project_id^5']
-                      }
+                      multi_match: { query: '41853', fields: ['project_id^5'] }
                     },
-                    {
-                      match_phrase_prefix: {
-                        name: '41853'
-                      }
-                    }
+                    { match_phrase_prefix: { name: '41853' } }
                   ]
                 }
               }
@@ -180,7 +96,7 @@ describe('projectPipeline', function () {
           DEPARTMENT_ID,
           [],
           query,
-          ['project_id'],
+          ['project_id']
         );
 
         expect(result).to.deep.equal(entry.expected);
@@ -295,44 +211,33 @@ describe('projectPipeline', function () {
         params.projectSearchFields,
         true
       );
-
       expect(result).to.be.deep.equal({
         bool: {
           must: [
-            {
-              term: {
-                organization_id: { value: 'orgId' }
-              }
-            },
-            {
-              term: {
-                department_id: { value: 'department_id' }
-              }
-            },
+            { term: { organization_id: { value: 'orgId' } } },
+            { term: { department_id: { value: 'department_id' } } },
             {
               bool: {
                 should: [
                   {
-                    bool: {
-                      should: _.flatMap(
-                        _.split(_.replace(params.search, /ser-|com-/gi, ''), ' ').filter(Boolean),
-                        term => [
-                          { term: { _id: `SER-${term}` } },
-                          { term: { _id: `COM-${term}` } },
-                          { term: { _id: term } }
-                        ]
-                      )
+                    match: { _id: '41853 69 SER-69 allan DoNALD Vikram RalPH' }
+                  },
+                  {
+                    wildcard: {
+                      id: {
+                        value: '*41853 69 SER-69 ALLAN DONALD VIKRAM RALPH*'
+                      }
                     }
                   },
                   {
                     multi_match: {
-                      query: params.search,
+                      query: '41853 69 SER-69 allan DoNALD Vikram RalPH',
                       fields: ['name^5', 'id^5']
                     }
                   },
                   {
                     match_phrase_prefix: {
-                      name: params.search
+                      name: '41853 69 SER-69 allan DoNALD Vikram RalPH'
                     }
                   },
                   {
@@ -345,13 +250,17 @@ describe('projectPipeline', function () {
                               must: [
                                 {
                                   term: {
-                                    'fields.id': { value: '4ef2760a-083a-466b-b761-667856aeb5ee' }
+                                    'fields.id': {
+                                      value:
+                                        '4ef2760a-083a-466b-b761-667856aeb5ee'
+                                    }
                                   }
                                 },
                                 {
                                   match: {
                                     'fields.text.analyzed': {
-                                      query: params.search,
+                                      query:
+                                        '41853 69 SER-69 allan DoNALD Vikram RalPH',
                                       operator: 'or'
                                     }
                                   }
@@ -375,7 +284,10 @@ describe('projectPipeline', function () {
                                 must: [
                                   {
                                     term: {
-                                      'fields.id': { value: '4ef2760a-083a-466b-b761-667856aeb5ee' }
+                                      'fields.id': {
+                                        value:
+                                          '4ef2760a-083a-466b-b761-667856aeb5ee'
+                                      }
                                     }
                                   },
                                   {
@@ -384,14 +296,16 @@ describe('projectPipeline', function () {
                                         {
                                           match: {
                                             'fields.text.analyzed': {
-                                              query: params.search,
+                                              query:
+                                                '41853 69 SER-69 allan DoNALD Vikram RalPH',
                                               operator: 'and'
                                             }
                                           }
                                         },
                                         {
                                           match_phrase_prefix: {
-                                            'fields.text.analyzed': params.search
+                                            'fields.text.analyzed':
+                                              '41853 69 SER-69 allan DoNALD Vikram RalPH'
                                           }
                                         }
                                       ]