Skip to content
This repository was archived by the owner on Mar 13, 2025. It is now read-only.

Sync master with develop #35

Merged
merged 9 commits into from
Oct 23, 2020
Merged

Sync master with develop #35

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
a351157
updates for storing final score along with the provisional
Nov 13, 2019
90df05e
Bump acorn from 5.7.3 to 5.7.4
dependabot[bot] Apr 4, 2020
2cf6a9f
Update to use v5 challenge api
callmekatootie Oct 23, 2020
0b2551e
Upgrade to use v5 member api
callmekatootie Oct 23, 2020
55796d1
Merge pull request #30 from topcoder-platform/dependabot/npm_and_yarn…
callmekatootie Oct 23, 2020
8a1f9ce
Bump lodash from 4.17.15 to 4.17.19
dependabot[bot] Oct 23, 2020
a2c5391
Merge pull request #32 from topcoder-platform/dependabot/npm_and_yarn…
callmekatootie Oct 23, 2020
f1781d1
Bump handlebars from 4.4.5 to 4.7.6
dependabot[bot] Oct 23, 2020
6e04ab5
Merge pull request #33 from topcoder-platform/dependabot/npm_and_yarn…
callmekatootie Oct 23, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Update to use v5 challenge api
  • Loading branch information
@callmekatootie
callmekatootie committed Oct 23, 2020
commit 2cf6a9fb38552274a40063da5c50ea38e7949760
2 changes: 1 addition & 1 deletion config/default.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ module.exports = {
: '["https://topcoder-dev.auth0.com/", "https://api.topcoder.com"]',

MONGODB_URL: process.env.MONGODB_URL || 'mongodb://localhost:27017/leaderboardDB',
CHALLENGE_API_URL: process.env.CHALLENGE_API_URL || 'https://api.topcoder-dev.com/v4/challenges',
CHALLENGE_API_URL: process.env.CHALLENGE_API_URL || 'https://api.topcoder-dev.com/v5/challenges',
MEMBER_API_URL: process.env.MEMBER_API_URL || 'https://api.topcoder-dev.com/v3/users',

GROUP_IDS: process.env.GROUP_IDS || '202343,20000000', // Comma separated string of Group IDs,
Expand Down
2 changes: 1 addition & 1 deletion src/common/helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ const m2m = m2mAuth(_.pick(config, ['AUTH0_URL', 'AUTH0_AUDIENCE', 'TOKEN_CACHE_
const isGroupIdValid = (groupIds) => {
// Get the Group IDs from config
const confGroupIds = config.GROUP_IDS.split(',')
if (_.intersectionBy(confGroupIds, groupIds, parseInt).length !== 0) {
if (_.intersectionBy(confGroupIds, groupIds).length !== 0) {
return true
}
return false
Expand Down
6 changes: 3 additions & 3 deletions src/services/LeaderboardService.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,13 +76,13 @@ async function createLeaderboard (challengeId, memberId, review) {
const { testsPassed, totalTestCases } = calculateResult(review)

const challengeDetailRes = await helper.reqToAPI(
`${config.CHALLENGE_API_URL}?filter=id=${challengeId}`)
const challenge = _.get(challengeDetailRes, 'body.result.content[0]')
`${config.CHALLENGE_API_URL}?legacyId=${challengeId}`)
const challenge = _.get(challengeDetailRes, 'body[0]')
if (!challenge) {
throw new errors.BadRequestError(`Challenge # ${challengeId} doesn't exist`)
}

const groupIds = challenge.groupIds
const groupIds = challenge.groups
if (!helper.isGroupIdValid(groupIds)) {
logger.debug(`Group ID (${JSON.stringify(groupIds)}) of Challenge # ${challengeId} is not in the configured set of Ids (${config.GROUP_IDS}) configured for processing!`)
// Ignore the message
Expand Down