Skip to content

Commit

Permalink
MDL-60826 calendar: further performance improvements
Browse files Browse the repository at this point in the history 
This commit does few tweaks and other performance improvements to
calendar_get_allowed_event_types to be more efficient. Also some minor
queries optimizations on the event form to fetch the list of courses
without groups.
  • Loading branch information
@lameze
lameze committed Jul 25, 2018
1 parent e2b7dca commit 687112a
Show file tree
Hide file tree
Showing 2 changed files with 88 additions and 48 deletions.
15 changes: 7 additions & 8 deletions calendar/classes/local/event/forms/eventtype.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ trait eventtype {
* @param array $eventtypes The available event types for the user
*/
protected function add_event_type_elements($mform, $eventtypes) {
global $DB;
global $CFG, $DB;
$options = [];

if (!empty($eventtypes['user'])) {
Expand Down Expand Up @@ -98,23 +98,22 @@ protected function add_event_type_elements($mform, $eventtypes) {
$mform->hideIf('categoryid', 'eventtype', 'noteq', 'category');
}

$showall = $CFG->calendar_adminseesall && !has_capability('moodle/calendar:manageentries', \context_system::instance());
if (!empty($eventtypes['course'])) {
$limit = !has_capability('moodle/calendar:manageentries', \context_system::instance());
$mform->addElement('course', 'courseid', get_string('course'), ['limittoenrolled' => $limit]);
$mform->addElement('course', 'courseid', get_string('course'), ['limittoenrolled' => !$showall]);
$mform->hideIf('courseid', 'eventtype', 'noteq', 'course');
}

if (!empty($eventtypes['group'])) {
$groups = !(empty($this->_customdata['groups'])) ? $this->_customdata['groups'] : null;
$limit = !has_capability('moodle/calendar:manageentries', \context_system::instance());
// Get the list of courses without groups to filter on the course selector.
$sql = "SELECT c.id
FROM {course} c
LEFT JOIN {groups} g ON g.courseid = c.id
GROUP BY c.id
HAVING COUNT(g.id) = 0";
WHERE c.id NOT IN (
SELECT DISTINCT courseid FROM {groups}
)";
$coursesnogroup = $DB->get_records_sql($sql);
$mform->addElement('course', 'groupcourseid', get_string('course'), ['limittoenrolled' => $limit,
$mform->addElement('course', 'groupcourseid', get_string('course'), ['limittoenrolled' => !$showall,
'exclude' => array_keys($coursesnogroup)]);
$mform->hideIf('groupcourseid', 'eventtype', 'noteq', 'group');

Expand Down
121 changes: 81 additions & 40 deletions calendar/lib.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3695,66 +3695,107 @@ function calendar_get_allowed_event_types(int $courseid = null) {
// We still don't know if the user can create group and course events, so iterate over the courses to find out
// if the user has capabilities in one of the courses.
if ($types['course'] == false || $types['group'] == false) {
$courses = calendar_get_default_courses(null, 'id', true);
if ($CFG->calendar_adminseesall && has_capability('moodle/calendar:manageentries', context_system::instance())) {
$sql = "SELECT c.id, " . context_helper::get_preload_record_columns_sql('ctx') . "
FROM {course} c
JOIN {context} ctx ON ctx.contextlevel = ? AND ctx.instanceid = c.id
WHERE c.id IN (
SELECT DISTINCT courseid FROM {groups}
)";
$courseswithgroups = $DB->get_recordset_sql($sql, [CONTEXT_COURSE]);
foreach ($courseswithgroups as $course) {
context_helper::preload_from_record($course);
$context = context_course::instance($course->id);

if (has_capability('moodle/calendar:manageentries', $context)) {
if (has_any_capability(['moodle/site:accessallgroups', 'moodle/calendar:managegroupentries'], $context)) {
// The user can manage group entries or access any group.
$types['group'] = true;
$types['course'] = true;
break;
}
}
}
$courseswithgroups->close();

if (false === $types['course']) {
// Course is still not confirmed. There may have been no courses with a group in them.
$ctxfields = context_helper::get_preload_record_columns_sql('ctx');
$sql = "SELECT
c.id, c.visible, {$ctxfields}
FROM {course}
JOIN {context} ctx ON (ctx.instanceid = c.id AND ctx.contextlevel = :contextlevel)";
$params = [
'contextlevel' => CONTEXT_COURSE,
];
$courses = $DB->get_recordset_sql($sql, $params);
foreach ($courses as $course) {
context_helper::preload_from_record($course);
$context = context_course::instance($course->id);
if (has_capability('moodle/calendar:manageentries', $context)) {
$types['course'] = true;
break;
}
}
$courses->close();
}

} else {
$courses = calendar_get_default_courses(null, 'id');
if (empty($courses)) {
return $types;
}

if (!empty($courses)) {
$courseids = array_map(function($c) {
return $c->id;
}, $courses);

list($insql, $params) = $DB->get_in_or_equal($courseids);
$contextsql = "SELECT c.id, " . context_helper::get_preload_record_columns_sql('ctx') . "
FROM {course} c
JOIN {context} ctx ON ctx.contextlevel = ? AND ctx.instanceid = c.id
WHERE c.id $insql
GROUP BY c.id, ctx.id";
array_unshift($params, CONTEXT_COURSE);
$contextrecords = $DB->get_records_sql($contextsql, $params);
foreach($courses as $course) {
context_helper::preload_from_record($contextrecords[$course->id]);
$coursecontext = context_course::instance($course->id);
if (has_capability('moodle/calendar:manageentries', $coursecontext)
&& ($courseid == $course->id || empty($courseid))) {
$types['course'] = true;
break;
}
}

list($insql, $params) = $DB->get_in_or_equal($courseids, SQL_PARAMS_NAMED);
$sql = "SELECT c.id, " . context_helper::get_preload_record_columns_sql('ctx') . "
FROM {course} c
JOIN {groups} g ON g.courseid = c.id
JOIN {context} ctx ON ctx.contextlevel = ? AND ctx.instanceid = c.id
JOIN {context} ctx ON ctx.contextlevel = :contextlevel AND ctx.instanceid = c.id
WHERE c.id $insql
GROUP BY c.id, ctx.id
HAVING COUNT(g.id) > 0";
$courseswithgroups = $DB->get_records_sql($sql, $params);
AND c.id IN (SELECT DISTINCT courseid FROM {groups})";
$params['contextlevel'] = CONTEXT_COURSE;
$courseswithgroups = $DB->get_recordset_sql($sql, $params);
foreach ($courseswithgroups as $coursewithgroup) {
$groups = groups_get_all_groups($coursewithgroup->id);
context_helper::preload_from_record($coursewithgroup);
$context = context_course::instance($coursewithgroup->id);

if (has_capability('moodle/calendar:manageentries', $context)) {
if (!empty($groups)) {
$types['group'] = (!empty($groups) && has_capability('moodle/site:accessallgroups',
$context)) || array_filter($groups, function($group) use ($USER) {
return groups_is_member($group->id);
});
}
}

if (has_any_capability(['moodle/site:accessallgroups', 'moodle/calendar:managegroupentries'],
$context)) {
// The user can manage group entries or access any group.
if (!empty($groups)) {
$types['group'] = true;
}
$types['course'] = true;
$types['group'] = (!empty(groups_get_all_groups($coursewithgroup->id, $USER->id))
&& has_capability('moodle/calendar:managegroupentries', $context));
}

// Okay, course and group event types are allowed, no need to keep the loop iteration.
if ($types['course'] == true && $types['group'] == true) {
break;
}
}
$courseswithgroups->close();

if (false === $types['course']) {
list($insql, $params) = $DB->get_in_or_equal($courseids, SQL_PARAMS_NAMED);
$contextsql = "SELECT c.id, " . context_helper::get_preload_record_columns_sql('ctx') . "
FROM {course} c
JOIN {context} ctx ON ctx.contextlevel = :contextlevel AND ctx.instanceid = c.id
WHERE c.id $insql
GROUP BY c.id, ctx.id";
$params['contextlevel'] = CONTEXT_COURSE;
$contextrecords = $DB->get_recordset_sql($contextsql, $params);
foreach ($contextrecords as $course) {
context_helper::preload_from_record($course);
$coursecontext = context_course::instance($course->id);
if (has_capability('moodle/calendar:manageentries', $coursecontext)
&& ($courseid == $course->id || empty($courseid))) {
$types['course'] = true;
break;
}
}
$contextrecords->close();
}

}
}

Expand Down

0 comments on commit 687112a

Please sign in to comment.