Merge pull request #29 from topcoder-platform/develop

Sync master with develop

Author: callmekatootie

src/services/LeaderboardService.js

@@ -11,7 +11,6 @@ const errors = require('../common/errors')
 const { Leaderboard } = require('../models')
 
 const timers = {}
-const challengesInGroups = {}
 
 /**
  * Get leaderboard detail by challenge id and member id
@@ -267,16 +266,6 @@ async function searchLeaderboards (filter) {
       .skip((filter.page - 1) * filter.perPage)
       .limit(filter.perPage)
   } else if (filter.groupId) {
-    let count
-    if (challengesInGroups[filter.groupId]) {
-      count = challengesInGroups[filter.groupId]
-    } else {
-      const challengeDetailRes = await helper.reqToAPI(
-        `${config.CHALLENGE_API_URL}?filter=groupIds=${filter.groupId}`)
-      count = _.get(challengeDetailRes, 'body.result.content', ['prevent divide by zero']).length
-      // cache the count since Challenge API is too slow
-      challengesInGroups[filter.groupId] = count
-    }
     const leaderboards = await Leaderboard.find({ groupIds: filter.groupId })
     const map = new Map()
     _.each(leaderboards, e => {
@@ -298,9 +287,6 @@ async function searchLeaderboards (filter) {
       map.get(e.memberId).reviews.push(e)
     })
     const result = Array.from(map.values())
-    _.each(result, e => {
-      e.finalAggregationScore = e.finalAggregationScore / count
-    })
     result.sort((a, b) => b.finalAggregationScore - a.finalAggregationScore)
     return result.slice((filter.page - 1) * filter.perPage, filter.page * filter.perPage)
   } else {