mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-03-14 12:40:01 +01:00
Code Issues Projects Releases Wiki Activity

MDL-70023 core_course: improve performance of recently accessed courses

Browse Source
This commit is contained in:
Marina Glancy 2020-10-26 12:23:23 +01:00
parent 2444c9d9be
commit 7fb6ce765f
2 changed files with 55 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
course/lib.php
View File

@ -4743,26 +4743,26 @@ function course_get_recent_courses(int $userid = null, int $limit = 0, int $offs
JOIN {user_lastaccess} ul
ON ul.courseid = c.id
$favsql
LEFT JOIN {enrol} eg ON eg.courseid = c.id AND eg.status = :statusenrolg AND eg.enrol = :guestenrol
WHERE ul.userid = :userid
AND c.visible = :visible
AND EXISTS (SELECT e.id
AND (eg.id IS NOT NULL
OR EXISTS (SELECT e.id
FROM {enrol} e
LEFT JOIN {user_enrolments} ue ON ue.enrolid = e.id
JOIN {user_enrolments} ue ON ue.enrolid = e.id
WHERE e.courseid = c.id
AND e.status = :statusenrol
AND ((ue.status = :status
AND ue.userid = ul.userid
AND ue.timestart < :now1
AND (ue.timeend = 0 OR ue.timeend > :now2)
)
OR e.enrol = :guestenrol
)
)
AND ue.status = :status
AND ue.userid = :userid2
AND ue.timestart < :now1
AND (ue.timeend = 0 OR ue.timeend > :now2)
))
$orderby";
$now = round(time(), -2); // Improves db caching.
$params = ['userid' => $userid, 'contextlevel' => CONTEXT_COURSE, 'visible' => 1, 'status' => ENROL_USER_ACTIVE,
'statusenrol' => ENROL_INSTANCE_ENABLED, 'guestenrol' => 'guest', 'now1' => $now, 'now2' => $now] + $favparams;
'statusenrol' => ENROL_INSTANCE_ENABLED, 'guestenrol' => 'guest', 'now1' => $now, 'now2' => $now,
'userid2' => $userid, 'statusenrolg' => ENROL_INSTANCE_ENABLED] + $favparams;
$recentcourses = $DB->get_records_sql($sql, $params, $offset, $limit);

44
course/tests/courselib_test.php
View File

@ -5464,6 +5464,50 @@ class core_course_courselib_testcase extends advanced_testcase {
$this->assertArrayNotHasKey($courses[0]->id, $result);
}
/**
* Test the course_get_recent_courses function.
*/
public function test_course_get_recent_courses_with_guest() {
global $DB;
$this->resetAfterTest(true);
$student = $this->getDataGenerator()->create_user();
// Course 1 with guest access and no direct enrolment.
$course1 = $this->getDataGenerator()->create_course();
$context1 = context_course::instance($course1->id);
$record = $DB->get_record('enrol', ['courseid' => $course1->id, 'enrol' => 'guest']);
enrol_get_plugin('guest')->update_status($record, ENROL_INSTANCE_ENABLED);
// Course 2 where student is enrolled with two enrolment methods.
$course2 = $this->getDataGenerator()->create_course();
$context2 = context_course::instance($course2->id);
$record = $DB->get_record('enrol', ['courseid' => $course2->id, 'enrol' => 'self']);
enrol_get_plugin('guest')->update_status($record, ENROL_INSTANCE_ENABLED);
$this->getDataGenerator()->enrol_user($student->id, $course2->id, 'student', 'manual', 0, 0, ENROL_USER_ACTIVE);
$this->getDataGenerator()->enrol_user($student->id, $course2->id, 'student', 'self', 0, 0, ENROL_USER_ACTIVE);
// Course 3.
$course3 = $this->getDataGenerator()->create_course();
$context3 = context_course::instance($course3->id);
// Student visits first two courses, course_get_recent_courses returns two courses.
$this->setUser($student);
course_view($context1);
course_view($context2);
$result = course_get_recent_courses($student->id);
$this->assertEqualsCanonicalizing([$course2->id, $course1->id], array_column($result, 'id'));
// Admin visits all three courses. Only the one with guest access is returned.
$this->setAdminUser();
course_view($context1);
course_view($context2);
course_view($context3);
$result = course_get_recent_courses(get_admin()->id);
$this->assertEqualsCanonicalizing([$course1->id], array_column($result, 'id'));
}
/**
* Test cases for the course_get_course_dates_for_user_ids tests.
*/