Fix for issue #3351

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],

__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 [],
 }

dist/dev/index.js

@@ -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/actions.lookup.md

@@ -13,6 +13,7 @@ members via API V3.
             * [new MembersService(tokenV3)](#new_module_services.members..MembersService_new)
             * [.getMemberFinances(handle)](#module_services.members..MembersService+getMemberFinances) ⇒ <code>Promise</code>
             * [.getMemberInfo(handle)](#module_services.members..MembersService+getMemberInfo) ⇒ <code>Promise</code>
+            * [.getListMemberInfo(members)](#module_services.members..MembersService+getListMemberInfo) ⇒ <code>Promise</code>
             * [.getExternalAccounts(handle)](#module_services.members..MembersService+getExternalAccounts) ⇒ <code>Promise</code>
             * [.getExternalLinks(handle)](#module_services.members..MembersService+getExternalLinks) ⇒ <code>Promise</code>
             * [.getSkills(handle)](#module_services.members..MembersService+getSkills) ⇒ <code>Promise</code>
@@ -53,6 +54,7 @@ Service class.
     * [new MembersService(tokenV3)](#new_module_services.members..MembersService_new)
     * [.getMemberFinances(handle)](#module_services.members..MembersService+getMemberFinances) ⇒ <code>Promise</code>
     * [.getMemberInfo(handle)](#module_services.members..MembersService+getMemberInfo) ⇒ <code>Promise</code>
+    * [.getListMemberInfo(members)](#module_services.members..MembersService+getListMemberInfo) ⇒ <code>Promise</code>
     * [.getExternalAccounts(handle)](#module_services.members..MembersService+getExternalAccounts) ⇒ <code>Promise</code>
     * [.getExternalLinks(handle)](#module_services.members..MembersService+getExternalLinks) ⇒ <code>Promise</code>
     * [.getSkills(handle)](#module_services.members..MembersService+getSkills) ⇒ <code>Promise</code>
@@ -104,6 +106,18 @@ This method does not require any authorization.
 | --- | --- | --- |
 | handle | <code>String</code> | Member handle. |
 
+#### membersService.getListMemberInfo(members) ⇒ <code>Promise</code>
+Gets public information on a list member.
+
+This method does not require any authorization.
+
+**Kind**: instance method of [<code>MembersService</code>](#module_services.members..MembersService)
+**Returns**: <code>Promise</code> - Resolves to the array.
+
+| Param | Type | Description |
+| --- | --- | --- |
+| members | <code>Array</code> | Array of member info. |
+
 <a name="module_services.members..MembersService+getExternalAccounts"></a>
 
 #### membersService.getExternalAccounts(handle) ⇒ <code>Promise</code>
@@ -114,7 +128,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 +140,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 +152,7 @@ Gets member skills.
 
 | Param | Type |
 | --- | --- |
-| handle | <code>String</code> | 
+| handle | <code>String</code> |
 
 <a name="module_services.members..MembersService+getStats"></a>
 
@@ -150,7 +164,7 @@ Gets member statistics.
 
 | Param | Type |
 | --- | --- |
-| handle | <code>String</code> | 
+| handle | <code>String</code> |
 
 <a name="module_services.members..MembersService+getStatsHistory"></a>
 
@@ -162,7 +176,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 +188,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>
 

docs/services.members.md

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

package-lock.json

@@ -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/actions/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',
@@ -83,6 +84,15 @@ export function normalizeChallengeDetails(challenge, filtered, user, username) {
     registrants: challenge.registrants || [],
   };
 
+
+  _.forEach(finalChallenge.registrants, (registrant) => {
+    if (registrant.memberInfo) {
+      const { homeCountryCode } = registrant.memberInfo;
+      // eslint-disable-next-line no-param-reassign
+      registrant.countryCode = homeCountryCode || registrant.memberInfo.competitionCountryCode;
+    }
+  });
+
   // Winners have different field names, needs to be normalized to match `filtered` and `challenge`
   finalChallenge.winners = _.map(
     challenge.winners,
@@ -262,6 +272,7 @@ class ChallengesService {
       getChallenges,
       tokenV2,
       tokenV3,
+      memberService: getMembersService(),
     };
   }
 
@@ -373,6 +384,8 @@ class ChallengesService {
     const challengeUser = username && await this.getUserChallenges(username, { id: challengeId })
       .then(res => res.challenges[0]).catch(() => null);
 
+    await this.private.memberService.getListMemberInfo(challenge.registrants || [], false);
+
     const finalChallenge = normalizeChallengeDetails(
       challenge,
       challengeFiltered,

src/reducers/lookup.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/challenges.js

@@ -48,6 +48,25 @@ class MembersService {
     return getApiResponsePayload(res);
   }
 
+  /**
+   * Gets public information on a list member.
+   *
+   * This method does not require any authorization.
+   *
+   * @param {Array} members List member info.
+   * @param {Boolean} shouldThrowError should throw error if request fail
+   * @return {Promise} Resolves to the data object.
+   */
+  async getListMemberInfo(members, shouldThrowError = true) {
+    const getHandle = async (member) => {
+      const result = await this.private.api.get(`/members/${member.handle}`);
+      // eslint-disable-next-line no-param-reassign
+      member.memberInfo = await getApiResponsePayload(result, shouldThrowError);
+    };
+    const apis = members.map(member => getHandle(member));
+    await Promise.all(apis);
+  }
+
   /**
    * Gets member external account info.
    * @param {String} handle

src/services/lookup.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;
 }