Merge pull request #228 from cagdas001/integration-v5-challenge-api

sushilshinde · web-flow · commit 97df7b5fa8ae · 2020-08-25T13:35:59.000+05:30
fix(challenge-utils): update `filterByUsers` to use `userId`
diff --git a/src/utils/challenge/filter.js b/src/utils/challenge/filter.js
@@ -173,8 +173,11 @@ function filterByUpcoming(challenge, state) {
 }
 
 function filterByUsers(challenge, state) {
-  if (!state.userChallenges) return true;
-  return state.userChallenges.find(ch => challenge.id === ch);
+  const userId = _.get(state, 'userId', null);
+  if (userId) {
+    return _.get(challenge, ['users', userId], false);
+  }
+  return true;
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -173,8 +173,11 @@ function filterByUpcoming(challenge, state) {`
`173`	`173`	`}`
`174`	`174`
`175`	`175`	`function filterByUsers(challenge, state) {`
`176`		`- if (!state.userChallenges) return true;`
`177`		`- return state.userChallenges.find(ch => challenge.id === ch);`
	`176`	`+ const userId = _.get(state, 'userId', null);`
	`177`	`+ if (userId) {`
	`178`	`+ return _.get(challenge, ['users', userId], false);`
	`179`	`+ }`
	`180`	`+ return true;`
`178`	`181`	`}`
`179`	`182`
`180`	`183`	`/**`