Merge branch 'integration-v5-challenge-api' into issue_4552

Author: srjr19

__tests__/__snapshots__/index.js.snap

@@ -111,6 +111,8 @@ Object {
       "getSubtrackChallengesInit": [Function],
       "getUserMarathonDone": [Function],
       "getUserMarathonInit": [Function],
+      "getUserResourcesDone": [Function],
+      "getUserResourcesInit": [Function],
       "getUserSrmDone": [Function],
       "getUserSrmInit": [Function],
     },

__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;
   },
 })));
 

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: {

package.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.33",
   "dependencies": {
     "auth0-js": "^6.8.4",
     "config": "^3.2.0",

src/actions/auth.js

@@ -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/challenge.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/members.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/smp.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/terms.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/reducers/challenge.js

@@ -171,7 +171,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,

src/reducers/members.js

@@ -426,6 +426,43 @@ function onGetUserMarathonDone(state, { error, payload }) {
   };
 }
 
+/**
+ * Inits the loading of user challenge resources.
+ * @param {Object} state
+ * @param {Object} action
+ * @return {Object} New state.
+ */
+function onGetUserResourcesInit(state, { payload }) {
+  const { uuid } = payload;
+  return {
+    ...state,
+    userResources: { resources: [], loadingUserResources: uuid },
+  };
+}
+
+/**
+ * Finalizes the loading of user challenge resources.
+ * @param {Object} state
+ * @param {Object} action
+ * @return {Object} New state.
+ */
+function onGetUserResourcesDone(state, { error, payload }) {
+  if (error) {
+    logger.error('Failed to get user resources', payload);
+    fireErrorMessage('Failed to get user resources', '');
+    return state;
+  }
+
+  const { uuid, resources } = payload;
+
+  if (uuid !== state.userResources.loadingUserResources) return state;
+
+  return {
+    ...state,
+    userResources: { resources, loadingUserResources: '' },
+  };
+}
+
 /**
  * Creates a new Members reducer with the specified initial state.
  * @param {Object} initialState Optional. Initial state.
@@ -455,6 +492,8 @@ function create(initialState = {}) {
     [a.getUserSrmDone]: onGetUserSRMDone,
     [a.getUserMarathonInit]: onGetUserMarathonInit,
     [a.getUserMarathonDone]: onGetUserMarathonDone,
+    [a.getUserResourcesInit]: onGetUserResourcesInit,
+    [a.getUserResourcesDone]: onGetUserResourcesDone,
   }, initialState);
 }
 

src/reducers/reviewOpportunity.js

@@ -23,8 +23,8 @@ function buildRequiredTermsList(details) {
       // Sometimes roles such as Primary Reviewer have no directly equal
       // terms entry.  Include the plain Reviewer terms when present as a back-up.
       .filter(term => term.role === 'Reviewer' || _.includes(roles, term.role))
-      .map(term => _.pick(term, ['termsOfUseId', 'agreed', 'title'])),
-    term => term.termsOfUseId,
+      .map(term => _.pick(term, ['id', 'agreed', 'title'])),
+    term => term.id,
   );
 
   return requiredTerms || [];

src/reducers/terms.js

@@ -181,7 +181,7 @@ function onAgreeTermDone(state, action) {
   }
   if (action.payload.success) {
     const terms = _.cloneDeep(state.terms);
-    const term = _.find(terms, ['termsOfUseId', action.payload.termId]);
+    const term = _.find(terms, ['id', action.payload.termId]);
     term.agreed = true;
     const selectedTerm = _.find(terms, t => !t.agreed);
     return {

src/services/__mocks__/challenges.js

@@ -85,8 +85,8 @@ export function normalizeChallengeDetails(v3, v3Filtered, v3User, v2, username)
   // Fill missing data from v3_filtered
   if (v3Filtered) {
     const groups = {};
-    if (v3Filtered.groupIds) {
-      v3Filtered.groupIds.forEach((id) => {
+    if (v3Filtered.groups) {
+      v3Filtered.groups.forEach((id) => {
         groups[id] = true;
       });
     }
@@ -165,8 +165,8 @@ export function normalizeChallengeDetails(v3, v3Filtered, v3User, v2, username)
 export function normalizeChallenge(challenge, username) {
   const registrationOpen = challenge.allPhases.filter(d => d.name === 'Registration')[0].isOpen ? 'Yes' : 'No';
   const groups = {};
-  if (challenge.groupIds) {
-    challenge.groupIds.forEach((id) => {
+  if (challenge.groups) {
+    challenge.groups.forEach((id) => {
       groups[id] = true;
     });
   }

src/services/challenges.js

@@ -365,13 +365,11 @@ class ChallengesService {
       if (memberId) {
         isRegistered = _.some(registrants, r => r.memberId === memberId);
 
-        /**
-         * TODO: Currenlty using legacyId until submissions_api fix issue with UUID
-         */
         const subParams = {
-          challengeId: challenge.legacyId,
+          challengeId,
           perPage: 100,
         };
+
         submissions = await this.private.submissionsService.getSubmissions(subParams);
 
         if (submissions) {
@@ -532,6 +530,16 @@ class ChallengesService {
     };
   }
 
+  /**
+   * Gets user resources.
+   * @param {String} userId User id whose challenges we want to fetch.
+   * @return {Promise} Resolves to the api response.
+   */
+  async getUserResources(userId) {
+    const res = await this.private.apiV5.get(`/resources/${userId}/challenges`);
+    return res.json();
+  }
+
   /**
    * Gets marathon matches of the specified user.
    * @param {String} memberId User whose challenges we want to fetch.