kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-10-26 13:36:15 +00:00
Code Issues Projects Releases Wiki Activity

Part of new API, cleanup code.

Browse Source
This commit is contained in:
James Cole
2024-11-23 16:14:47 +01:00
parent f3a20e14a6
commit fa655f065b
5 changed files with 59 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
app/Transformers/V2/UserGroupTransformer.php
View File

@@ -65,7 +65,7 @@ class UserGroupTransformer extends AbstractTransformer
/** @var GroupMembership $groupMembership */
foreach ($groupMemberships as $groupMembership) {
$this->memberships[$userGroupId][] = [
'user_id' => (string)$groupMembership->user_id,
'user_id' => (string) $groupMembership->user_id,
'user_email' => $groupMembership->user->email,
'role' => $groupMembership->userRole->title,
'you' => $groupMembership->user_id === $user->id,
@@ -73,6 +73,7 @@ class UserGroupTransformer extends AbstractTransformer
}
}
}
$this->mergeMemberships();
}
return $objects;
@@ -90,8 +91,28 @@ class UserGroupTransformer extends AbstractTransformer
'in_use' => $this->inUse[$userGroup->id] ?? false,
'title' => $userGroup->title,
'can_see_members' => $this->membershipsVisible[$userGroup->id] ?? false,
'members' => $this->memberships[$userGroup->id] ?? [],
'members' => array_values($this->memberships[$userGroup->id] ?? []),
];
// if the user has a specific role in this group, then collect the memberships.
}
private function mergeMemberships(): void
{
$new = [];
foreach ($this->memberships as $groupId => $members) {
$new[$groupId] ??= [];
foreach ($members as $member) {
$mail = $member['user_email'];
$new[$groupId][$mail] ??= [
'user_id' => $member['user_id'],
'user_email' => $member['user_email'],
'you' => $member['you'],
'roles' => [],
];
$new[$groupId][$mail]['roles'][] = $member['role'];
}
}
$this->memberships = $new;
}
}