Skip to content

issue-4380 - Hotfix #193

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 16, 2020
Merged

issue-4380 - Hotfix #193

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 5 additions & 16 deletions src/services/challenges.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,18 +339,11 @@ class ChallengesService {
.then(res => res.challenges);
}

// TEMP FIX until API was fixed
try {
const registrants = await this.getChallengeRegistrants(challenge.id);
challenge.registrants = registrants;
} catch (err) {
challenge.registrants = [];
}
const registrants = await this.getChallengeRegistrants(challenge.id);
challenge.registrants = registrants;

if (memberId) {
const userChallenges = await this.private.apiV5.get(`/resources/${memberId}/challenges`)
.then(checkErrorV5).then(res => res.result);
isRegistered = _.includes(userChallenges, challengeId);
isRegistered = _.some(registrants, r => r.memberId === memberId);
}

challenge.isLegacyChallenge = isLegacyChallenge;
Expand All @@ -373,19 +366,15 @@ class ChallengesService {
* @return {Promise} Resolves to the challenge registrants array.
*/
async getChallengeRegistrants(challengeId) {
const roleId = await this.getRoleId('Submitter');
/* If no token provided, resource will return Submitter role only */
const params = {
challengeId,
roleId,
roleId: this.private.tokenV3 ? await this.getRoleId('Submitter') : '',
};

const registrants = await this.private.apiV5.get(`/resources?${qs.stringify(params)}`)
.then(checkErrorV5).then(res => res.result);

if (_.isEmpty(registrants)) {
throw new Error('Resource Role not found!');
}

return registrants || [];
}

Expand Down