Merge pull request #184 from simranb86/issue_4383

fix for issue #4383

Author: sushilshinde

src/actions/members.js

@@ -146,6 +146,8 @@ async function getActiveChallengesInit(handle, uuid) {
 async function getActiveChallengesDone(handle, uuid, tokenV3) {
   const filter = { status: 'Active' };
   const service = getChallengesService(tokenV3);
+  const memberInfo = await getService(tokenV3).getMemberInfo(handle);
+
   /* TODO: Reuse `getAll` from `actions/challenge-listing`
   /* after it moved from `community-app` to here.
    */
@@ -160,7 +162,7 @@ async function getActiveChallengesDone(handle, uuid, tokenV3) {
     });
   }
   const calls = [
-    getAll(params => service.getUserChallenges(handle, filter, params)),
+    getAll(params => service.getUserChallenges(memberInfo.userId, filter, params)),
   ];
 
   const [challenges] = await Promise.all(calls);

src/services/challenges.js

@@ -492,30 +492,22 @@ class ChallengesService {
   async getUserChallenges(userId, filters, params) {
     const userFilters = _.cloneDeep(filters);
     ChallengesService.updateFiltersParamsForGettingMemberChallenges(userFilters, params);
+    const query = {
+      ...params,
+      ...userFilters,
+      memberId: userId,
+    };
+    const url = `/challenges?${qs.stringify(_.omit(query, ['limit', 'offset', 'technologies']))}`;
+    const userChallenges = await this.private.apiV5.get(url)
+      .then(checkErrorV5)
+      .then((res) => {
+        res.result.forEach(item => normalizeChallenge(item, userId));
+        return res.result;
+      });
 
-    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,
+      challenges: userChallenges,
+      totalCount: userChallenges.length,
     };
   }