Merge pull request topcoder-platform#166 from simranb86/Challenge_30124821

sushilshinde · web-flow · commit 208cfe3615fb · 2020-05-19T09:56:03.000+05:30
Challenge 30124821
diff --git a/__tests__/__snapshots__/index.js.snap b/__tests__/__snapshots__/index.js.snap
@@ -303,7 +303,6 @@ Object {
       "default": undefined,
       "getService": [Function],
       "normalizeChallenge": [Function],
-      "normalizeChallengeDetails": [Function],
     },
     "communities": Object {
       "default": undefined,
diff --git a/docs/services.challenges.md b/docs/services.challenges.md
@@ -18,7 +18,7 @@ This module provides a service for convenient manipulation with
             * [.close(challengeId, winnerId)](#module_services.challenges..ChallengesService+close) ⇒ <code>Promise</code>
             * [.createTask(projectId, accountId, title, description, assignee, payment)](#module_services.challenges..ChallengesService+createTask) ⇒ <code>Promise</code>
             * [.getChallengeDetails(challengeId)](#module_services.challenges..ChallengesService+getChallengeDetails) ⇒ <code>Promise</code>
-            * [.getChallengeSubtracks()](#module_services.challenges..ChallengesService+getChallengeSubtracks) ⇒ <code>Promise</code>
+            * [.getChallengeTypes()](#module_services.challenges..ChallengesService+getChallengeTypes) ⇒ <code>Promise</code>
             * [.getChallengeTags()](#module_services.challenges..ChallengesService+getChallengeTags) ⇒ <code>Promise</code>
             * [.getChallenges(filters, params)](#module_services.challenges..ChallengesService+getChallenges) ⇒ <code>Promise</code>
             * [.getMarathonMatches(filters, params)](#module_services.challenges..ChallengesService+getMarathonMatches) ⇒ <code>Promise</code>
@@ -119,7 +119,7 @@ Challenge service.
     * [.close(challengeId, winnerId)](#module_services.challenges..ChallengesService+close) ⇒ <code>Promise</code>
     * [.createTask(projectId, accountId, title, description, assignee, payment)](#module_services.challenges..ChallengesService+createTask) ⇒ <code>Promise</code>
     * [.getChallengeDetails(challengeId)](#module_services.challenges..ChallengesService+getChallengeDetails) ⇒ <code>Promise</code>
-    * [.getChallengeSubtracks()](#module_services.challenges..ChallengesService+getChallengeSubtracks) ⇒ <code>Promise</code>
+    * [.getChallengeTypes()](#module_services.challenges..ChallengesService+getChallengeTypes) ⇒ <code>Promise</code>
     * [.getChallengeTags()](#module_services.challenges..ChallengesService+getChallengeTags) ⇒ <code>Promise</code>
     * [.getChallenges(filters, params)](#module_services.challenges..ChallengesService+getChallenges) ⇒ <code>Promise</code>
     * [.getMarathonMatches(filters, params)](#module_services.challenges..ChallengesService+getMarathonMatches) ⇒ <code>Promise</code>
@@ -203,9 +203,9 @@ incorrect in the main v3 endpoint. This may change in the future.
 | --- | --- |
 | challengeId | <code>Number</code> \| <code>String</code> | 
 
-<a name="module_services.challenges..ChallengesService+getChallengeSubtracks"></a>
+<a name="module_services.challenges..ChallengesService+getChallengeTypes"></a>
 
-#### challengesService.getChallengeSubtracks() ⇒ <code>Promise</code>
+#### challengesService.getChallengeTypes() ⇒ <code>Promise</code>
 Gets possible challenge subtracks.
 
 **Kind**: instance method of [<code>ChallengesService</code>](#module_services.challenges..ChallengesService)  
diff --git a/src/actions/member-tasks.js b/src/actions/member-tasks.js
@@ -62,8 +62,8 @@ function getDone(uuid, projectId, pageNum, tokenV3) {
     isTask: 1,
     projectId,
   }, {
-    limit: PAGE_SIZE,
-    offset: pageNum * PAGE_SIZE,
+    perPage: PAGE_SIZE,
+    page: pageNum + 1,
   }).then(({ challenges, totalCount }) => ({
     projectId,
     tasks: challenges,
diff --git a/src/actions/members.js b/src/actions/members.js
@@ -144,16 +144,16 @@ async function getActiveChallengesInit(handle, uuid) {
  * @returns {Object} Payload
  */
 async function getActiveChallengesDone(handle, uuid, tokenV3) {
-  const filter = { status: 'ACTIVE' };
+  const filter = { status: 'Active' };
   const service = getChallengesService(tokenV3);
   /* TODO: Reuse `getAll` from `actions/challenge-listing`
   /* after it moved from `community-app` to here.
    */
   function getAll(getter, page = 0, prev = null) {
     const PAGE_SIZE = 50;
     return getter({
-      limit: PAGE_SIZE,
-      offset: page * PAGE_SIZE,
+      perPage: PAGE_SIZE,
+      page: page + 1,
     }).then(({ challenges: chunk }) => {
       if (!chunk.length) return prev || [];
       return getAll(getter, 1 + page, prev ? prev.concat(chunk) : chunk);
@@ -247,7 +247,7 @@ async function getSubtrackChallengesDone(
   refresh,
 ) {
   const filter = {
-    status: 'completed',
+    status: 'Completed',
     hasUserSubmittedForReview: 'true',
     track,
     subTrack,
diff --git a/src/actions/stats.js b/src/actions/stats.js
@@ -42,7 +42,7 @@ async function getCommunityStatsDone(community, uuid, challenges, token) {
     /* TODO: At the moment, this component loads challenge objects to calculate
     * the number of challenges and the total prize. Probably in future, we'll
     * have a special API to get these data. */
-    let filtered = challenges.filter(x => x.status === 'ACTIVE');
+    let filtered = challenges.filter(x => x.status === 'Active');
     if (community.challengeFilter) {
       const filterFunction = Filter.getFilterFunction(community.challengeFilter);
       filtered = filtered.filter(filterFunction);
diff --git a/src/reducers/challenge.js b/src/reducers/challenge.js
@@ -462,7 +462,7 @@ export function factory(options = {}) {
       const checkpointsPromise = track === 'design' ? (
         redux.resolveAction(actions.challenge.fetchCheckpointsDone(tokens.tokenV2, challengeId))
       ) : null;
-      const resultsPromise = _.get(details, 'payload.status', '') === 'COMPLETED' ? (
+      const resultsPromise = _.get(details, 'payload.status', '') === 'Completed' ? (
         redux.resolveAction(actions.challenge.loadResultsDone(tokens, challengeId, track))
       ) : null;
       return Promise.all([details, checkpointsPromise, resultsPromise]);
diff --git a/src/services/__mocks__/challenges.js b/src/services/__mocks__/challenges.js
@@ -134,7 +134,7 @@ export function normalizeChallengeDetails(v3, v3Filtered, v3User, v2, username)
   // Fill some derived data
   const registrationOpen = _.some(
     challenge.allPhases,
-    phase => phase.phaseType === 'Registration' && phase.phaseStatus === 'Open',
+    phase => phase.name === 'Registration' && phase.isOpen,
   ) ? 'Yes' : 'No';
   _.defaults(challenge, {
     communities: new Set([COMPETITION_TRACKS[challenge.track]]),
@@ -163,7 +163,7 @@ export function normalizeChallengeDetails(v3, v3Filtered, v3User, v2, username)
  * @return {Object} Normalized challenge.
  */
 export function normalizeChallenge(challenge, username) {
-  const registrationOpen = challenge.allPhases.filter(d => d.phaseType === 'Registration')[0].phaseStatus === 'Open' ? 'Yes' : 'No';
+  const registrationOpen = challenge.allPhases.filter(d => d.name === 'Registration')[0].isOpen ? 'Yes' : 'No';
   const groups = {};
   if (challenge.groupIds) {
     challenge.groupIds.forEach((id) => {
@@ -250,10 +250,10 @@ class ChallengesService {
   }
 
   /**
-   * Gets possible challenge subtracks.
-   * @return {Promise} Resolves to the array of subtrack names.
+   * Gets possible challenge types.
+   * @return {Promise} Resolves to the array of challenge type names.
    */
-  getChallengeSubtracks() {
+  getChallengeTypes() {
     return Promise.all([
       this.private.apiV2.get('/design/challengetypes')
         .then(res => (res.ok ? res.json() : new Error(res.statusText))),
diff --git a/src/services/challenges.js b/src/services/challenges.js
diff --git a/src/utils/challenge/filter.js b/src/utils/challenge/filter.js
