Skip to content

fix for issue #4384 feedback #183

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 8, 2020
Merged

fix for issue #4384 feedback #183

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
54 changes: 30 additions & 24 deletions src/services/challenges.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,18 +146,18 @@ class ChallengesService {
};
const url = `${endpoint}?${qs.stringify(query)}`;
const res = await this.private.apiV5.get(url).then(checkErrorV5);
let myChallengesCount = 0;
let myChallenges;
if (typeof this.private.tokenV3 !== 'undefined') {
const { userId } = decodeToken(this.private.tokenV3);
myChallengesCount = await this.private.apiV5.get(`/resources/${userId}/challenges`)
.then(checkErrorV5).then(userChallenges => userChallenges.headers.get('x-total'));
myChallenges = await this.private.apiV5.get(`/resources/${userId}/challenges`)
.then(checkErrorV5).then(userChallenges => userChallenges);
}
return {
challenges: res.result || [],
totalCount: res.headers.get('x-total'),
meta: {
allChallengesCount: res.headers.get('x-total'),
myChallengesCount,
myChallengesCount: (myChallenges && myChallenges.headers.get('x-total')) || 0,
ongoingChallengesCount: 0,
openChallengesCount: 0,
totalCount: res.headers.get('x-total'),
Expand Down Expand Up @@ -448,28 +448,34 @@ class ChallengesService {
* @param {String} userId User id whose challenges we want to fetch.
* @return {Promise} Resolves to the api response.
*/
getUserChallenges(userId, filters, params) {
async getUserChallenges(userId, filters, params) {
const userFilters = _.cloneDeep(filters);
ChallengesService.updateFiltersParamsForGettingMemberChallenges(userFilters, params);
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;
});
});

const userChallenges = await this.private.apiV5.get(`/resources/${userId}/challenges`)
.then(checkErrorV5).then(res => res);

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

const chResult = (chResponse && chResponse.result) || [];
return {
challenges: chResult,
totalCount: chResult.length,
};
}

/**
Expand Down