Merge pull request #1 from topcoder-platform/integration-v5-challenge-api

Integration v5 challenge api

Author: PrakashDurlabhji

__tests__/__snapshots__/index.js.snap

@@ -111,6 +111,8 @@ Object {
       "getSubtrackChallengesInit": [Function],
       "getUserMarathonDone": [Function],
       "getUserMarathonInit": [Function],
+      "getUserResourcesDone": [Function],
+      "getUserResourcesInit": [Function],
       "getUserSrmDone": [Function],
       "getUserSrmInit": [Function],
     },
@@ -223,9 +225,9 @@ Object {
       "setEndDate": [Function],
       "setReviewOpportunityType": [Function],
       "setStartDate": [Function],
-      "setSubtracks": [Function],
       "setTags": [Function],
       "setText": [Function],
+      "setTypes": [Function],
     },
   },
   "errors": Object {
@@ -370,9 +372,10 @@ Object {
   },
   "tc": Object {
     "COMPETITION_TRACKS": Object {
-      "DATA_SCIENCE": "data_science",
-      "DESIGN": "design",
-      "DEVELOP": "develop",
+      "DATA_SCIENCE": "Data Science",
+      "DESIGN": "Design",
+      "DEVELOP": "Development",
+      "QA": "Quality Assurance",
     },
     "REVIEW_OPPORTUNITY_TYPES": Object {
       "Contest Review": "Review",

__tests__/actions/auth.js

@@ -1,17 +1,20 @@
-const MOCK_GROUPS_REQ_URL = 'https://api.topcoder-dev.com/v3/groups?memberId=12345&membershipType=user';
+const MOCK_GROUPS_REQ_URL = 'https://api.topcoder-dev.com/v5/groups?memberId=12345&membershipType=user';
 const MOCK_PROFILE_REQ_URL = 'https://api.topcoder-dev.com/v3/members/username12345';
 
 jest.mock('isomorphic-fetch', () => jest.fn(url => Promise.resolve({
+  ok: true,
   json: () => {
     let content;
     switch (url) {
-      case MOCK_GROUPS_REQ_URL: content = ['Group1', 'Group2']; break;
-      case MOCK_PROFILE_REQ_URL: content = { userId: 12345 }; break;
+      case MOCK_GROUPS_REQ_URL:
+        content = ['Group1', 'Group2'];
+        break;
+      case MOCK_PROFILE_REQ_URL:
+        content = { result: { content: { userId: 12345 }, status: 200 } };
+        break;
       default: throw new Error('Unexpected URL!');
     }
-    return {
-      result: { content, status: 200 },
-    };
+    return content;
   },
 })));
 

__tests__/utils/challenge/filter.js

@@ -1,5 +1,5 @@
 import {
-  setText, setTags, setSubtracks, setStartDate,
+  setText, setTags, setTypes, setStartDate,
 } from '../../../src/utils/challenge/filter';
 
 describe('challenge filter', () => {
@@ -22,12 +22,12 @@ describe('challenge filter', () => {
     expect(res).toEqual({});
   });
 
-  test('setSubtracks', () => {
-    res = setSubtracks({});
+  test('setTypes', () => {
+    res = setTypes({});
     expect(res).toEqual({});
-    res = setSubtracks({}, 'subtracks');
-    expect(res).toEqual({ subtracks: 'subtracks' });
-    res = setSubtracks({ subtracks: 'subtracks' });
+    res = setTypes({}, 'types');
+    expect(res).toEqual({ types: 'types' });
+    res = setTypes({ types: 'types' });
     expect(res).toEqual({});
   });
 

config/test.js

@@ -2,6 +2,7 @@ module.exports = {
   API: {
     V2: 'https://api.topcoder-dev.com/v2',
     V3: 'https://api.topcoder-dev.com/v3',
+    V5: 'https://api.topcoder-dev.com/v5',
   },
   dummyConfigKey: 'Dummy config value',
   SECRET: {

docs/challenge.filter.md

@@ -70,7 +70,7 @@ users are participating.
         * [.setEndDate(state, date)](#module_challenge.filter.setEndDate) ⇒ <code>Object</code>
         * [.setReviewOpportunityType(state, reviewOpportunityType)](#module_challenge.filter.setReviewOpportunityType) ⇒ <code>Object</code>
         * [.setStartDate(state, date)](#module_challenge.filter.setStartDate) ⇒ <code>Object</code>
-        * [.setSubtracks(state, subtracks)](#module_challenge.filter.setSubtracks) ⇒ <code>Object</code>
+        * [.setTypes(state, types)](#module_challenge.filter.setTypes) ⇒ <code>Object</code>
         * [.setTags(state, tags)](#module_challenge.filter.setTags) ⇒ <code>Object</code>
         * [.setText(state, text)](#module_challenge.filter.setText) ⇒ <code>Object</code>
     * _inner_
@@ -198,17 +198,17 @@ Clones the state and sets the start date.
 | state | <code>Object</code> |  |
 | date | <code>String</code> | ISO date string. |
 
-<a name="module_challenge.filter.setSubtracks"></a>
+<a name="module_challenge.filter.setTypes"></a>
 
-### challenge.filter.setSubtracks(state, subtracks) ⇒ <code>Object</code>
-Clones the state and sets the subtracks.
+### challenge.filter.setTypes(state, types) ⇒ <code>Object</code>
+Clones the state and sets the challenge types.
 
 **Kind**: static method of [<code>challenge.filter</code>](#module_challenge.filter)  
 
 | Param | Type |
 | --- | --- |
 | state | <code>Object</code> | 
-| subtracks | <code>Array</code> | 
+| types | <code>Array</code> | 
 
 <a name="module_challenge.filter.setTags"></a>
 

package-lock.json

@@ -31,7 +31,7 @@
     "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .",
     "test": "npm run lint && npm run jest"
   },
-  "version": "1000.19.22",
+  "version": "1000.19.51",
   "dependencies": {
     "auth0-js": "^6.8.4",
     "config": "^3.2.0",

package.json

@@ -5,7 +5,7 @@
 
 import { createActions } from 'redux-actions';
 import { decodeToken } from 'tc-accounts';
-import { getApi } from '../services/api';
+import { getApiV3, getApiV5 } from '../services/api';
 
 /**
  * @static
@@ -16,12 +16,14 @@ import { getApi } from '../services/api';
 function loadProfileDone(userTokenV3) {
   if (!userTokenV3) return Promise.resolve(null);
   const user = decodeToken(userTokenV3);
-  const api = getApi('V3', userTokenV3);
+  const apiV3 = getApiV3(userTokenV3);
+  const apiV5 = getApiV5(userTokenV3);
   return Promise.all([
-    api.get(`/members/${user.handle}`)
+    apiV3.get(`/members/${user.handle}`)
       .then(res => res.json()).then(res => (res.result.status === 200 ? res.result.content : {})),
-    api.get(`/groups?memberId=${user.userId}&membershipType=user`)
-      .then(res => res.json()).then(res => (res.result.status === 200 ? res.result.content : [])),
+    apiV5.get(`/groups?memberId=${user.userId}&membershipType=user`)
+      .then(res => (res.ok ? res.json() : new Error(res.statusText)))
+      .then(res => (res.message ? new Error(res.message) : res)),
   ]).then(([profile, groups]) => ({ ...profile, groups }));
 }
 

src/actions/auth.js

@@ -7,6 +7,7 @@
 import _ from 'lodash';
 import { config } from 'topcoder-react-utils';
 import { createActions } from 'redux-actions';
+import { decodeToken } from 'tc-accounts';
 import { getService as getChallengesService } from '../services/challenges';
 import { getService as getSubmissionService } from '../services/submissions';
 import { getService as getMemberService } from '../services/members';
@@ -103,16 +104,20 @@ function getSubmissionsInit(challengeId) {
  * @desc Creates an action that loads user's submissions to the specified
  * challenge.
  * @param {String} challengeId Challenge ID.
- * @param {String} tokenV2  Topcoder auth token v2.
+ * @param {String} tokenV3 Topcoder auth token v3.
  * @return {Action}
  */
-function getSubmissionsDone(challengeId, tokenV2) {
-  return getApi('V2', tokenV2)
-    .fetch(`/challenges/submissions/${challengeId}/mySubmissions`)
-    .then(response => response.json())
-    .then(response => ({
+function getSubmissionsDone(challengeId, tokenV3) {
+  const user = decodeToken(tokenV3);
+  const submissionsService = getSubmissionService(tokenV3);
+  const filters = {
+    challengeId,
+    memberId: user.userId,
+  };
+  return submissionsService.getSubmissions(filters)
+    .then(submissions => ({
       challengeId: _.toString(challengeId),
-      submissions: response.submissions,
+      submissions,
     }))
     .catch((error) => {
       const err = { challengeId: _.toString(challengeId), error };
@@ -289,13 +294,13 @@ function fetchCheckpointsDone(tokenV2, challengeId) {
         response.checkpointResults[index].expanded = false;
       });
       return {
-        challengeId: Number(challengeId),
+        challengeId: String(challengeId),
         checkpoints: response,
       };
     })
     .catch(error => ({
       error,
-      challengeId: Number(challengeId),
+      challengeId: String(challengeId),
     }));
 }
 

src/actions/challenge.js

@@ -357,6 +357,30 @@ async function getUserMarathonDone(
     }));
 }
 
+/**
+ * @static
+ * @desc Create an action that fetch user registered challenge's resources.
+ * @param {String} memberId Member id.
+ * @param {String} uuid Operation UUID.
+ * @return {Action}
+ */
+async function getUserResourcesInit(memberId, uuid) {
+  return { memberId, uuid };
+}
+
+/**
+ * @static
+ * @desc Create an action that fetch user registered challenge's resources.
+ * @param {String} handle Member handle.
+ * @param {String} uuid Operation UUID.
+ * @return {Action}
+ */
+async function getUserResourcesDone(memberId, tokenV3, uuid) {
+  const resources = await getService(tokenV3).getUserResources(memberId);
+
+  return { resources, uuid };
+}
+
 export default createActions({
   MEMBERS: {
     DROP: drop,
@@ -380,5 +404,7 @@ export default createActions({
     GET_USER_SRM_DONE: getUserSRMDone,
     GET_USER_MARATHON_INIT: getUserMarathonInit,
     GET_USER_MARATHON_DONE: getUserMarathonDone,
+    GET_USER_RESOURCES_INIT: getUserResourcesInit,
+    GET_USER_RESOURCES_DONE: getUserResourcesDone,
   },
 });

src/actions/members.js

@@ -22,7 +22,7 @@ function deleteSubmissionInit() {}
  * @return {Action}
  */
 function deleteSubmissionDone(tokenV3, submissionId) {
-  return getApi('V3', tokenV3).delete(`/submissions/${submissionId}`)
+  return getApi('V5', tokenV3).delete(`/submissions/${submissionId}`)
     .then(() => submissionId);
 }
 

src/actions/smp.js

@@ -32,7 +32,7 @@ function getTermsInit(arg) {
  * @return {Action}
  */
 function getTermsDone(entity, tokens, mockAgreed) {
-  const service = getService(tokens.tokenV2);
+  const service = getService(tokens.tokenV3);
   let termsPromise;
 
   // if mockAgreed=true passed, then we create an array of 10 true which we pass to the
@@ -44,7 +44,7 @@ function getTermsDone(entity, tokens, mockAgreed) {
 
   switch (entity.type) {
     case 'challenge': {
-      termsPromise = service.getChallengeTerms(entity.id, mockAgreedArray);
+      termsPromise = service.getChallengeTerms(entity.terms, mockAgreedArray);
       break;
     }
     case 'community': {
@@ -59,7 +59,7 @@ function getTermsDone(entity, tokens, mockAgreed) {
       throw new Error(`Entity type '${entity.type}' is not supported by getTermsDone.`);
   }
 
-  return termsPromise.then(res => ({ entity, terms: res.terms }));
+  return termsPromise.then(res => ({ entity, terms: res }));
 }
 
 /**
@@ -152,11 +152,11 @@ function getTermDetailsInit(termId) {
  * @static
  * @desc Creates an action that fetches details of the specified term.
  * @param {Number|String} termId
- * @param {String} tokenV2
+ * @param {String} tokenV3
  * @return {Action}
  */
-function getTermDetailsDone(termId, tokenV2) {
-  const service = getService(tokenV2);
+function getTermDetailsDone(termId, tokenV3) {
+  const service = getService(tokenV3);
   return service.getTermDetails(termId).then(details => ({ termId, details }));
 }
 
@@ -175,11 +175,11 @@ function getDocuSignUrlInit(templateId) {
  * @desc Creates an action that generates the url of DoduSign term
  * @param  {Number|String} templateId id of document template to sign
  * @param  {String} returnUrl  callback url after finishing singing
- * @param  {String} tokenV2    auth token
+ * @param  {String} tokenV3    auth token
  * @return {Action}
  */
-function getDocuSignUrlDone(templateId, returnUrl, tokenV2) {
-  const service = getService(tokenV2);
+function getDocuSignUrlDone(templateId, returnUrl, tokenV3) {
+  const service = getService(tokenV3);
   return service.getDocuSignUrl(templateId, returnUrl)
     .then(resp => ({ templateId, docuSignUrl: resp.recipientViewUrl }));
 }
@@ -198,11 +198,11 @@ function agreeTermInit(termId) {
  * @static
  * @desc Creates an action that agrees to a term.
  * @param  {Number|String} termId id of term
- * @param  {String} tokenV2    auth token
+ * @param  {String} tokenV3    auth token
  * @return {Action}
  */
-function agreeTermDone(termId, tokenV2) {
-  const service = getService(tokenV2);
+function agreeTermDone(termId, tokenV3) {
+  const service = getService(tokenV3);
   return service.agreeTerm(termId).then(resp => ({ termId, success: resp.success }));
 }
 

src/actions/terms.js

@@ -18,6 +18,8 @@ import { fireErrorMessage } from '../utils/errors';
 
 import mySubmissionsManagement from './my-submissions-management';
 
+import { COMPETITION_TRACKS } from '../utils/tc';
+
 /**
  * Handles CHALLENGE/GET_DETAILS_INIT action.
  * @param {Object} state
@@ -171,7 +173,7 @@ function onFetchCheckpointsDone(state, action) {
       loadingCheckpoints: false,
     };
   }
-  if (state.details && state.details.id === action.payload.challengeId) {
+  if (state.details && state.details.legacyId === action.payload.challengeId) {
     return {
       ...state,
       checkpoints: action.payload.checkpoints,
@@ -465,15 +467,25 @@ export function factory(options = {}) {
       challengeId,
       tokens.tokenV3,
       tokens.tokenV2,
-    )).then((details) => {
-      const track = _.get(details, 'payload.track', '').toLowerCase();
-      const checkpointsPromise = track === 'design' ? (
-        redux.resolveAction(actions.challenge.fetchCheckpointsDone(tokens.tokenV2, challengeId))
-      ) : null;
-      const resultsPromise = _.get(details, 'payload.status', '') === 'Completed' ? (
-        redux.resolveAction(actions.challenge.loadResultsDone(tokens, challengeId, track))
+    )).then((res) => {
+      const challengeDetails = _.get(res, 'payload', {});
+      const track = _.get(challengeDetails, 'track', '');
+      let checkpointsPromise = null;
+      if (track === COMPETITION_TRACKS.DESIGN) {
+        const p = _.get(challengeDetails, 'phases', [])
+          .filter(x => x.name === 'Checkpoint Review');
+        if (p.length && !p[0].isOpen) {
+          checkpointsPromise = redux.resolveAction(
+            actions.challenge.fetchCheckpointsDone(tokens.tokenV2, challengeDetails.legacyId),
+          );
+        }
+      }
+      const resultsPromise = challengeDetails.status === 'Completed' ? (
+        redux.resolveAction(
+          actions.challenge.loadResultsDone(tokens, challengeId, track.toLowerCase()),
+        )
       ) : null;
-      return Promise.all([details, checkpointsPromise, resultsPromise]);
+      return Promise.all([res, checkpointsPromise, resultsPromise]);
     }).then(([details, checkpoints, results]) => {
       state = {
         ...state,