Merge branch 'develop'

Author: James Cori

Diff for: src/init-es.js

@@ -34,6 +34,11 @@ const initES = async () => {
         id: { type: 'keyword' },
         name: {
           type: 'keyword',
+          fields: {
+            text: {
+              type: 'text'
+            }
+          },
           normalizer: 'custom_sort_normalizer'
         },
         prizeSets: {

Diff for: src/services/ChallengeService.js

@@ -226,14 +226,48 @@ async function searchChallenges (currentUser, criteria) {
     })
   }
 
+  const multiMatchQuery = []
   if (criteria.search) {
-    boolQuery.push({
-      bool: {
-        should: [
-          { match_phrase_prefix: { 'name': criteria.search } },
-          { match_phrase_prefix: { 'description': criteria.search } },
-          { match_phrase_prefix: { 'tags': criteria.search } }
-        ]
+    multiMatchQuery.push({
+      // exact match
+      multi_match: {
+        query: criteria.search,
+        fields: [
+          'name.text^7',
+          'tags^3',
+          'description^2'
+        ],
+        type: 'phrase_prefix',
+        boost: 5
+      }
+    })
+    multiMatchQuery.push({
+      // match 100% words
+      multi_match: {
+        query: criteria.search,
+        fields: [
+          'name.text^3.0',
+          'tags^2.5',
+          'description^1.0'
+        ],
+        type: 'most_fields',
+        minimum_should_match: '100%',
+        boost: 2.5
+      }
+    })
+    multiMatchQuery.push({
+      // fuzzy match
+      multi_match: {
+        query: criteria.search,
+        fields: [
+          'name.text^2.5',
+          'tags^1.5',
+          'description^1.0'
+        ],
+        type: 'most_fields',
+        minimum_should_match: '50%',
+        fuzziness: 'AUTO',
+        boost: 1
       }
     })
   } else {
@@ -538,6 +572,14 @@ async function searchChallenges (currentUser, criteria) {
     })
   }
 
+  if (multiMatchQuery) {
+    mustQuery.push({
+      bool: {
+        should: multiMatchQuery
+      }
+    })
+  }
+
   if (boolQuery.length > 0) {
     mustQuery.push({
       bool: {
@@ -872,9 +914,7 @@ async function createChallenge (currentUser, challenge) {
   const { billingAccountId, markup } = await helper.getProjectBillingInformation(_.get(challenge, 'projectId'))
   if (billingAccountId && _.isUndefined(_.get(challenge, 'billing.billingAccountId'))) {
     _.set(challenge, 'billing.billingAccountId', billingAccountId)
-  }
-  if (markup && _.isUndefined(_.get(challenge, 'billing.markup'))) {
-    _.set(challenge, 'billing.markup', markup)
+    _.set(challenge, 'billing.markup', markup || 0)
   }
   if (_.get(type, 'isTask')) {
     _.set(challenge, 'task.isTask', true)
@@ -1066,7 +1106,7 @@ createChallenge.schema = {
         value: Joi.number().min(0).required()
       })).min(1).required()
     })),
-    tags: Joi.array().items(Joi.string().required()), // tag names
+    tags: Joi.array().items(Joi.string()), // tag names
     projectId: Joi.number().integer().positive().required(),
     legacyId: Joi.number().integer().positive(),
     startDate: Joi.date(),
@@ -1252,9 +1292,7 @@ async function update (currentUser, challengeId, data, isFull) {
   const { billingAccountId, markup } = await helper.getProjectBillingInformation(_.get(challenge, 'projectId'))
   if (billingAccountId && _.isUndefined(_.get(challenge, 'billing.billingAccountId'))) {
     _.set(data, 'billing.billingAccountId', billingAccountId)
-  }
-  if (markup && _.isUndefined(_.get(challenge, 'billing.markup'))) {
-    _.set(data, 'billing.markup', markup)
+    _.set(data, 'billing.markup', markup || 0)
   }
   if (data.status) {
     if (data.status === constants.challengeStatuses.Active) {
@@ -1853,7 +1891,7 @@ fullyUpdateChallenge.schema = {
       url: Joi.string(),
       options: Joi.array().items(Joi.object())
     })),
-    tags: Joi.array().items(Joi.string().required()), // tag names
+    tags: Joi.array().items(Joi.string()), // tag names
     projectId: Joi.number().integer().positive().required(),
     legacyId: Joi.number().integer().positive(),
     startDate: Joi.date(),