Temp fix for the search challenges

Author: ThomasKranitsas

src/services/ChallengeService.js

@@ -172,26 +172,18 @@ async function searchChallenges (currentUser, criteria) {
     })
   }
 
-  const finalQuery = {
-    bool: {}
-  }
-
-  if (mustQuery.length > 0) {
-    finalQuery.bool.must = { ...mustQuery }
-  }
-
-  if (!_.isUndefined(mustNotQuery)) {
-    // TODO: this is breaking the search functionality because of dirty data
-    // finalQuery.bool.must_not = { ...mustNotQuery }
-  }
-
   const esQuery = {
     index: config.get('ES.ES_INDEX'),
     type: config.get('ES.ES_TYPE'),
     size: criteria.perPage,
     from: (criteria.page - 1) * criteria.perPage, // Es Index starts from 0
     body: {
-      query: mustQuery.length > 0 || !_.isUndefined(mustNotQuery) ? finalQuery : {
+      query: mustQuery.length > 0 || !_.isUndefined(mustNotQuery) ? {
+        bool: {
+          must: mustQuery,
+          must_not: mustNotQuery
+        }
+      } : {
         match_all: {}
       },
       sort: [{ 'created': { 'order': 'asc', 'missing': '_last', 'unmapped_type': 'String' } }]