@outliant/sunrise-utils 1.3.5 → 1.3.6

package/CHANGELOG.md

@@ -4,9 +4,16 @@ 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.3.6](https://github.com/outliant/sunrise-utils/compare/1.3.5...1.3.6)
+
+- chore: update project global search #86b428rnf [`#45`](https://github.com/outliant/sunrise-utils/pull/45)
+
 #### [1.3.5](https://github.com/outliant/sunrise-utils/compare/1.3.4...1.3.5)
 
+> 14 March 2025
+
 - chore: global search updates #86b428rnf [`#44`](https://github.com/outliant/sunrise-utils/pull/44)
+- chore(release): 1.3.5 [`18aa190`](https://github.com/outliant/sunrise-utils/commit/18aa190de0982257a215fa3060f1158b47269fed)
 
 #### [1.3.4](https://github.com/outliant/sunrise-utils/compare/1.3.3...1.3.4)
 

package/helpers/searchFilter.js

@@ -2,7 +2,7 @@ const { validate: isUuid } = require('uuid');
 const { escapeElasticQuery } = require('./es');
 const _ = require('lodash');
 
-module.exports = (query = {}, searchFields = []) => {
+module.exports = (query = {}, searchFields = [], isGlobalSearch = false) => {
   const search = query.search;
   let searchString = search.trim();
 
@@ -19,27 +19,37 @@ module.exports = (query = {}, searchFields = []) => {
   const localFields = searchFields.filter((x) => x !== '_id' && !isUuid(x));
 
   if (searchFields.includes('_id')) {
-    should.push({
-      term: {
-        _id: {
-          value: searchString
-        }
-      }
-    });
+    should.push(
+      isGlobalSearch
+        ? {
+            terms: {
+              _id: _.split(searchString, ' ') || []
+            }
+          }
+        : {
+            term: {
+              _id: {
+                value: searchString
+              }
+            }
+          }
+    );
   }
 
-  /**
-   * For case insensitive id search with hyphen
-   */
-  _.split(search, '-').forEach(keyword => {
-    should.push({
-      wildcard: {
-        id: {
-          value: `*${keyword}*`
+  if (!isGlobalSearch) {
+    /**
+     * For case insensitive id search with hyphen
+     */
+    _.split(search, '-').forEach(keyword => {
+      should.push({
+        wildcard: {
+          id: {
+            value: `*${keyword}*`
+          }
         }
-      }
+      });
     });
-  });
+  }
 
   if (localFields.length > 0) {
     if (isQueryQuoteWrapped) {

package/lib/projectPipeline.js

@@ -17,7 +17,8 @@ class ProjectPipeline {
     departmentId,
     filters = [],
     query = {},
-    searchFields = []
+    searchFields = [],
+    isGlobalSearch = false
   ) {
     const mustQuery = [
       {
@@ -48,7 +49,7 @@ class ProjectPipeline {
     }
 
     if (query.search && query.search.length > 0) {
-      const should = searchFilter(query, searchFields);
+      const should = searchFilter(query, searchFields, isGlobalSearch);
 
       if (should.length > 0) {
         mustQuery.push({

package/package.json

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

package/test/lib/projectPipeline.spec.js

@@ -6,9 +6,10 @@ const { expect } = require('chai');
 const projectPipeline = require('../../lib/projectPipeline');
 
 describe('projectPipeline', function () {
+  const ORG_ID = 'orgId';
+  const DEPARTMENT_ID = 'department_id';
+
   describe('buildFiltersQuery', () => {
-    const ORG_ID = 'orgId';
-    const DEPARTMENT_ID = 'department_id';
     const entries = [
       {
         search: 'COM-41853',
@@ -164,75 +165,24 @@ describe('projectPipeline', function () {
             ]
           }
         }
-      },
-      {
-        search: '41853',
-        departmentId: [DEPARTMENT_ID, 'test-departmentId-2'],
-        expected: {
-          bool: {
-            must: [
-              {
-                term: {
-                  organization_id: {
-                    value: ORG_ID
-                  }
-                }
-              },
-              {
-                terms: {
-                  department_id: [
-                    DEPARTMENT_ID,
-                    'test-departmentId-2'
-                  ]
-                }
-              },
-              {
-                bool: {
-                  should: [
-                    {
-                      wildcard: {
-                        id: {
-                          value: '*41853*'
-                        }
-                      }
-                    },
-                    {
-                      multi_match: {
-                        query: '41853',
-                        fields: ['project_id^5']
-                      }
-                    },
-                    {
-                      match_phrase_prefix: {
-                        name: '41853'
-                      }
-                    }
-                  ]
-                }
-              }
-            ]
-          }
-        }
       }
     ];
 
     entries.forEach((entry) => {
-      it(`it should search Project ID correctly for ${entry.search}`, (done) => {
+      it(`it should search Project ID correctly for ${entry.search}`, () => {
         const query = {
           search: entry.search
         };
 
         const result = projectPipeline.buildFiltersQuery(
           ORG_ID,
-          entry.departmentId || DEPARTMENT_ID,
+          DEPARTMENT_ID,
           [],
           query,
-          ['project_id']
+          ['project_id'],
         );
 
         expect(result).to.deep.equal(entry.expected);
-
-        done();
       });
     });
   });
@@ -321,5 +271,91 @@ describe('projectPipeline', function () {
         }
       });
     });
+
+    it('should generate es query source params for global search', () => {
+      const params = {
+        search: '41853 SER-69 COM-69',
+        projectSearchFields: [
+          'name',
+          'id',
+          '_id',
+          '4ef2760a-083a-466b-b761-667856aeb5ee'
+        ]
+      };
+      const query = {
+        search: params.search
+      };
+
+      const result = projectPipeline.buildFiltersQuery(
+        ORG_ID,
+        DEPARTMENT_ID,
+        [],
+        query,
+        params.projectSearchFields,
+        true
+      );
+
+      expect(result).to.be.deep.equal({
+        bool: {
+          must: [
+            { term: { organization_id: { value: ORG_ID } } },
+            { term: { department_id: { value: DEPARTMENT_ID } } },
+            {
+              bool: {
+                should: [
+                  { terms: { _id: params.search.split(' ') } },
+                  { multi_match: { query: params.search, fields: ['name^5', 'id^5'] } },
+                  { match_phrase_prefix: { name: params.search } },
+                  {
+                    function_score: {
+                      query: {
+                        nested: {
+                          path: 'fields',
+                          query: {
+                            bool: {
+                              must: [
+                                { term: { 'fields.id': { value: params.projectSearchFields[3] } } },
+                                { match: { 'fields.text.analyzed': { query: params.search, operator: 'or' } } }
+                              ]
+                            }
+                          }
+                        }
+                      },
+                      min_score: 15
+                    }
+                  },
+                  {
+                    bool: {
+                      must: [
+                        {
+                          nested: {
+                            path: 'fields',
+                            query: {
+                              bool: {
+                                must: [
+                                  { term: { 'fields.id': { value: params.projectSearchFields[3] } } },
+                                  {
+                                    bool: {
+                                      should: [
+                                        { match: { 'fields.text.analyzed': { query: params.search, operator: 'and' } } },
+                                        { match_phrase_prefix: { 'fields.text.analyzed': params.search } }
+                                      ]
+                                    }
+                                  }
+                                ]
+                              }
+                            }
+                          }
+                        }
+                      ]
+                    }
+                  }
+                ]
+              }
+            }
+          ]
+        }
+      });
+    });
   });
 });