merge hot-fix to feature-my-challenges

Author: codeMinter

__tests__/__snapshots__/index.js.snap

@@ -58,6 +58,8 @@ Object {
       "getLookerDone": [Function],
     },
     "lookup": Object {
+      "getAllCountriesDone": [Function],
+      "getAllCountriesInit": [Function],
       "getCountriesDone": [Function],
       "getCountriesInit": [Function],
       "getSkillTagsDone": [Function],
@@ -318,10 +320,8 @@ Object {
     },
   },
   "submission": Object {
-    "default": undefined,
     "getFinalScore": [Function],
     "getProvisionalScore": [Function],
-    "processMMSubmissions": [Function],
   },
   "tc": Object {
     "COMPETITION_TRACKS": Object {

__tests__/actions/__snapshots__/lookup.js.snap

@@ -3,6 +3,8 @@
 exports[`Module exports 1`] = `
 Object {
   "lookup": Object {
+    "getAllCountriesDone": [Function],
+    "getAllCountriesInit": [Function],
     "getCountriesDone": [Function],
     "getCountriesInit": [Function],
     "getSkillTagsDone": [Function],

__tests__/reducers/__snapshots__/lookup.js.snap

@@ -2,6 +2,7 @@
 
 exports[`Default reducer Get countries 1`] = `
 Object {
+  "allCountries": Array [],
   "countries": Array [
     Object {
       "country": "Afghanistan",
@@ -23,6 +24,7 @@ Object {
 
 exports[`Default reducer Get countries error 1`] = `
 Object {
+  "allCountries": Array [],
   "countries": Array [
     Object {
       "country": "Afghanistan",
@@ -44,6 +46,7 @@ Object {
 
 exports[`Default reducer Get skill tags 1`] = `
 Object {
+  "allCountries": Array [],
   "countries": Array [],
   "loadingSkillTagsError": false,
   "skillTags": Array [
@@ -59,6 +62,7 @@ Object {
 
 exports[`Default reducer Get skill tags error 1`] = `
 Object {
+  "allCountries": Array [],
   "countries": Array [],
   "loadingSkillTagsError": true,
   "skillTags": Array [
@@ -74,13 +78,15 @@ Object {
 
 exports[`Default reducer Initial state 1`] = `
 Object {
+  "allCountries": Array [],
   "countries": Array [],
   "skillTags": Array [],
 }
 `;
 
 exports[`Factory without server side rendering Get countries 1`] = `
 Object {
+  "allCountries": Array [],
   "countries": Array [
     Object {
       "country": "Afghanistan",
@@ -102,6 +108,7 @@ Object {
 
 exports[`Factory without server side rendering Get countries error 1`] = `
 Object {
+  "allCountries": Array [],
   "countries": Array [
     Object {
       "country": "Afghanistan",
@@ -123,6 +130,7 @@ Object {
 
 exports[`Factory without server side rendering Get skill tags 1`] = `
 Object {
+  "allCountries": Array [],
   "countries": Array [],
   "loadingSkillTagsError": false,
   "skillTags": Array [
@@ -138,6 +146,7 @@ Object {
 
 exports[`Factory without server side rendering Get skill tags error 1`] = `
 Object {
+  "allCountries": Array [],
   "countries": Array [],
   "loadingSkillTagsError": true,
   "skillTags": Array [
@@ -153,6 +162,7 @@ Object {
 
 exports[`Factory without server side rendering Initial state 1`] = `
 Object {
+  "allCountries": Array [],
   "countries": Array [],
   "skillTags": Array [],
 }

docs/actions.lookup.md

@@ -9,22 +9,34 @@ Actions related to lookup data.
     * [.getSkillTagsDone()](#module_actions.lookup.getSkillTagsDone) ⇒ <code>Action</code>
     * [.getCountriesInit()](#module_actions.lookup.getCountriesInit) ⇒ <code>Action</code>
     * [.getCountriesDone()](#module_actions.lookup.getCountriesDone) ⇒ <code>Action</code>
+    * [.getAllCountriesInit()](#module_actions.lookup.getCountriesInit) ⇒ <code>Action</code>
+    * [.getAllCountriesDone(tokenV3)](#module_actions.lookup.getCountriesDone) ⇒ <code>Action</code>
 
 <a name="module_actions.lookup.getSkillTagsInit"></a>
 
 ### actions.lookup.getSkillTagsInit() ⇒ <code>Action</code>
 Creates an action that signals beginning of getting all skill tags.
 
-**Kind**: static method of [<code>actions.lookup</code>](#module_actions.lookup)  
+**Kind**: static method of [<code>actions.lookup</code>](#module_actions.lookup)
 <a name="module_actions.lookup.getSkillTagsDone"></a>
 
 ### actions.lookup.getSkillTagsDone() ⇒ <code>Action</code>
 Creates an action that gets all skill tags.
 
-**Kind**: static method of [<code>actions.lookup</code>](#module_actions.lookup)  
+**Kind**: static method of [<code>actions.lookup</code>](#module_actions.lookup)
 <a name="module_actions.lookup.getCountriesDone"></a>
 
 ### actions.lookup.getCountriesDone() ⇒ <code>Action</code>
 Creates an action that gets all countries.
 
-**Kind**: static method of [<code>actions.lookup</code>](#module_actions.lookup)  
+**Kind**: static method of [<code>actions.lookup</code>](#module_actions.lookup)
+<a name="module_actions.lookup.getCountriesDone"></a>
+
+### actions.lookup.getAllCountriesDone(tokenV3) ⇒ <code>Action</code>
+Creates an action that gets all countries new version.
+
+**Kind**: static method of [<code>actions.lookup</code>](#module_actions.lookup)
+
+| Param | Type | Description |
+| --- | --- | --- |
+| tokenV3 | <code>String</code> | Topcoder v3 auth token. |

docs/services.members.md

@@ -114,7 +114,7 @@ Gets member external account info.
 
 | Param | Type |
 | --- | --- |
-| handle | <code>String</code> | 
+| handle | <code>String</code> |
 
 <a name="module_services.members..MembersService+getExternalLinks"></a>
 
@@ -126,7 +126,7 @@ Gets member external links.
 
 | Param | Type |
 | --- | --- |
-| handle | <code>String</code> | 
+| handle | <code>String</code> |
 
 <a name="module_services.members..MembersService+getSkills"></a>
 
@@ -138,7 +138,7 @@ Gets member skills.
 
 | Param | Type |
 | --- | --- |
-| handle | <code>String</code> | 
+| handle | <code>String</code> |
 
 <a name="module_services.members..MembersService+getStats"></a>
 
@@ -150,7 +150,7 @@ Gets member statistics.
 
 | Param | Type |
 | --- | --- |
-| handle | <code>String</code> | 
+| handle | <code>String</code> |
 
 <a name="module_services.members..MembersService+getStatsHistory"></a>
 
@@ -162,7 +162,7 @@ Gets member statistics history
 
 | Param | Type |
 | --- | --- |
-| handle | <code>String</code> | 
+| handle | <code>String</code> |
 
 <a name="module_services.members..MembersService+getStatsDistribution"></a>
 
@@ -174,9 +174,9 @@ Gets member statistics distribution
 
 | Param | Type |
 | --- | --- |
-| handle | <code>String</code> | 
-| track | <code>String</code> | 
-| subTrack | <code>String</code> | 
+| handle | <code>String</code> |
+| track | <code>String</code> |
+| subTrack | <code>String</code> |
 
 <a name="module_services.members..MembersService+getMemberSuggestions"></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": "0.8.0",
+  "version": "0.8.2",
   "dependencies": {
     "auth0-js": "^6.8.4",
     "config": "^3.2.0",

package.json

@@ -3,48 +3,12 @@
  * @desc Actions related to Topcoder challenges APIs.
  */
 
-/* global CONFIG */
 import _ from 'lodash';
 import { config } from 'topcoder-react-utils';
 import { createActions } from 'redux-actions';
 import { getService as getChallengesService } from '../services/challenges';
 import { getService as getSubmissionService } from '../services/submissions';
-import { getService as getMemberService } from '../services/members';
 import { getApi } from '../services/api';
-import * as submissionUtil from '../utils/submission';
-
-const { PAGE_SIZE } = CONFIG;
-
-/**
- * Private. Loads from the backend all data matching some conditions.
- * @param {Function} getter Given params object of shape { limit, offset }
- *  loads from the backend at most "limit" data, skipping the first
- *  "offset" ones. Returns loaded data as an array.
- * @param {Number} page Optional. Next page of data to load.
- * @param {Number} perPage Optional. The size of the page content to load.
- * @param {Array} prev Optional. data loaded so far.
- */
-function getAll(getter, page = 1, perPage = PAGE_SIZE, prev) {
-  /* Amount of submissions to fetch in one API call. 50 is the current maximum
-   * amount of submissions the backend returns, event when the larger limit is
-   * explicitely required. */
-  return getter({
-    page,
-    perPage,
-  }).then((res) => {
-    if (res.length === 0) {
-      return prev || res;
-    }
-    // parse submissions
-    let current = [];
-    if (prev) {
-      current = prev.concat(res);
-    } else {
-      current = res;
-    }
-    return getAll(getter, 1 + page, perPage, current);
-  });
-}
 
 /**
  * @static
@@ -142,26 +106,10 @@ function getMMSubmissionsInit(challengeId) {
  * @param {String} tokenV3  Topcoder auth token v3.
  * @return {Action}
  */
-function getMMSubmissionsDone(challengeId, registrants, tokenV3) {
-  const filter = { challengeId };
-  const memberService = getMemberService(tokenV3);
+async function getMMSubmissionsDone(challengeId, registrants, tokenV3) {
   const submissionsService = getSubmissionService(tokenV3);
-
-  // TODO: Move those numbers to configs
-  return getAll(params => submissionsService.getSubmissions(filter, params), 1, 500)
-    .then((submissions) => {
-      const userIds = _.uniq(_.map(submissions, sub => sub.memberId));
-      return memberService.getMembersInformation(userIds)
-        .then((resources) => {
-          const finalSubmissions = submissionUtil
-            .processMMSubmissions(submissions, resources, registrants);
-          return {
-            challengeId,
-            submissions: finalSubmissions,
-            tokenV3,
-          };
-        });
-    });
+  const submissions = await submissionsService.getSubmissions(challengeId);
+  return { challengeId, submissions, tokenV3 };
 }
 
 /**

src/actions/challenge.js

@@ -42,11 +42,30 @@ function getCountriesDone() {
   return getService().getCountries();
 }
 
+/**
+ * @static
+ * @desc Creates an action that signals beginning of getting all countries api version 5.
+ * @return {Action}
+ */
+function getAllCountriesInit() {}
+
+/**
+ * @static
+ * @desc Creates an action that gets all countries api version 5.
+ * @param {String} tokenV3 Optional. Auth token for Topcoder API v3.
+ * @return {Action}
+ */
+function getAllCountriesDone(tokenV3) {
+  return getService(tokenV3).getAllCountries();
+}
+
 export default createActions({
   LOOKUP: {
     GET_SKILL_TAGS_INIT: getSkillTagsInit,
     GET_SKILL_TAGS_DONE: getSkillTagsDone,
     GET_COUNTRIES_INIT: getCountriesInit,
     GET_COUNTRIES_DONE: getCountriesDone,
+    GET_ALL_COUNTRIES_INIT: getAllCountriesInit,
+    GET_ALL_COUNTRIES_DONE: getAllCountriesDone,
   },
 });

src/actions/lookup.js

@@ -48,6 +48,25 @@ function onGetCountriesDone(state, { payload, error }) {
   });
 }
 
+/**
+ * Handles LOOKUP/GET_ALL_COUNTRIES_DONE action.
+ * @param {Object} state
+ * @param {Object} action Payload will be JSON from api call
+ * @return {Object} New state
+ */
+function onGetAllCountriesDone(state, { payload, error }) {
+  if (error) {
+    logger.error('Failed to get all countries', payload);
+    return { ...state, loadingAllCountriesError: true };
+  }
+
+  return ({
+    ...state,
+    loadingAllCountriesError: false,
+    allCountries: payload,
+  });
+}
+
 /**
  * Creates a new Lookup reducer with the specified initial state.
  * @param {Object} initialState Optional. Initial state.
@@ -60,9 +79,12 @@ function create(initialState = {}) {
     [a.getSkillTagsDone]: onGetSkillTagsDone,
     [a.getCountriesInit]: state => state,
     [a.getCountriesDone]: onGetCountriesDone,
+    [a.getAllCountriesInit]: state => state,
+    [a.getAllCountriesDone]: onGetAllCountriesDone,
   }, _.defaults(initialState, {
     skillTags: [],
     countries: [],
+    allCountries: [],
   }));
 }
 

src/reducers/lookup.js

@@ -12,6 +12,7 @@ import logger from '../utils/logger';
 import { setErrorIcon, ERROR_ICON_TYPES } from '../utils/errors';
 import { COMPETITION_TRACKS, getApiResponsePayload } from '../utils/tc';
 import { getApi } from './api';
+import { getService as getMembersService } from './members';
 
 export const ORDER_BY = {
   SUBMISSION_END_DATE: 'submissionEndDate',
@@ -263,6 +264,7 @@ class ChallengesService {
       getChallenges,
       tokenV2,
       tokenV3,
+      memberService: getMembersService(),
     };
   }
 
@@ -386,6 +388,17 @@ class ChallengesService {
     return finalChallenge;
   }
 
+  /**
+   * Gets challenge registrants from Topcoder API.
+   * @param {Number|String} challengeId
+   * @return {Promise} Resolves to the challenge registrants array.
+   */
+  async getChallengeRegistrants(challengeId) {
+    const challenge = await this.private.api.get(`/challenges/${challengeId}`)
+      .then(checkError).then(res => res.content);
+    return challenge.registrants;
+  }
+
   /**
    * Gets possible challenge subtracks.
    * @return {Promise} Resolves to the array of subtrack names.
@@ -480,7 +493,6 @@ class ChallengesService {
     return this.private.getChallenges(endpoint, filters, params);
   }
 
-
   /**
    * Gets SRM matches related to the user.
    * @param {String} handle
@@ -590,6 +602,26 @@ class ChallengesService {
     if (res.status !== 200) throw new Error(res.content);
     return res.content;
   }
+
+  /**
+   * Gets roles of a user in the specified challenge. The user tested is
+   * the owner of authentication token used to instantiate the service.
+   *
+   * Notice, if you have already loaded the challenge as that user, these roles
+   * are attached to the challenge object under `userDetails.roles` path during
+   * challenge normalization. However, if you have not, this method is the most
+   * efficient way to get them, as it by-passes any unnecessary normalizations
+   * of the challenge object.
+   *
+   * @param {Number} challengeId Challenge ID.
+   */
+  async getUserRolesInChallenge(challengeId) {
+    const user = decodeToken(this.private.tokenV3);
+    const username = user.handle || user.payload.handle;
+    const url = `/members/${username.toLowerCase()}/challenges`;
+    const data = await this.private.getChallenges(url, { id: challengeId });
+    return data.challenges[0].userDetails.roles;
+  }
 }
 
 let lastInstance = null;

src/services/challenges.js

@@ -14,6 +14,7 @@ class LookupService {
   constructor(tokenV3) {
     this.private = {
       api: getApi('V3', tokenV3),
+      apiV5: getApi('V5', tokenV3),
       tokenV3,
     };
   }
@@ -37,6 +38,16 @@ class LookupService {
     const res = await this.private.api.get('/members/lookup/countries');
     return getApiResponsePayload(res);
   }
+
+  /**
+   * Gets all countries.
+   * @return {Promise} Resolves to the countries.
+   */
+  async getAllCountries() {
+    const res = await this.private.apiV5.get('/lookups/countries');
+    const jsonResult = await res.json();
+    return jsonResult;
+  }
 }
 
 let lastInstance = null;

src/services/lookup.js

@@ -4,7 +4,6 @@
  *  Topcoder submissions via TC API. Currently only used for MM challenges
  */
 
-import qs from 'qs';
 import { getApi } from './api';
 
 /**
@@ -17,26 +16,20 @@ class SubmissionsService {
    */
   constructor(tokenV3) {
     this.private = {
-      apiV5: getApi('V5', tokenV3),
+      broker: getApi('MM_BROKER', tokenV3),
       tokenV3,
     };
   }
 
   /**
    * Get submissions of challenge
-   * @param {Object} filters
-   * @param {Object} params
+   * @param {Object} challengeId
    * @return {Promise} Resolves to the api response.
    */
-  async getSubmissions(filters, params) {
-    const query = {
-      ...filters,
-      ...params,
-    };
-    const url = `/submissions?${qs.stringify(query, { encode: false })}`;
-    return this.private.apiV5.get(url)
-      .then(res => (res.ok ? res.json() : new Error(res.statusText)))
-      .then(res => res);
+  async getSubmissions(challengeId) {
+    const url = `/v5/submissions?challengeId=${challengeId}`;
+    return this.private.broker.get(url)
+      .then(res => (res.ok ? res.json() : new Error(res.statusText)));
   }
 
   /**
@@ -45,10 +38,9 @@ class SubmissionsService {
    * @returns {Promise} Resolves to the api response.
    */
   async getSubmissionInformation(submissionId) {
-    const url = `/submissions/${submissionId}`;
-    return this.private.apiV5.get(url)
-      .then(res => (res.ok ? res.json() : new Error(res.statusText)))
-      .then(res => res);
+    const url = `/v5/submissions/${submissionId}`;
+    return this.private.broker.get(url)
+      .then(res => (res.ok ? res.json() : new Error(res.statusText)));
   }
 }
 

src/services/submissions.js

@@ -1,84 +1,6 @@
 /**
  * Various submissions functions.
  */
-/* global CONFIG */
-/* eslint-disable no-param-reassign */
-import _ from 'lodash';
-
-const { AV_SCAN_SCORER_REVIEW_TYPE_ID } = CONFIG;
-
-function removeDecimal(num) {
-  const re = new RegExp('^-?\\d+');
-  return num.toString().match(re)[0];
-}
-
-function toAcurateFixed(num, decimal) {
-  const re = new RegExp(`^-?\\d+(?:.\\d{0,${(decimal)}})?`);
-  return num.toString().match(re)[0];
-}
-
-function toFixed(num, decimal) {
-  if (_.isNaN(parseFloat(num))) return num;
-  num = parseFloat(num);
-
-  const result = _.toFinite(toAcurateFixed(num, decimal));
-  const integerResult = _.toFinite(removeDecimal(num));
-
-  if (_.isInteger(result)) {
-    return integerResult;
-  }
-  return result;
-}
-
-function getMMChallengeHandleStyle(handle, registrants) {
-  const style = _.get(_.find(registrants, m => m.handle === handle), 'colorStyle', null);
-  if (style) return JSON.parse(style.replace(/(\w+):\s*([^;]*)/g, '{"$1": "$2"}'));
-  return {};
-}
-
-/**
- * Process each submission rank of MM challenge
- * @param submissions the array of submissions
- */
-function processRanks(submissions) {
-  let maxFinalScore = 0;
-  submissions.sort((a, b) => {
-    let pA = _.get(a, 'submissions[0]', { provisionalScore: 0 }).provisionalScore;
-    let pB = _.get(b, 'submissions[0]', { provisionalScore: 0 }).provisionalScore;
-    if (pA === '-') pA = 0;
-    if (pB === '-') pB = 0;
-    if (pA === pB) {
-      const timeA = new Date(_.get(a, 'submissions[0].submissionTime'));
-      const timeB = new Date(_.get(b, 'submissions[0].submissionTime'));
-      return timeA - timeB;
-    }
-    return pB - pA;
-  });
-  _.each(submissions, (submission, i) => {
-    submissions[i].provisionalRank = i + 1;
-  });
-
-  submissions.sort((a, b) => {
-    let pA = _.get(a, 'submissions[0]', { finalScore: 0 }).finalScore;
-    let pB = _.get(b, 'submissions[0]', { finalScore: 0 }).finalScore;
-    if (pA === '-') pA = 0;
-    if (pB === '-') pB = 0;
-    if (pA > 0) maxFinalScore = pA;
-    if (pB > 0) maxFinalScore = pB;
-    if (pA === pB) {
-      const timeA = new Date(_.get(a, 'submissions[0].submissionTime'));
-      const timeB = new Date(_.get(b, 'submissions[0].submissionTime'));
-      return timeA - timeB;
-    }
-    return pB - pA;
-  });
-  if (maxFinalScore > 0) {
-    _.each(submissions, (submission, i) => {
-      submissions[i].finalRank = i + 1;
-    });
-  }
-  return { submissions, maxFinalScore };
-}
 
 /**
  * Get provisional score of submission
@@ -111,66 +33,3 @@ export function getFinalScore(submission) {
   }
   return finalScore;
 }
-
-/**
- * Process submissions of MM challenge
- * @param submissions the array of submissions
- * @param resources the challenge resources
- * @param registrants the challenge registrants
- */
-export function processMMSubmissions(submissions, resources, registrants) {
-  const data = {};
-  const result = [];
-
-  _.each(submissions, (submission) => {
-    const { memberId } = submission;
-    let memberHandle;
-    const resource = _.find(resources, r => _.get(r, 'userId').toString() === memberId.toString());
-    if (_.isEmpty(resource)) {
-      memberHandle = memberId;
-    } else {
-      memberHandle = _.has(resource, 'handle') ? _.get(resource, 'handle') : memberId.toString();
-    }
-    if (!data[memberHandle]) {
-      data[memberHandle] = [];
-    }
-    const validReviews = _.filter(submission.review,
-      r => !_.isEmpty(r) && (r.typeId !== AV_SCAN_SCORER_REVIEW_TYPE_ID));
-    validReviews.sort((a, b) => {
-      const dateA = new Date(a.created);
-      const dateB = new Date(b.created);
-      return dateB - dateA;
-    });
-
-    const provisionalScore = toFixed(_.get(validReviews, '[0].score', '-'), 5);
-    const finalScore = toFixed(_.get(submission, 'reviewSummation[0].aggregateScore', '-'), 5);
-
-    data[memberHandle].push({
-      submissionId: submission.id,
-      submissionTime: submission.created,
-      provisionalScore,
-      finalScore,
-    });
-  });
-
-  _.each(data, (value, key) => {
-    result.push({
-      submissions: [...value.sort((a, b) => new Date(b.submissionTime)
-        .getTime() - new Date(a.submissionTime).getTime())],
-      member: key,
-      colorStyle: getMMChallengeHandleStyle(key, registrants),
-    });
-  });
-
-  const { submissions: finalSubmissions, maxFinalScore } = processRanks(result);
-  finalSubmissions.sort((a, b) => {
-    if (maxFinalScore === 0) {
-      return a.provisionalRank - b.provisionalRank;
-    }
-    return a.finalRank - b.finalRank;
-  });
-
-  return finalSubmissions;
-}
-
-export default undefined;

src/utils/submission.js

@@ -29,12 +29,25 @@ export const REVIEW_OPPORTUNITY_TYPES = {
  * Gets payload from a standard success response from TC API; or throws
  * an error in case of a failure response.
  * @param {Object} res
+ * @param {Boolean} shouldThrowError should throw error if request fail
  * @return {Promise} Resolves to the payload.
  */
-export async function getApiResponsePayload(res) {
-  if (!res.ok) throw new Error(res.statusText);
+export async function getApiResponsePayload(res, shouldThrowError = true) {
+  if (!res.ok) {
+    if (shouldThrowError) {
+      throw new Error(res.statusText);
+    } else {
+      return null;
+    }
+  }
   const x = (await res.json()).result;
-  if (!x.success) throw new Error(x.content);
+  if ((!x.success)) {
+    if (shouldThrowError) {
+      throw new Error(x.content);
+    } else {
+      return null;
+    }
+  }
   return x.content;
 }