Skip to content

fix: searching in groups #1216

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

Merged
CarlSchwan merged 1 commit into from
Aug 27, 2026
+27 −4
Merged

fix: searching in groups #1216

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
8 changes: 4 additions & 4 deletions lib/GroupBackend.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,10 +543,10 @@ public function setupSearchQuery(string $search, IQueryBuilder $query, bool $inc
#[\Override]
public function searchInGroup(string $gid, string $search = '', int $limit = -1, int $offset = 0): array {
$query = $this->dbc->getQueryBuilder();
$query->select('g.uid', 'dn.value AS displayname')
->from(self::TABLE_MEMBERS, 'g')
->where($query->expr()->eq('gid', $query->createNamedParameter($gid)))
->orderBy('g.uid', 'ASC');
$query->select('m.uid', 'dn.value AS displayname')
->from(self::TABLE_MEMBERS, 'm')
->where($query->expr()->eq('m.gid', $query->createNamedParameter($gid)))
->orderBy('m.uid', 'ASC');

$this->setupSearchQuery($search, $query, includeMetadata: true);

Expand Down
23 changes: 23 additions & 0 deletions tests/unit/GroupBackendTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,6 +162,29 @@ public function testCountUsersInGroupMatchesDisplayNameAndEmail(): void {
$this->assertSame(1, $this->groupBackend->countUsersInGroup($groupId, $this->users[0]['uid']));
}

public function testSearchInGroup(): void {
foreach ($this->groups as $group) {
$users = $this->groupBackend->searchInGroup($group['gid']);
$this->assertCount(count($group['members']), $users, 'Should retrieve all group members');
foreach (array_keys($users) as $uid) {
$this->assertContains($uid, $group['members'], sprintf('User %s should be member of group %s', $uid, $group['gid']));
}
}
}

public function testSearchInGroupMatchesDisplayNameAndEmail(): void {
$groupId = $this->groups[0]['gid'];

$byDisplayName = $this->groupBackend->searchInGroup($groupId, $this->users[0]['displayname']);
$this->assertArrayHasKey($this->users[0]['uid'], $byDisplayName, 'Display name search should return the matching user');

$byEmail = $this->groupBackend->searchInGroup($groupId, $this->users[1]['email']);
$this->assertArrayHasKey($this->users[1]['uid'], $byEmail, 'Email search should return the matching user');

$byUid = $this->groupBackend->searchInGroup($groupId, $this->users[0]['uid']);
$this->assertArrayHasKey($this->users[0]['uid'], $byUid, 'UID search should still work');
}

private function resetAccountData(): void {
foreach ($this->users as $user) {
$qb = $this->connection->getQueryBuilder();
Expand Down
Loading