Merge branch 'dev' of github.com:topcoder-platform/challenge-api into dev

Author: jmgasper

.circleci/config.yml

@@ -87,6 +87,7 @@ workflows:
             only:
             - dev
             - feature/top-262-projectid-non-mandatory
+            - TOP-2364
 
     - "build-qa":
         context: org-global

src/services/ChallengeService.js

@@ -153,12 +153,6 @@ async function searchChallenges(currentUser, criteria) {
 
   const _hasAdminRole = hasAdminRole(currentUser);
 
-  const includeSelfService =
-    currentUser &&
-    (currentUser.isMachine ||
-      _hasAdminRole ||
-      _.includes(config.SELF_SERVICE_WHITELIST_HANDLES, currentUser.handle.toLowerCase()));
-
   const includedTrackIds = _.isArray(criteria.trackIds) ? criteria.trackIds : [];
   const includedTypeIds = _.isArray(criteria.typeIds) ? criteria.typeIds : [];
 
@@ -463,6 +457,7 @@ async function searchChallenges(currentUser, criteria) {
   }
 
   let sortByProp = criteria.sortBy ? criteria.sortBy : "created";
+
   const sortOrderProp = criteria.sortOrder ? criteria.sortOrder : "desc";
 
   const mustQuery = [];
@@ -647,83 +642,6 @@ async function searchChallenges(currentUser, criteria) {
     });
   }
 
-  if (!includeSelfService) {
-    mustQuery.push({
-      bool: {
-        should: [
-          { bool: { must_not: { exists: { field: "legacy.selfService" } } } },
-          ...(currentUser
-            ? [
-                {
-                  bool: {
-                    must: [
-                      {
-                        bool: {
-                          must_not: {
-                            match_phrase: {
-                              status: constants.challengeStatuses.New,
-                            },
-                          },
-                        },
-                      },
-                      {
-                        bool: {
-                          must_not: {
-                            match_phrase: {
-                              status: constants.challengeStatuses.Draft,
-                            },
-                          },
-                        },
-                      },
-                      {
-                        bool: {
-                          must_not: {
-                            match_phrase: {
-                              status: constants.challengeStatuses.Approved,
-                            },
-                          },
-                        },
-                      },
-                    ],
-                  },
-                },
-                {
-                  bool: {
-                    must: { match_phrase: { createdBy: currentUser.handle } },
-                  },
-                },
-              ]
-            : [
-                {
-                  bool: {
-                    should: [
-                      {
-                        bool: {
-                          must: {
-                            match_phrase: {
-                              status: constants.challengeStatuses.Active,
-                            },
-                          },
-                        },
-                      },
-                      {
-                        bool: {
-                          must: {
-                            match_phrase: {
-                              status: constants.challengeStatuses.Completed,
-                            },
-                          },
-                        },
-                      },
-                    ],
-                  },
-                },
-              ]),
-        ],
-      },
-    });
-  }
-
   if (groupsQuery.length > 0) {
     mustQuery.push({
       bool: {
@@ -781,12 +699,14 @@ async function searchChallenges(currentUser, criteria) {
               [sortByProp]: {
                 order: sortOrderProp,
                 missing: "_last",
-                unmapped_type: "String",
+                unmapped_type: "keyword",
               },
             },
       ],
     },
   };
+
+  logger.info(`ES Query: ${JSON.stringify(esQuery)}`)
   // Search with constructed query
   let docs;
   try {
@@ -795,6 +715,7 @@ async function searchChallenges(currentUser, criteria) {
         ? await esClient.search(esQuery)
         : (await esClient.search(esQuery)).body;
   } catch (e) {
+    logger.error(JSON.stringify(e));
     // Catch error when the ES is fresh and has no data
     docs = {
       hits: {