Skip to content

Commit 68cf7c9

Browse files
authored
Merge pull request #214 from cagdas001/integration-v5-challenge-api
fix(ChallengeDetails): return `userDetails.roles` with challenge details
2 parents 2249d45 + e11bded commit 68cf7c9

File tree

2 files changed

+8
-4
lines changed

2 files changed

+8
-4
lines changed

package-lock.json

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/services/challenges.js

+7-3
Original file line numberDiff line numberDiff line change
@@ -327,6 +327,7 @@ class ChallengesService {
327327
let submissions = [];
328328
let isLegacyChallenge = false;
329329
let isRegistered = false;
330+
const userDetails = { roles: [] };
330331

331332
// condition based on ROUTE used for Review Opportunities, change if needed
332333
if (/^[\d]{5,8}$/.test(challengeId)) {
@@ -372,6 +373,7 @@ class ChallengesService {
372373
}
373374
});
374375
}
376+
userDetails.roles = await this.getUserRolesInChallenge(challengeId);
375377
}
376378

377379
challenge = {
@@ -380,6 +382,7 @@ class ChallengesService {
380382
isRegistered,
381383
registrants,
382384
submissions,
385+
userDetails,
383386
events: _.map(challenge.events, e => ({
384387
eventName: e.key,
385388
eventId: e.id,
@@ -707,9 +710,10 @@ class ChallengesService {
707710
*/
708711
async getUserRolesInChallenge(challengeId) {
709712
const user = decodeToken(this.private.tokenV3);
710-
const url = `/resources?challengeId=${challengeId}?memberHandle=${user.handle}`;
711-
const resources = await this.private.apiV5.get(url);
712-
if (resources) return _.map(resources, 'roleId');
713+
const url = `/resources?challengeId=${challengeId}&memberHandle=${user.handle}`;
714+
const getResourcesResponse = await this.private.apiV5.get(url);
715+
const resources = await getResourcesResponse.json();
716+
if (resources) return _.map(_.filter(resources, r => r.memberHandle === user.handle), 'roleId');
713717
throw new Error(`Failed to fetch user role from challenge #${challengeId}`);
714718
}
715719
}

0 commit comments

Comments
 (0)