Skip to content

fix for Issue #4384 #181

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 2 commits into from
Jun 7, 2020
Merged

fix for Issue #4384 #181

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1aaf110
fix for issue #4384
srjr19 Jun 6, 2020
011284b
fix for issue #4384
srjr19 Jun 7, 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
43 changes: 27 additions & 16 deletions src/services/challenges.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -406,10 +406,17 @@ class ChallengesService {
* @param {Object} params Optional.
* @return {Promise} Resolves to the api response.
*/
getChallenges(filters, params) {
async getChallenges(filters, params) {
const memberId = this.private.tokenV3 ? decodeToken(this.private.tokenV3).userId : null;
let userChallenges = [];
if (memberId) {
userChallenges = await this.private.apiV5.get(`/resources/${memberId}/challenges`)
.then(checkErrorV5).then(res => res.result);
}
return this.private.getChallenges('/challenges/', filters, params)
.then((res) => {
res.challenges.forEach(item => normalizeChallenge(item));
res.challenges.forEach(item => normalizeChallenge(item,
userChallenges.includes(item.id) ? memberId : null));
return res;
});
}
Expand All @@ -436,25 +443,29 @@ class ChallengesService {
/**
* Gets challenges of the specified user.
* @param {String} userId User id whose challenges we want to fetch.
* @param {Object} filters Optional.
* @param {Number} params Optional.
* @return {Promise} Resolves to the api response.
*/
getUserChallenges(userId, filters, params) {
const userFilters = _.cloneDeep(filters);
ChallengesService.updateFiltersParamsForGettingMemberChallenges(userFilters, params);
const query = {
...params,
...userFilters,
memberId: userId,
};
const endpoint = '/challenges';
const url = `${endpoint}?${qs.stringify(_.omit(query, ['limit', 'offset', 'technologies']))}`;

return this.private.apiV5.get(url)
.then((res) => {
res.challenges.forEach(item => normalizeChallenge(item, userId));
return res;
return this.private.apiV5.get(`/resources/${userId}/challenges`)
.then(checkErrorV5).then((userChallenges) => {
const query = {
...params,
...userFilters,
ids: userChallenges.result,
};
const endpoint = '/challenges';
const url = `${endpoint}?${qs.stringify(_.omit(query, ['limit', 'offset', 'technologies']))}`;

return this.private.apiV5.get(url)
.then(checkErrorV5).then((res) => {
res.result.forEach(item => normalizeChallenge(item, userId));
const newResponse = {};
newResponse.challenges = res.result;
newResponse.totalCount = res.result.length;
return newResponse;
});
});
}

Expand Down