Skip to content

Allow searching for users by displayname in the database group backend #17800

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
juliusknorr wants to merge 1 commit into from
Closed

Allow searching for users by displayname in the database group backend #17800

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 14 additions & 8 deletions lib/private/Group/Database.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,15 +333,21 @@ public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
$this->fixDI();

$query = $this->dbConn->getQueryBuilder();
$query->select('uid')
->from('group_user')
->where($query->expr()->eq('gid', $query->createNamedParameter($gid)))
->orderBy('uid', 'ASC');

$query->select('g.uid')
->from('group_user', 'g')
->where($query->expr()->eq('g.gid', $query->createNamedParameter($gid)))
->orderBy('g.uid', 'ASC');
if ($search !== '') {
$query->andWhere($query->expr()->like('uid', $query->createNamedParameter(
'%' . $this->dbConn->escapeLikeParameter($search) . '%'
)));
$query
->innerJoin('g', 'users', 'u', $query->expr()->eq('g.uid', 'u.uid'))
->andWhere($query->expr()->orX(
$query->expr()->iLike('g.uid', $query->createNamedParameter(
'%' . $this->dbConn->escapeLikeParameter($search) . '%'
)),
$query->expr()->iLike('u.displayname', $query->createNamedParameter(
'%' . $this->dbConn->escapeLikeParameter($search) . '%'
))
));
}

if ($limit !== -1) {
Expand Down
17 changes: 17 additions & 0 deletions tests/lib/Group/DatabaseTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,22 @@

namespace Test\Group;

use Symfony\Component\EventDispatcher\EventDispatcherInterface;

/**
* Class Database
*
* @group DB
*/
class DatabaseTest extends Backend {

private $groups = array();

/** @var \PHPUnit\Framework\MockObject\MockObject */
private $eventDispatcher;

private $userBackend;

/**
* get a new unique group name
* test cases can override this in order to clean up created groups
Expand All @@ -47,13 +55,22 @@ public function getGroupName($name = null) {

protected function setUp() {
parent::setUp();
$this->eventDispatcher = $this->createMock(EventDispatcherInterface::class);

$this->backend = new \OC\Group\Database();
$this->userBackend = new \OC\User\Database($this->eventDispatcher);
$this->userBackend->createUser('foobarbaz', '1234');
$this->userBackend->createUser('bazbarfoo', '1234');
$this->userBackend->createUser('notme', '1234');
}

protected function tearDown() {
foreach ($this->groups as $group) {
$this->backend->deleteGroup($group);
}
$this->userBackend->deleteUser('foobarbaz');
$this->userBackend->deleteUser('bazbarfoo');
$this->userBackend->deleteUser('notme');
parent::tearDown();
}

Expand Down