Merge branch 'MDL-65084-m37' of https://github.com/NeillM/moodle into MOODLE_37_STABLE

Author: snake

blocks/recentlyaccesseditems/classes/helper.php

@@ -53,11 +53,13 @@ public static function get_recent_items(int $limit = 0) {
             return $recentitems;
         }
 
-        // Determine sort sql clause.
-        $sort = 'timeaccess DESC';
-
         $paramsql = array('userid' => $userid);
-        $records = $DB->get_records('block_recentlyaccesseditems', $paramsql, $sort);
+        $sql = "SELECT rai.*
+                  FROM {block_recentlyaccesseditems} rai
+                  JOIN {course} c ON c.id = rai.courseid
+                 WHERE userid = :userid
+                 ORDER BY rai.timeaccess DESC";
+        $records = $DB->get_records_sql($sql, $paramsql);
         $order = 0;
 
         // Get array of items by course. Use $order index to keep sql sorted results.

blocks/recentlyaccesseditems/tests/helper_test.php

@@ -0,0 +1,71 @@
+<?php
+// This file is part of Moodle - http://moodle.org/
+//
+// Moodle is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Moodle is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Moodle.  If not, see <http://www.gnu.org/licenses/>.
+
+/**
+ * Block recentlyaccesseditems helper tests.
+ *
+ * @package    block_recentlyaccesseditems
+ * @copyright  2019 University of Nottingham
+ * @author     Neill Magill <[email protected]>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+
+use block_recentlyaccesseditems\helper;
+
+defined('MOODLE_INTERNAL') || die();
+
+/**
+ * Block Recently accessed helper class tests.
+ *
+ * @package    block_recentlyaccesseditems
+ * @copyright  2019 University of Nottingham
+ * @author     Neill Magill <[email protected]>
+ * @license    http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
+ */
+class block_recentlyaccesseditems_helper_testcase extends advanced_testcase {
+    /**
+     * Tests that the get recent items method can handle getting records when courses have been deleted.
+     */
+    public function test_get_recent_items() {
+        $this->resetAfterTest();
+        $course = self::getDataGenerator()->create_course();
+        $coursetodelete = self::getDataGenerator()->create_course();
+        $user = self::getDataGenerator()->create_and_enrol($course, 'student');
+        self::getDataGenerator()->enrol_user($user->id, $coursetodelete->id, 'student');
+
+        // Add an activity to each course.
+        $forum = self::getDataGenerator()->create_module('forum', ['course' => $course]);
+        $glossary = self::getDataGenerator()->create_module('glossary', ['course' => $coursetodelete]);
+        self::setUser($user);
+
+        // Get the user to visit the activities.
+        $event1params = ['context' => context_module::instance($forum->cmid), 'objectid' => $forum->id];
+        $event1 = \mod_forum\event\course_module_viewed::create($event1params);
+        $event1->trigger();
+        $event2params = ['context' => context_module::instance($glossary->cmid), 'objectid' => $glossary->id];
+        $event2 = \mod_glossary\event\course_module_viewed::create($event2params);
+        $event2->trigger();
+        $recent1 = helper::get_recent_items();
+        self::assertCount(2, $recent1);
+        $recentlimited = helper::get_recent_items(1);
+        self::assertCount(1, $recentlimited);
+        delete_course($coursetodelete, false);
+
+        // There should be no errors if a course has been deleted.
+        $recent2 = helper::get_recent_items();
+        self::assertCount(1, $recent2);
+    }
+}