Merge pull request topcoder-platform#302 from nursoltan-s/recommender-final-fix-api

dedywahyudi · web-flow · commit d8efc2a3ed8d · 2021-02-24T20:59:54.000+07:00
Recommender final fix api
diff --git a/package-lock.json b/package-lock.json
diff --git 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": "1000.27.5",
+  "version": "1.1.6",
   "dependencies": {
     "auth0-js": "^6.8.4",
     "config": "^3.2.0",
diff --git a/src/services/challenges.js b/src/services/challenges.js
@@ -536,25 +536,26 @@ class ChallengesService {
    * @return {Promise} Resolves to the api response.
    */
   async getRecommendedChallenges(filter, handle) {
-    const query = getFilterUrl(
-      filter.backendFilter,
-      { ...filter.frontFilter, per_page: filter.frontFilter.perPage },
-    );
+    filter.frontFilter.per_page = filter.frontFilter.perPage;
+    delete filter.frontFilter.perPage;
+
+    const query = getFilterUrl(filter.backendFilter, filter.frontFilter);
 
     let res = {};
+    let totalCount = 0;
     if (_.some(filter.frontFilter.tracks, val => val)
       && !_.isEqual(filter.frontFilter.types, [])) {
       const url = `/recommender-api/${handle}?${query}`;
       res = await this.private.apiV5.get(url).then(checkErrorV5);
+      totalCount = res.headers.get('x-total') || 0;
     }
-    const challenges = res.result.filter(ch => ch.jaccard_index > 0);
 
-    const totalCount = challenges.length;
+    const challenges = res.result ? res.result.filter(ch => ch.jaccard_index > 0) : [];
     return {
       challenges,
       totalCount,
       meta: {
-        allChallengesCount: challenges.length,
+        allChallengesCount: totalCount,
         allRecommendedChallengesCount: 0,
         myChallengesCount: 0,
         ongoingChallengesCount: 0,
