Merge branch 'integration-v5-challenge-api' into issue-4393

Author: luizrrodrigues

__tests__/__snapshots__/index.js.snap

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

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.21",
+  "version": "1000.19.26",
   "dependencies": {
     "auth0-js": "^6.8.4",
     "config": "^3.2.0",

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/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/services/challenges.js

@@ -13,6 +13,7 @@ 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';
+import { getService as getSubmissionsService } from './submissions';
 
 export const ORDER_BY = {
   SUBMISSION_END_DATE: 'submissionEndDate',
@@ -197,6 +198,7 @@ class ChallengesService {
       tokenV2,
       tokenV3,
       memberService: getMembersService(),
+      submissionsService: getSubmissionsService(tokenV3),
     };
   }
 
@@ -321,8 +323,11 @@ class ChallengesService {
   async getChallengeDetails(challengeId) {
     const memberId = this.private.tokenV3 ? decodeToken(this.private.tokenV3).userId : null;
     let challenge = {};
+    let registrants = [];
+    let submissions = [];
     let isLegacyChallenge = false;
     let isRegistered = false;
+
     // condition based on ROUTE used for Review Opportunities, change if needed
     if (/^[\d]{5,8}$/.test(challengeId)) {
       isLegacyChallenge = true;
@@ -333,28 +338,59 @@ class ChallengesService {
         .then(res => res.challenges);
     }
 
-    let registrants = await this.getChallengeRegistrants(challenge.id);
-    // This TEMP fix to colorStyle, this will be fixed with issue #4530
-    registrants = _.map(registrants, r => ({
-      ...r, colorStyle: 'color: #151516',
-    }));
-    challenge.registrants = registrants;
+    if (challenge) {
+      registrants = await this.getChallengeRegistrants(challenge.id);
+
+      // This TEMP fix to colorStyle, this will be fixed with issue #4530
+      registrants = _.map(registrants, r => ({
+        ...r, colorStyle: 'color: #151516',
+      }));
+
+      /* Prepare data to logged user */
+      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,
+          perPage: 100,
+        };
+        submissions = await this.private.submissionsService.getSubmissions(subParams);
+
+        if (submissions) {
+          // Remove AV Scan, SonarQube Review and Virus Scan review types
+          const reviewScans = await this.private.submissionsService.getScanReviewIds();
+          submissions.forEach((s, i) => {
+            submissions[i].review = _.reject(s.review, r => r && _.includes(reviewScans, r.typeId));
+          });
+
+          // Add submission date to registrants
+          registrants.forEach((r, i) => {
+            const submission = submissions.find(s => s.memberId === Number(r.memberId));
+            if (submission) {
+              registrants[i].submissionDate = submission.created;
+            }
+          });
+        }
+      }
 
-    if (memberId) {
-      isRegistered = _.some(registrants, r => r.memberId === memberId);
+      challenge = {
+        ...challenge,
+        isLegacyChallenge,
+        isRegistered,
+        registrants,
+        submissions,
+        events: _.map(challenge.events, e => ({
+          eventName: e.key,
+          eventId: e.id,
+          description: e.name,
+        })),
+        fetchedWithAuth: Boolean(this.private.apiV5.private.token),
+      };
     }
 
-    challenge.isLegacyChallenge = isLegacyChallenge;
-    challenge.isRegistered = isRegistered;
-
-    challenge.events = _.map(challenge.events, e => ({
-      eventName: e.key,
-      eventId: e.id,
-      description: e.name,
-    }));
-
-    challenge.fetchedWithAuth = Boolean(this.private.apiV5.private.token);
-
     return challenge;
   }
 
@@ -481,6 +517,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.

src/services/members.js

@@ -21,6 +21,7 @@ class MembersService {
   constructor(tokenV3) {
     this.private = {
       api: getApi('V3', tokenV3),
+      apiV5: getApi('V5', tokenV3),
       tokenV3,
     };
   }
@@ -312,6 +313,63 @@ class MembersService {
     const res = await this.private.api.get(url);
     return getApiResponsePayload(res);
   }
+
+  /**
+   * Fetch resources roles
+   * @param {Array} memberId the member id
+   */
+  async getResourceRoles() {
+    const res = await this.private.apiV5.get('/resource-roles');
+    const roles = await res.json();
+    return roles;
+  }
+
+  /**
+   * Fetch user challenge resources
+   * @param {Array} challengeId the challenge id
+   */
+  async getChallengeResources(challengeId) {
+    const url = `/resources?challengeId=${challengeId}`;
+    let res = null;
+
+    try {
+      res = await this.private.apiV5.get(url);
+    } catch (error) {
+      // logger.error('Failed to load challenge resource', error);
+    }
+
+    return res.json();
+  }
+
+  /**
+   * Fetch user registered challenge's resources
+   * @param {Array} memberId the member id
+   */
+  async getUserResources(memberId) {
+    const url = `/resources/${memberId}/challenges`;
+    const res = await this.private.apiV5.get(url);
+    const challenges = await res.json();
+    const roles = await this.getResourceRoles();
+    const calls = [];
+
+    challenges.forEach(async (ch) => {
+      calls.push(this.getChallengeResources(ch));
+    });
+
+    return Promise.all(calls).then((resources) => {
+      const results = [];
+      resources.forEach((resource) => {
+        const userResource = _.find(resource, { memberId });
+        if (userResource) {
+          const challengeRole = _.find(roles, { id: userResource.roleId });
+          const { name } = challengeRole || '';
+          results.push({ id: userResource.challengeId, name });
+        }
+      });
+
+      return results;
+    });
+  }
 }
 
 let lastInstance = null;

src/services/submissions.js

@@ -3,6 +3,7 @@
  * @desc This module provides a service for convenient manipulation with
  *  Topcoder submissions via TC API. Currently only used for MM challenges
  */
+import _ from 'lodash';
 import qs from 'qs';
 import { getApi } from './api';
 
@@ -39,6 +40,26 @@ class SubmissionsService {
       .then(res => res);
   }
 
+  /**
+   * Get scan reviews types
+   * @returns {Promise} Resolves to the api response.
+   */
+  async getScanReviewIds() {
+    const reviews = await Promise.all([
+      this.private.apiV5.get('/reviewTypes?name=AV Scan')
+        .then(res => (res.ok ? res.json() : new Error(res.statusText)))
+        .then(res => res),
+      this.private.apiV5.get('/reviewTypes?name=SonarQube Review')
+        .then(res => (res.ok ? res.json() : new Error(res.statusText)))
+        .then(res => res),
+      this.private.apiV5.get('/reviewTypes?name=Virus Scan')
+        .then(res => (res.ok ? res.json() : new Error(res.statusText)))
+        .then(res => res),
+    ]).then(([av, sonar, virus]) => (_.concat(av, sonar, virus)));
+
+    return reviews.map(r => r.id);
+  }
+
   /**
    * Get submission information by submission id
    * @param submissionId The submission id

src/utils/challenge/filter.js

@@ -173,8 +173,8 @@ function filterByUpcoming(challenge, state) {
 }
 
 function filterByUsers(challenge, state) {
-  if (!state.users) return true;
-  return state.users.find(user => challenge.users[user]);
+  if (!state.userChallenges) return true;
+  return state.userChallenges.find(ch => challenge.id === ch);
 }
 
 /**