diff --git a/package.json b/package.json index 61752619..20f49c6f 100644 --- a/package.json +++ b/package.json @@ -31,7 +31,7 @@ "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .", "test": "npm run lint && npm run jest" }, - "version": "1.0.4", + "version": "1.0.5", "dependencies": { "auth0-js": "^6.8.4", "config": "^3.2.0", diff --git a/src/actions/members.js b/src/actions/members.js index 13a14fdb..4cc23a1c 100644 --- a/src/actions/members.js +++ b/src/actions/members.js @@ -331,6 +331,7 @@ async function getUserMarathonInit(handle, uuid) { * @desc Create an action that loads the member marathon. * @param {String} uuid Operation UUID. * @param {String} handle Member handle. + * @param {String} memberId Member id. * @param {String} tokenV3 v3 auth token. * @param {Number} start page. * @param {Number} page size. @@ -338,20 +339,21 @@ async function getUserMarathonInit(handle, uuid) { * @return {Action} */ async function getUserMarathonDone( - uuid, handle, tokenV3, pageNum, pageSize, + uuid, handle, memberId, tokenV3, pageNum, pageSize, refresh, ) { - const filter = { status: 'PAST', isRatedForMM: 'true' }; + const filter = { status: 'Completed' }; const params = {}; - params.orderBy = 'endDate desc'; - params.limit = pageSize; - params.offset = pageNum * pageSize; + params.sortBy = 'endDate'; + params.sortOrder = 'desc'; + params.perPage = pageSize; + params.page = pageNum; const service = getChallengesService(tokenV3); - return service.getUserMarathonMatches(handle, filter, params) + return service.getUserMarathonMatches(memberId, filter, params) .then(res => ({ uuid, - marathons: res, + marathons: { challenges: res }, refresh, handle, })); diff --git a/src/services/challenges.js b/src/services/challenges.js index d3e4b3c8..5dc24d7f 100644 --- a/src/services/challenges.js +++ b/src/services/challenges.js @@ -534,18 +534,20 @@ class ChallengesService { /** * Gets marathon matches of the specified user. * @param {String} memberId User whose challenges we want to fetch. + * @param {Object} filter * @param {Object} params * @return {Promise} Resolves to the api response. */ - async getUserMarathonMatches(memberId, params) { + async getUserMarathonMatches(memberId, filter, params) { const newParams = { + ...filter, ...params, tag: 'Marathon Match', memberId, }; const res = await this.private.apiV5.get(`/challenges?${qs.stringify(newParams)}`); - return getApiResponsePayload(res); + return res.json(); } /**