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

Merge branch 'MDL-64258-master' of https://github.com/HuongNV13/moodle

Browse Source
This commit is contained in:
Andrew Nicols 2019-07-09 14:26:13 +08:00
commit b25bcc45dc
2 changed files with 129 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
user/selector/lib.php
View File

@ -890,7 +890,15 @@ class group_non_members_selector extends groups_user_selector_base {
list($searchcondition, $searchparams) = $this->search_sql($search, 'u');
// Build the SQL.
list($enrolsql, $enrolparams) = get_enrolled_sql($context);
$enrolledjoin = get_enrolled_join($context, 'u.id');
$wheres = [];
$wheres[] = $enrolledjoin->wheres;
$wheres[] = 'u.deleted = 0';
$wheres[] = 'gm.id IS NULL';
$wheres = implode(' AND ', $wheres);
$wheres .= ' AND ' . $searchcondition;
$fields = "SELECT r.id AS roleid, u.id AS userid,
" . $this->required_fields_sql('u') . ",
(SELECT count(igm.groupid)
@ -898,18 +906,16 @@ class group_non_members_selector extends groups_user_selector_base {
JOIN {groups} ig ON igm.groupid = ig.id
WHERE igm.userid = u.id AND ig.courseid = :courseid) AS numgroups";
$sql = " FROM {user} u
JOIN ($enrolsql) e ON e.id = u.id
$enrolledjoin->joins
LEFT JOIN {role_assignments} ra ON (ra.userid = u.id AND ra.contextid $relatedctxsql AND ra.roleid $roleids)
LEFT JOIN {role} r ON r.id = ra.roleid
LEFT JOIN {groups_members} gm ON (gm.userid = u.id AND gm.groupid = :groupid)
WHERE u.deleted = 0
AND gm.id IS NULL
AND $searchcondition";
WHERE $wheres";
list($sort, $sortparams) = users_order_by_sql('u', $search, $this->accesscontext);
$orderby = ' ORDER BY ' . $sort;
$params = array_merge($searchparams, $roleparams, $enrolparams, $relatedctxparams);
$params = array_merge($searchparams, $roleparams, $relatedctxparams, $enrolledjoin->params);
$params['courseid'] = $this->courseid;
$params['groupid'] = $this->groupid;

117
user/tests/group_non_members_selector_test.php Normal file
View File

@ -0,0 +1,117 @@
<?php
// This file is part of Moodle - https://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/>.
/**
* Unit tests for {@link group_non_members_selector} class.
*
* @package core_user
* @category test
* @copyright 2019 Huong Nguyen <huongnv13@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
defined('MOODLE_INTERNAL') || die();
global $CFG;
require_once($CFG->dirroot . '/user/selector/lib.php');
/**
* Unit tests for {@link group_non_members_selector} class.
*
* @package core_user
* @category test
* @copyright 2019 Huong Nguyen <huongnv13@gmail.com>
* @license http://www.gnu.org/copyleft/gpl.html GNU GPL v3 or later
*/
class core_group_non_members_selector_testcase extends advanced_testcase {
/**
* Test find_users that only return group non members
*
* @throws coding_exception
*/
public function test_find_users_only_return_group_non_member() {
$this->resetAfterTest();
// Create course.
$course = $this->getDataGenerator()->create_course();
// Create users.
$user1 = $this->getDataGenerator()->create_user(['firstname' => 'User', 'lastname' => '1']);
$user2 = $this->getDataGenerator()->create_user(['firstname' => 'User', 'lastname' => '2']);
$user3 = $this->getDataGenerator()->create_user(['firstname' => 'User', 'lastname' => '3']);
$user4 = $this->getDataGenerator()->create_user(['firstname' => 'User', 'lastname' => '4']);
$user5 = $this->getDataGenerator()->create_user(['firstname' => 'User', 'lastname' => '5']);
// Create group.
$group = $this->getDataGenerator()->create_group(['courseid' => $course->id]);
// Enroll users to course. Except User5.
$this->getDataGenerator()->enrol_user($user1->id, $course->id);
$this->getDataGenerator()->enrol_user($user2->id, $course->id);
$this->getDataGenerator()->enrol_user($user3->id, $course->id);
$this->getDataGenerator()->enrol_user($user4->id, $course->id);
// Assign User1 to Group.
$this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user1->id]);
// User1 and User5 will not exist in the result.
// User2, User3 and User4 will exist in the result.
$potentialmembersselector = new group_non_members_selector('addselect',
['groupid' => $group->id, 'courseid' => $course->id]);
foreach ($potentialmembersselector->find_users('User') as $found) {
$this->assertCount(3, $found);
$this->assertArrayNotHasKey($user5->id, $found);
$this->assertArrayNotHasKey($user1->id, $found);
$this->assertArrayHasKey($user2->id, $found);
$this->assertArrayHasKey($user3->id, $found);
$this->assertArrayHasKey($user4->id, $found);
}
// Assign User2 to Group.
$this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user2->id]);
// User1, User2 and User5 will not exist in the result.
// User3 and User4 will exist in the result.
$potentialmembersselector = new group_non_members_selector('addselect',
['groupid' => $group->id, 'courseid' => $course->id]);
foreach ($potentialmembersselector->find_users('User') as $found) {
$this->assertCount(2, $found);
$this->assertArrayNotHasKey($user5->id, $found);
$this->assertArrayNotHasKey($user1->id, $found);
$this->assertArrayNotHasKey($user2->id, $found);
$this->assertArrayHasKey($user3->id, $found);
$this->assertArrayHasKey($user4->id, $found);
}
// Assign User3 to Group.
$this->getDataGenerator()->create_group_member(['groupid' => $group->id, 'userid' => $user3->id]);
// User1, User2, User3 and User5 will not exist in the result.
// Only User4 will exist in the result.
$potentialmembersselector = new group_non_members_selector('addselect',
['groupid' => $group->id, 'courseid' => $course->id]);
foreach ($potentialmembersselector->find_users('User') as $found) {
$this->assertCount(1, $found);
$this->assertArrayNotHasKey($user5->id, $found);
$this->assertArrayNotHasKey($user1->id, $found);
$this->assertArrayNotHasKey($user2->id, $found);
$this->assertArrayNotHasKey($user3->id, $found);
$this->assertArrayHasKey($user4->id, $found);
}
}
}