Merge pull request #643 from ubc/fixcount

fixed up count on admin and lrs dashboard. Need suggestions!

Author: ryasmi

app/locker/data/dashboards/AdminDashboard.php

@@ -60,7 +60,11 @@ public function lrsCount(){
    *
    **/
   public function actorCount(){
-    return \Statement::distinct('statement.actor.mbox')->remember(5)->count();
+    $mbox =  intval( \Statement::distinct('statement.actor.mbox')->remember(5)->get()->count() );
+    $openid =  intval( \Statement::distinct('statement.actor.openid')->remember(5)->get()->count() );
+    $mbox_sha1sum =  intval( \Statement::distinct('statement.actor.mbox_sha1sum')->remember(5)->get()->count() );
+    $account =  intval( \Statement::distinct('statement.actor.account.name')->remember(5)->get()->count() );
+    return ($mbox + $openid + $mbox_sha1sum + $account);
   }
 
   /**

app/locker/data/dashboards/LrsDashboard.php

@@ -52,19 +52,40 @@ public function statementCount(){
    *
    **/
   public function actorCount(){
+    $count_array = ['mbox' => '', 'openid' => '', 'mbox_sha1sum' => '', 'account' => ''];
+    
+    $count_array['mbox'] = $this->db->statements->aggregate(
+            ['$match' => $this->getMatch( $this->lrs )],
+            ['$group' => ['_id' => '$statement.actor.mbox']],
+            ['$group' => ['_id' => 1, 'count' => ['$sum' => 1]]]
+    );
+    
+    $count_array['openid'] = $this->db->statements->aggregate(
+            ['$match' => $this->getMatch( $this->lrs )],
+            ['$group' => ['_id' => '$statement.actor.openid']],
+            ['$group' => ['_id' => 1, 'count' => ['$sum' => 1]]]
+    );
+    
+    $count_array['mbox_sha1sum'] = $this->db->statements->aggregate(
+            ['$match' => $this->getMatch( $this->lrs )],
+            ['$group' => ['_id' => '$statement.actor.mbox_sha1sum']],
+            ['$group' => ['_id' => 1, 'count' => ['$sum' => 1]]]
+    );
+    
+    $count_array['account'] = $this->db->statements->aggregate(
+            ['$match' => $this->getMatch( $this->lrs )],
+            ['$group' => ['_id' => ['accountName' => '$statement.actor.account.name', 'accountHomePage' => '$statement.actor.account.homePage']]],
+            ['$group' => ['_id' => 1, 'count' => ['$sum' => 1]]]
+    );
 
-    $count = $this->db->statements->aggregate(
-              array('$match' => $this->getMatch( $this->lrs )),
-              array('$group' => array('_id' => '$statement.actor.mbox')),
-              array('$group' => array('_id' => 1, 'count' => array('$sum' => 1)))
-              );
-
-    if( isset($count['result'][0]) ){
-      return $count['result'][0]['count'];
-    }else{
-      return 0;
+    $summary = 0;
+    foreach ($count_array as $key => $val) {
+        if( isset($val['result'][0]) ){
+          $summary += $val['result'][0]['count'];
+        }
     }
-
+    
+    return $summary;
   }
 
   /**