Merge pull request #401 from topcoder-platform/revert-400-hot-fix/groups-query

Revert "Hot fix/groups query"

Author: ThomasKranitsas

src/services/ChallengeService.js

@@ -414,12 +414,16 @@ async function searchChallenges (currentUser, criteria) {
       mustNotQuery.push({ exists: { field: 'groups' } })
     } else if (!currentUser.isMachine && !helper.hasAdminRole(currentUser)) {
       // If the user is not M2M and is not an admin, return public + challenges from groups the user can access
-      groupsQuery.push({ terms: { groups: accessibleGroups } })
+      _.each(accessibleGroups, (g) => {
+        groupsQuery.push({ match_phrase: { groups: g } })
+      })
       // include public challenges
       groupsQuery.push({ bool: { must_not: { exists: { field: 'groups' } } } })
     }
   } else {
-    groupsQuery.push({ terms: { groups: groupsToFilter } })
+    _.each(groupsToFilter, (g) => {
+      groupsQuery.push({ match_phrase: { groups: g } })
+    })
   }
 
   if (criteria.ids) {