Merge pull request topcoder-platform#231 from topcoder-platform/issue-4575

sushilshinde · sushilshinde · commit 25e166bac794 · 2020-09-01T13:59:51.000+05:30
community-app#4575 - Sub community filter not working
diff --git a/src/services/members.js b/src/services/members.js
@@ -7,6 +7,7 @@
 /* global XMLHttpRequest */
 import _ from 'lodash';
 import qs from 'qs';
+import { decodeToken } from 'tc-accounts';
 import logger from '../utils/logger';
 import { getApiResponsePayload } from '../utils/tc';
 import { getApi } from './api';
@@ -329,7 +330,8 @@ class MembersService {
    * @param {Array} challengeId the challenge id
    */
   async getChallengeResources(challengeId) {
-    const url = `/resources?challengeId=${challengeId}`;
+    const user = decodeToken(this.private.tokenV3);
+    const url = `/resources?challengeId=${challengeId}&memberId=${user.userId}`;
     let res = null;
 
     try {
@@ -346,14 +348,14 @@ class MembersService {
    * @param {Array} memberId the member id
    */
   async getUserResources(memberId) {
-    const url = `/resources/${memberId}/challenges`;
+    const url = `/challenges?status=Active&memberId=${memberId}`;
     const res = await this.private.apiV5.get(url);
     const challenges = await res.json();
     const roles = await this.getResourceRoles();
     const calls = [];
 
     challenges.forEach(async (ch) => {
-      calls.push(this.getChallengeResources(ch));
+      calls.push(this.getChallengeResources(ch.id));
     });
 
     return Promise.all(calls).then((resources) => {
diff --git a/src/utils/challenge/filter.js b/src/utils/challenge/filter.js
@@ -71,8 +71,9 @@ import { COMPETITION_TRACKS, REVIEW_OPPORTUNITY_TYPES } from '../tc';
  */
 
 function filterByGroupIds(challenge, state) {
-  if (!state.groupIds) return true;
-  return state.groupIds.some(id => challenge.groups[id]);
+  if (_.isEmpty(state.groupIds)) return true;
+  if (_.isEmpty(challenge.groups)) return false;
+  return state.groupIds.some(id => challenge.groups.find(gId => gId === id));
 }
 
 function filterByRegistrationOpen(challenge, state) {
@@ -144,12 +145,18 @@ function filterByStatus(challenge, state) {
 }
 
 function filterByTags(challenge, state) {
-  if (!state.tags) return true;
+  if (_.isEmpty(state.tags)) return true;
   const { platforms, tags } = challenge;
   const str = `${platforms} ${tags}`.toLowerCase();
   return state.tags.some(tag => str.includes(tag.toLowerCase()));
 }
 
+function filterByEvents(challenge, state) {
+  if (_.isEmpty(state.events)) return true;
+  if (_.isEmpty(challenge.events)) return false;
+  return state.events.some(key => challenge.events.find(e => e.key === key));
+}
+
 function filterByText(challenge, state) {
   if (!state.text) return true;
   const str = `${challenge.name} ${challenge.tags} ${challenge.platforms} ${challenge.tags}`
@@ -214,6 +221,7 @@ export function getFilterFunction(state) {
       && filterByGroupIds(challenge, state)
       && filterByText(challenge, state)
       && filterByTags(challenge, state)
+      && filterByEvents(challenge, state)
       && filterByTypes(challenge, state)
       && filterByUsers(challenge, state)
       && filterByEndDate(challenge, state)
@@ -343,7 +351,7 @@ export function combine(...filters) {
   const res = {};
   filters.forEach((filter) => {
     combineEndDate(res, filter);
-    combineArrayRules(res, filter, 'groups');
+    combineArrayRules(res, filter, 'groupIds');
     /* TODO: The registrationOpen rule is just ignored for now. */
     combineStartDate(res, filter);
     combineArrayRules(res, filter, 'or', true);
@@ -380,7 +388,7 @@ export function combine(...filters) {
  */
 export function mapToBackend(filter) {
   const res = {};
-  if (filter.groups) res.groups = filter.groups;
+  if (filter.groupIds) res.groups = filter.groupIds;
   return res;
 }
 
