From bc2f679bca4de016327a56d42871b8ad89d91fdb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?David=20Monlla=C3=B3?= <davidm@moodle.com>
Date: Mon, 13 May 2019 13:00:17 +0200
Subject: [PATCH] MDL-65582 analytics: Upcoming activities due enabled by
 default

---
 analytics/tests/stats_test.php | 9 +++++----
 lib/db/analytics.php           | 1 +
 lib/db/upgrade.php             | 7 +++++++
 version.php                    | 2 +-
 4 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/analytics/tests/stats_test.php b/analytics/tests/stats_test.php
index 65aaf6e81d3..01bc9fda5fc 100644
--- a/analytics/tests/stats_test.php
+++ b/analytics/tests/stats_test.php
@@ -51,8 +51,9 @@ class analytics_stats_testcase extends advanced_testcase {
 
         $this->resetAfterTest(true);
 
-        // By default, sites have {@link \core_course\analytics\target\no_teaching} enabled.
-        $this->assertEquals(1, \core_analytics\stats::enabled_models());
+        // By default, sites have {@link \core_course\analytics\target\no_teaching} and
+        // {@link \core_user\analytics\target\upcoming_activities_due} enabled.
+        $this->assertEquals(2, \core_analytics\stats::enabled_models());
 
         $model = \core_analytics\model::create(
             \core_analytics\manager::get_target('\core_course\analytics\target\course_dropout'),
@@ -62,11 +63,11 @@ class analytics_stats_testcase extends advanced_testcase {
         );
 
         // Purely adding a new model does not make it included in the stats.
-        $this->assertEquals(1, \core_analytics\stats::enabled_models());
+        $this->assertEquals(2, \core_analytics\stats::enabled_models());
 
         // New models must be enabled to have them counted.
         $model->enable('\core\analytics\time_splitting\quarters');
-        $this->assertEquals(2, \core_analytics\stats::enabled_models());
+        $this->assertEquals(3, \core_analytics\stats::enabled_models());
     }
 
     /**
diff --git a/lib/db/analytics.php b/lib/db/analytics.php
index a8e445bf02c..5a689fcb250 100644
--- a/lib/db/analytics.php
+++ b/lib/db/analytics.php
@@ -95,5 +95,6 @@ $models = [
             '\core_course\analytics\indicator\activities_due',
         ],
         'timesplitting' => '\core\analytics\time_splitting\upcoming_week',
+        'enabled' => true,
     ],
 ];
diff --git a/lib/db/upgrade.php b/lib/db/upgrade.php
index fdefb585b60..2b41ab8124c 100644
--- a/lib/db/upgrade.php
+++ b/lib/db/upgrade.php
@@ -3421,5 +3421,12 @@ function xmldb_main_upgrade($oldversion) {
         upgrade_main_savepoint(true, 2019050600.00);
     }
 
+    if ($oldversion < 2019051100.02) {
+        $DB->set_field('analytics_models', 'enabled', '1', ['target' => '\core_user\analytics\target\upcoming_activities_due']);
+
+        // Main savepoint reached.
+        upgrade_main_savepoint(true, 2019051100.02);
+    }
+
     return true;
 }
diff --git a/version.php b/version.php
index 6999585e519..523d9395185 100644
--- a/version.php
+++ b/version.php
@@ -29,7 +29,7 @@
 
 defined('MOODLE_INTERNAL') || die();
 
-$version  = 2019051100.00;              // YYYYMMDD      = weekly release date of this DEV branch.
+$version  = 2019051100.02;              // YYYYMMDD      = weekly release date of this DEV branch.
                                         //         RR    = release increments - 00 in DEV branches.
                                         //           .XX = incremental changes.