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

Author: jmgasper

.circleci/config.yml

@@ -102,6 +102,7 @@ workflows:
             - develop
             - feature/top-262-projectid-non-mandatory
             - TOP-2364
+            - PM-2097
 
     - "build-qa":
         context: org-global

src/services/ChallengeService.js

@@ -210,7 +210,9 @@ const includeReturnFields = {
   reviewers: true,
   terms: true,
   skills: true,
-  winners: true,
+  winners: {
+    orderBy: { placement: "asc" },
+  },
   attachments: true,
   track: true,
   type: true,
@@ -710,10 +712,14 @@ async function searchChallenges(currentUser, criteria) {
     });
   }
 
-  const sortByProp = criteria.sortBy ? criteria.sortBy : "createdAt";
+  let sortByProp = criteria.sortBy ? criteria.sortBy : "createdAt";
 
   const sortOrderProp = criteria.sortOrder ? criteria.sortOrder : "desc";
 
+  if (sortByProp === "overview.totalPrizes") {
+    sortByProp = "overviewTotalPrizes";
+  }
+
   if (criteria.tco) {
     prismaFilter.where.AND.push({
       events: {