SUP-2231, New Empty States for Dashboard and Profile, SUP-2231, User has past challenges but not able to access the past challenges from dashboard as user do not have any active challenges.

-- Moved logic for checking participation into service.
-- Reversed the call order for participation and actual data services to avoid extra calls in most of the cases.

Author: vikasrohit

app/my-challenges/my-challenges.controller.js

@@ -42,11 +42,9 @@
     activate();
 
     function activate() {
-      _checkForParticipation().then(function() {
-        vm.isCopilot = _.includes(userIdentity.roles, 'copilot');
-        vm.myChallenges = [];
-        changeFilter(vm.statusFilter);
-      });
+      vm.isCopilot = _.includes(userIdentity.roles, 'copilot');
+      vm.myChallenges = [];
+      changeFilter(vm.statusFilter);
     }
 
     function changeView(view) {
@@ -85,10 +83,16 @@
       $q.all(promises)
       .then(function(data) {
         // data should be an array of 2 objects each with it's own array (2D array with metadata)
-        vm.loading = CONSTANTS.STATE_READY;
 
         vm.totalCount = _.sum(_.pluck(data, 'metadata.totalCount'));
         vm.myChallenges = vm.myChallenges.concat(_.union(data[0], data[1]));
+        if (vm.totalCount === 0) {
+          _checkForParticipation().then(function() {
+            vm.loading = CONSTANTS.STATE_READY;
+          });
+        } else {
+          vm.loading = CONSTANTS.STATE_READY;
+        }
       })
       .catch(function(resp) {
         $log.error(resp);
@@ -146,16 +150,8 @@
     }
 
     function _checkForParticipation() {
-      var params = {
-        limit: 1,
-        offset: 0
-      };
-      return ChallengeService.getUserChallenges(vm.handle, params).then(function(challenges) {
-        if (challenges.metadata.totalCount > 0) {
-          vm.neverParticipated = false;
-        } else {
-          vm.neverParticipated = true;
-        }
+      return ChallengeService.checkChallengeParticipation(vm.handle, function(participated) {
+        vm.neverParticipated = !participated;
       });
     }
   }

app/my-dashboard/my-challenges/my-challenges.controller.js

@@ -20,9 +20,7 @@
 
     function activate() {
       vm.myChallenges = [];
-      _checkForParticipation().then(function() {
-        getChallenges();
-      });
+      getChallenges();
     }
 
     function getChallenges() {
@@ -47,15 +45,17 @@
 
         if (!marathonMatches.length && !devDesignChallenges.length) {
           vm.userHasChallenges = false;
-          vm.loading = false;
+          _checkForParticipation().then(function() {
+            vm.loading = false;
+          });
 
         } else {
           ChallengeService.processActiveDevDesignChallenges(devDesignChallenges);
           ChallengeService.processActiveMarathonMatches(marathonMatches);
           var userChallenges = marathonMatches.concat(devDesignChallenges);
 
           userChallenges = _.sortBy(userChallenges, function(n) {
-            return n.registrationEndDate
+            return n.registrationEndDate;
           });
           vm.myChallenges = userChallenges.reverse().slice(0, 8);
           vm.userHasChallenges = true;
@@ -76,16 +76,8 @@
     }
 
     function _checkForParticipation() {
-      var params = {
-        limit: 1,
-        offset: 0
-      };
-      return ChallengeService.getUserChallenges(handle, params).then(function(challenges) {
-        if (challenges.metadata.totalCount > 0) {
-          vm.neverParticipated = true;
-        } else {
-          vm.neverParticipated = true;
-        }
+      return ChallengeService.checkChallengeParticipation(handle, function(participated) {
+        vm.neverParticipated = !participated;
       });
     }
   }

app/services/challenge.service.js

@@ -3,9 +3,9 @@
 
   angular.module('tc.services').factory('ChallengeService', ChallengeService);
 
-  ChallengeService.$inject = ['CONSTANTS', 'ApiService'];
+  ChallengeService.$inject = ['CONSTANTS', 'ApiService', '$q'];
 
-  function ChallengeService(CONSTANTS, ApiService) {
+  function ChallengeService(CONSTANTS, ApiService, $q) {
     var api = ApiService.restangularV3;
 
     var service = {
@@ -18,7 +18,8 @@
       processActiveMarathonMatches: processActiveMarathonMatches,
       processPastMarathonMatch: processPastMarathonMatch,
       processPastSRM: processPastSRM,
-      processPastChallenges: processPastChallenges
+      processPastChallenges: processPastChallenges,
+      checkChallengeParticipation: checkChallengeParticipation
     };
 
     return service;
@@ -207,5 +208,24 @@
         }
       });
     }
+
+    function checkChallengeParticipation(handle, callback) {
+      var params = {
+        limit: 1,
+        offset: 0
+      };
+      return $q.all([
+        getUserMarathonMatches(handle, params),
+        getUserChallenges(handle, params)
+      ]).then(function(data) {
+        var mms = data[0];
+        var challenges = data[1];
+        if (challenges.metadata.totalCount > 0 || mms.metadata.totalCount > 0) {
+          callback(true);
+        } else {
+          callback(false);
+        }
+      });
+    }
   };
 })();