Fix display bug with metrics #197

Author: dustinhuynh

classes/metric/online_users_metric.php

@@ -111,6 +111,7 @@ public function generate_metric_items($backwardperiod, $finishtime = null, \prog
                     FROM {logstore_standard_log}
                    WHERE timecreated >= :starttime
                      AND timecreated <= :finishtime
+                     AND action = "loggedin"
                 )
 
                 SELECT user_data.time as time, COUNT(DISTINCT(user_data.userid)) as value

classes/metric/yearly_active_users_metric.php

@@ -116,10 +116,10 @@ public function is_autobackfill(): bool {
      */
     public function generate_metric_item(int $starttime, int $finishtime): metric_item {
         global $DB;
-        $lastyear = $finishtime - (60 * 60 * 24 * 365);
+        $lastyear = $finishtime - YEARSECS;
         $users = $DB->count_records_select(
             'user',
-            'confirmed = 1 AND (lastlogin > ? OR currentlogin > ?)',
+            'confirmed = 1 AND (lastlogin >= ? OR currentlogin >= ?)',
             [$lastyear, $lastyear]
         );
         return new metric_item($this->get_name(), $finishtime, $users, $this);
@@ -146,10 +146,11 @@ public function generate_metric_items(int $backwardperiod, ?int $finishtime = nu
         if ($finishtime < $starttime) {
             return [];
         }
-        $sql = 'SELECT COUNT(DISTINCT userid)
+        $sql = "SELECT COUNT(DISTINCT userid)
                   FROM {logstore_standard_log}
                  WHERE timecreated >= :from
-                   AND timecreated <= :to';
+                   AND timecreated <= :to
+                   AND action = 'loggedin'";
         // Variables for updating progress.
         $count = 0;
         $total = ($finishtime - $starttime) / $interval;

collector/database/tests/cltr_database_test.php

@@ -184,7 +184,7 @@ public function test_backfillable_metric() {
             $dataobjects[] = [
                 'eventname' => '\core\event\user_created',
                 'component' => 'core',
-                'action' => 'created',
+                'action' => 'loggedin',
                 'target' => 'user',
                 'crud' => 'r',
                 'edulevel' => 0,
@@ -193,7 +193,7 @@ public function test_backfillable_metric() {
                 'contextinstanceid' => 0,
                 'userid' => $i,
                 'anonymous' => 0,
-                'timecreated' => $i
+                'timecreated' => $i,
             ];
         }
         set_config('enabled_stores', 'logstore_standard', 'tool_log');

version.php

@@ -25,8 +25,8 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$plugin->version = 2025072300;
-$plugin->release = 2025072300;
+$plugin->version = 2025072301;
+$plugin->release = 2025072301;
 
 $plugin->requires = 2024042200;    // Our lowest supported Moodle (4.4.0).