Refactor challenge list

Author: LieutenantRoger

src/services/challenges.js

@@ -15,6 +15,36 @@ import { getApi } from './api';
 import { getService as getMembersService } from './members';
 import { getService as getSubmissionsService } from './submissions';
 
+export function getFilterUrl(backendFilter, frontFilter) {
+  const ff = _.clone(frontFilter);
+  const { tags, tracks, types } = ff;
+  delete ff.tags;
+  delete ff.tracks;
+  delete ff.types;
+  delete ff.communityId;
+
+  console.log(ff);
+
+  let urlFilter = qs.stringify(_.reduce(ff, (result, value, key) => {
+    // eslint-disable-next-line no-param-reassign
+    if (value) result[key] = value;
+    return result;
+  }, {}));
+  console.log(urlFilter);
+
+  const ftags = _.map(tags, val => `tags[]=${val}`).join('&');
+  const ftracks = _.map(_.reduce(tracks, (result, value, key) => {
+    // eslint-disable-next-line no-unused-expressions
+    tracks[key] && result.push(key);
+    return result;
+  }, []), val => `tracks[]=${val}`).join('&');
+  const ftypes = _.map(types, val => `types[]=${val}`).join('&');
+  if (ftags.length > 0) urlFilter += `&${ftags}`;
+  if (ftracks.length > 0) urlFilter += `&${ftracks}`;
+  if (ftypes.length > 0) urlFilter += `&${ftypes}`;
+  return urlFilter;
+}
+
 export const ORDER_BY = {
   SUBMISSION_END_DATE: 'submissionEndDate',
 };
@@ -133,14 +163,12 @@ class ChallengesService {
      */
     const getChallenges = async (
       endpoint,
-      filters = {},
-      params = {},
+      filter,
     ) => {
-      const query = {
-        ...filters,
-        ...params,
-      };
-      const url = `${endpoint}?${qs.stringify(query)}`;
+      console.log(filter);
+      const query = getFilterUrl(filter.backendFilter, filter.frontFilter);
+      const url = `${endpoint}?${query}`;
+      console.log(url);
       const res = await this.private.apiV5.get(url).then(checkErrorV5);
       return {
         challenges: res.result || [],
@@ -462,8 +490,8 @@ class ChallengesService {
    * @param {Object} params Optional.
    * @return {Promise} Resolves to the api response.
    */
-  async getChallenges(filters, params) {
-    return this.private.getChallenges('/challenges/', filters, params)
+  async getChallenges(filter) {
+    return this.private.getChallenges('/challenges/', filter)
       .then((res) => {
         res.challenges.forEach(item => normalizeChallenge(item));
         return res;

src/utils/challenge/filter.js

@@ -144,22 +144,23 @@ function filterByStatus(challenge, state) {
 }
 
 function filterByTags(challenge, state) {
-  if (!state.tags) return true;
+  if (!state.tags || state.tags.length === 0) return true;
   const { platforms, tags } = challenge;
-  const str = `${platforms} ${tags}`.toLowerCase();
+  const str = `${platforms.join(' ')} ${tags.join(' ')}`.toLowerCase();
   return state.tags.some(tag => str.includes(tag.toLowerCase()));
 }
 
 function filterByText(challenge, state) {
-  if (!state.text) return true;
+  if (!state.name) return true;
   const str = `${challenge.name} ${challenge.tags} ${challenge.platforms} ${challenge.tags}`
     .toLowerCase();
-  return str.includes(state.text.toLowerCase());
+  return str.includes(state.name.toLowerCase());
 }
 
 function filterByTrack(challenge, state) {
-  if (!state.tracks) return true;
-  return _.keys(state.tracks).some(track => challenge.track === track);
+  // if (!state.tracks) return true;
+  // eslint-disable-next-line max-len
+  return state.tracks[challenge.track] === true;
 }
 
 function filterByTypes(challenge, state) {
@@ -239,7 +240,13 @@ export function getFilterFunction(state) {
  */
 export function getReviewOpportunitiesFilterFunction(state, validTypes) {
   return (opp) => {
-    const newType = _.find(validTypes, { name: opp.challenge.type }) || {};
+    const trackAbbr = {
+      DATA_SCIENCE: 'DS',
+      DEVELOP: 'Dev',
+      DESIGN: 'Des',
+      QA: 'QA',
+    };
+    // const newType = _.find(validTypes, { name: opp.challenge.type }) || {};
 
     // Review Opportunity objects have a challenge field which
     // is largely compatible with many of the existing filter functions
@@ -248,16 +255,27 @@ export function getReviewOpportunitiesFilterFunction(state, validTypes) {
       ...opp.challenge,
       // This allows filterByText to search for Review Types and Challenge Titles
       name: `${opp.challenge.title} ${REVIEW_OPPORTUNITY_TYPES[opp.type]}`,
-      registrationStartDate: opp.startDate, // startDate of Review, not Challenge
-      submissionEndDate: opp.startDate, // Currently uses startDate for both date comparisons
-      communities: new Set([ // Used to filter by Track, and communities at a future date
-        opp.challenge.track.toLowerCase(),
-      ]),
-      typeId: newType.id,
+      // registrationStartDate: opp.startDate, // startDate of Review, not Challenge
+      // submissionEndDate: opp.startDate, // Currently uses startDate for both date comparisons
+      // communities: new Set([ // Used to filter by Track, and communities at a future date
+      // opp.challenge.track === 'QA' ? 'Dev' : trackAbbr[opp.challenge.track],
+      // ]),
+      track: trackAbbr[opp.challenge.track],
+      // typeId: newType.id,
       tags: opp.challenge.technologies || [],
       platforms: opp.challenge.platforms || [],
     };
-
+    /**
+    console.log(challenge);
+    console.log(`=====`);
+    console.log(`11111`);
+    console.log(filterByTrack(challenge, state));
+    console.log(filterByText(challenge, state));
+    console.log(filterByTags(challenge, state));
+    console.log(filterByEndDate(challenge, state));
+    console.log(filterByStartDate(challenge, state));
+    console.log(filterByReviewOpportunityType(opp, state));
+    */
     return (
       filterByTrack(challenge, state)
       && filterByText(challenge, state)

src/utils/tc.js

@@ -11,9 +11,9 @@
  * uses upper-case literals to encode the tracks. At some point, we should
  * update it in this code as well! */
 export const COMPETITION_TRACKS = {
-  DATA_SCIENCE: 'Data Science',
-  DESIGN: 'Design',
-  DEVELOP: 'Development',
+  DS: 'Data Science',
+  DES: 'Design',
+  DEV: 'Development',
   QA: 'Quality Assurance',
 };