Update keyword search to be a substring search instead of exact match. Also search on first name, last name and handle. Support special characters

Author: callmekatootie

src/common/es-helper.js

@@ -597,11 +597,14 @@ function setUserAttributesFiltersToEsQuery (filterClause, attributes) {
                 }
               }
             ],
-            should: attribute.value.map(val => ({
-              term: {
-                [USER_ATTRIBUTE.esDocumentValueQuery]: val
+            should: attribute.value.map(val => {
+              return {
+                query_string: {
+                  default_field: `${[USER_ATTRIBUTE.esDocumentValueStringQuery]}`,
+                  query: `*${val.replace(/  +/g, ' ').split(' ').join('* AND *')}*`
+                }
               }
-            })),
+            }),
             minimum_should_match: 1
           }
         }
@@ -610,6 +613,11 @@ function setUserAttributesFiltersToEsQuery (filterClause, attributes) {
   }
 }
 
+function hasNonAlphaNumeric(text) {
+  const regex = /^[A-Za-z0-9 ]+$/
+  return !regex.test(text)
+}
+
 /**
  * Get skillIds matching the search keyword
  *
@@ -618,14 +626,18 @@ function setUserAttributesFiltersToEsQuery (filterClause, attributes) {
  */
 async function searchSkills (keyword) {
   const queryDoc = DOCUMENTS.skill
+
+  let query = hasNonAlphaNumeric(keyword) ? `\\*${keyword}\\*` : `*${keyword}*`
+
   const esQuery = {
     index: queryDoc.index,
     type: queryDoc.type,
     body: {
       query: {
         query_string: {
           default_field: 'name',
-          query: `*${keyword}*`
+          minimum_should_match: '100%',
+          query
         }
       },
       _source: 'id'
@@ -640,19 +652,26 @@ async function searchSkills (keyword) {
 async function setUserSearchClausesToEsQuery (boolClause, keyword) {
   const skillIds = await searchSkills(keyword)
 
+  boolClause.should.push({
+    query_string: {
+      fields: ['firstName', 'lastName', 'handle'],
+      query: `*${keyword.replace(/  +/g, ' ').split(' ').join('* AND *')}*`
+    }
+  })
+
   boolClause.should.push({
     nested: {
       path: USER_ATTRIBUTE.esDocumentPath,
       query: {
         query_string: {
-          query: `*${keyword}*`,
+          query: hasNonAlphaNumeric(keyword) ? `\\*${keyword}\\*` : `*${keyword}*`,
           fields: [USER_ATTRIBUTE.esDocumentValueStringQuery]
         }
       }
     }
   }, {
     query_string: {
-      query: `*${keyword}*`,
+      query: hasNonAlphaNumeric(keyword) ? `\\*${keyword}\\*` : `*${keyword}*`,
       fields: [USER_FILTER_TO_MODEL.achievement.esDocumentValueQuery]
     }
   })
@@ -783,21 +802,27 @@ async function resolveUserFilterFromDb (filter, { handle }, organizationId) {
       }
     })
 
-    if (typeof filter.values === 'object') {
-      for (const value of filter.values) {
+    if (typeof filter.values !== 'object') {
+      filter.values = [filter.values]
+    }
+
+    for (const value of filter.values) {
+      if (value === 'true' || value === 'false') {
         esQueryClause.bool.should.push({
           term: {
             [filter.esDocumentValueQuery]: value
           }
         })
+      } else {
+        esQueryClause.bool.should.push({
+          query_string: {
+            default_field: `${filter.esDocumentValueQuery}`,
+            query: `*${value.replace(/  +/g, ' ').split(' ').join('* AND *')}*`
+          }
+        })
       }
-    } else {
-      esQueryClause.bool.should.push({
-        term: {
-          [filter.esDocumentValueQuery]: filter.values
-        }
-      })
     }
+
     esQueryClause.bool.minimum_should_match = 1
 
     return {
@@ -815,10 +840,18 @@ async function resolveUserFilterFromDb (filter, { handle }, organizationId) {
     }
 
     const model = filter.model
+
+    let filterValuesQuery = `${filter.queryField} like '%${filter.values[0]}%'`
+    const nFilterValues = filter.values.length
+    for (let i = 1; i < nFilterValues; i++) {
+      filterValuesQuery = `${filterValuesQuery} OR ${filter.queryField} like '%${filter.values[i]}%'`
+    }
+
     // TODO Use the service method instead of raw query
     const dbQueries = [
-      `${filter.queryField} in (${filter.values.map(f => `'${f}'`).join(',')})`
+      filterValuesQuery
     ]
+
     const results = await DBHelper.find(model, dbQueries)
     if (results.length > 0) {
       for (const { id } of results) {
@@ -1275,6 +1308,9 @@ async function searchUsers (authUser, filter, params) {
 
   const docs = await esClient.search(esQuery)
   const users = docs.hits.hits.map(hit => hit._source)
+
+  logger.debug('Enrich users')
+
   const result = await enrichUsers(users)
   // enrich groups
   for (const user of users) {