Merge pull request topcoder-platform#239 from topcoder-platform/release-v5-develop

sushilshinde · web-flow · commit ef75d5279136 · 2020-09-01T13:00:26.000+05:30
Release v5 develop
diff --git a/src/actions/challenge.js b/src/actions/challenge.js
@@ -10,7 +10,6 @@ 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';
 import { getApi } from '../services/api';
 import * as submissionUtil from '../utils/submission';
 
@@ -147,25 +146,19 @@ function getMMSubmissionsInit(challengeId) {
  * @param {String} tokenV3  Topcoder auth token v3.
  * @return {Action}
  */
-function getMMSubmissionsDone(challengeId, registrants, tokenV3) {
+function getMMSubmissionsDone(challengeId, tokenV3) {
   const filter = { challengeId };
-  const memberService = getMemberService(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 finalSubmissions = submissionUtil.processMMSubmissions(submissions);
+      return {
+        challengeId,
+        submissions: finalSubmissions,
+        tokenV3,
+      };
     });
 }
 
diff --git a/src/services/challenges.js b/src/services/challenges.js
@@ -328,7 +328,7 @@ class ChallengesService {
     if (/^[\d]{5,8}$/.test(challengeId)) {
       isLegacyChallenge = true;
       challenge = await this.private.getChallenges('/challenges/', { legacyId: challengeId })
-        .then(res => res.challenges[0]);
+        .then(res => res.challenges[0] || {});
     } else {
       challenge = await this.private.getChallenges(`/challenges/${challengeId}`)
         .then(res => res.challenges);
diff --git a/src/utils/submission.js b/src/utils/submission.js
@@ -30,12 +30,6 @@ function toFixed(num, decimal) {
   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
@@ -118,21 +112,14 @@ export function getFinalScore(submission) {
  * @param resources the challenge resources
  * @param registrants the challenge registrants
  */
-export function processMMSubmissions(submissions, resources, registrants) {
+export function processMMSubmissions(submissions) {
   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] = [];
+    if (!data[memberId]) {
+      data[memberId] = [];
     }
     const validReviews = _.reject(submission.review, ['typeId', AV_SCAN_SCORER_REVIEW_TYPE_ID]);
     validReviews.sort((a, b) => {
@@ -149,7 +136,7 @@ export function processMMSubmissions(submissions, resources, registrants) {
     const provisionalScore = toFixed(_.get(validReviews, '[0].score', '-'), 5);
     const finalScore = toFixed(_.get(submission, 'reviewSummation[0].aggregateScore', '-'), 5);
 
-    data[memberHandle].push({
+    data[memberId].push({
       submissionId: submission.id,
       submissionTime: submission.created,
       provisionalScore,
@@ -163,8 +150,7 @@ export function processMMSubmissions(submissions, resources, registrants) {
     result.push({
       submissions: [...value.sort((a, b) => new Date(b.submissionTime)
         .getTime() - new Date(a.submissionTime).getTime())],
-      member: key,
-      colorStyle: getMMChallengeHandleStyle(key, registrants),
+      memberId: key,
     });
   });
 
