Skip to content

[stable34] feat: Fetch groups in batch in getUserGroups #61936

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
AndyScherzinger merged 1 commit into from
Jul 9, 2026
+18 −24
Merged

[stable34] feat: Fetch groups in batch in getUserGroups #61936

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
14 changes: 2 additions & 12 deletions lib/private/Group/Manager.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -302,18 +302,8 @@ public function getUserGroups(?IUser $user = null): array {
* @return array<string, IGroup>
*/
public function getUserIdGroups(string $uid): array {
$groups = [];

foreach ($this->getUserIdGroupIds($uid) as $groupId) {
$aGroup = $this->get($groupId);
if ($aGroup instanceof IGroup) {
$groups[$groupId] = $aGroup;
} else {
$this->logger->debug('User "' . $uid . '" belongs to deleted group: "' . $groupId . '"', ['app' => 'core']);
}
}

return $groups;
$groupIds = $this->getUserIdGroupIds($uid);
return $this->getGroupsObjects($groupIds);
}

/**
Expand Down
28 changes: 16 additions & 12 deletions tests/lib/Group/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,9 +428,9 @@ public function testGetUserGroups(): void {
->with('user1')
->willReturn(['group1']);
$backend->expects($this->any())
->method('groupExists')
->method('getGroupDetails')
->with('group1')
->willReturn(true);
->willReturn(['displayName' => 'group1']);

$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger, $this->cache, $this->remoteIpAddress);
$manager->addBackend($backend);
Expand Down Expand Up @@ -476,9 +476,9 @@ public function testGetUserGroupsWithDeletedGroup(): void {
->with('user1')
->willReturn(['group1']);
$backend->expects($this->any())
->method('groupExists')
->with('group1')
->willReturn(false);
->method('getGroupsDetails')
->with(['group1'])
->willReturn(['group1' => []]);

$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger, $this->cache, $this->remoteIpAddress);
$manager->addBackend($backend);
Expand Down Expand Up @@ -560,8 +560,8 @@ public function testGetUserGroupsMultipleBackends(): void {
->with('user1')
->willReturn(['group1']);
$backend1->expects($this->any())
->method('groupExists')
->willReturn(true);
->method('getGroupDetails')
->willReturnCallback(fn ($gid) => $gid === 'group1' ? ['displayName' => 'group1'] : []);

/**
* @var \PHPUnit\Framework\MockObject\MockObject | \OC\Group\Backend $backend2
Expand All @@ -571,9 +571,9 @@ public function testGetUserGroupsMultipleBackends(): void {
->method('getUserGroups')
->with('user1')
->willReturn(['group1', 'group2']);
$backend1->expects($this->any())
->method('groupExists')
->willReturn(true);
$backend2->expects($this->any())
->method('getGroupDetails')
->willReturnCallback(fn ($gid) => ['displayName' => $gid]);

$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger, $this->cache, $this->remoteIpAddress);
$manager->addBackend($backend1);
Expand Down Expand Up @@ -870,6 +870,10 @@ public function testGetUserGroupsWithAddUser(): void {
->method('groupExists')
->with('group1')
->willReturn(true);
$backend->expects($this->any())
->method('getGroupDetails')
->with('group1')
->willReturn(['displayName' => 'group1']);

$manager = new \OC\Group\Manager($this->userManager, $this->dispatcher, $this->logger, $this->cache, $this->remoteIpAddress);
$manager->addBackend($backend);
Expand Down Expand Up @@ -904,9 +908,9 @@ public function testGetUserGroupsWithRemoveUser(): void {
return $expectedGroups;
});
$backend->expects($this->any())
->method('groupExists')
->method('getGroupDetails')
->with('group1')
->willReturn(true);
->willReturn(['displayName' => 'group1']);
$backend->expects($this->once())
->method('inGroup')
->willReturn(true);
Expand Down
Loading