fa/breadcrumb-the-shire
1
0
Fork 1
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

refactor(actions): deduplicate audit metadata and grid user count enrichment

Browse Source
This commit is contained in:
Felix Schneider
2026-03-13 12:05:11 +01:00
parent 892da0048d
commit 010690de19
17 changed files with 638 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
pages/admin/roles/data().php
View File

@@ -22,25 +22,18 @@ $result = app(\MintyPHP\Service\Access\RoleService::class)->listPaged([
$settingsDefaultsGateway = app(\MintyPHP\Service\Settings\SettingsDefaultsGateway::class);
$defaultRoleId = $settingsDefaultsGateway->getDefaultRoleId();
$rolePermissionRepository = app(\MintyPHP\Repository\Access\RolePermissionRepository::class);
$roleIds = [];
foreach ($result['rows'] as $roleRow) {
$roleId = (int) ($roleRow['id'] ?? 0);
if ($roleId > 0) {
$roleIds[] = $roleId;
}
}
$roleIds = array_values(array_unique($roleIds));
$userRoleRepository = app(\MintyPHP\Repository\Access\UserRoleRepository::class);
$roleUserCounts = $userRoleRepository->countUsersByRoleIds($roleIds);
$roleActiveUserCounts = $userRoleRepository->countActiveUsersByRoleIds($roleIds);
$rolePermissionCounts = $rolePermissionRepository->countPermissionsByRoleIds($roleIds);
$userCounts = app(\MintyPHP\Service\Data\GridUserCountEnricher::class)->computeCounts(
$result['rows'],
$userRoleRepository->countUsersByRoleIds(...),
$userRoleRepository->countActiveUsersByRoleIds(...)
);
$rolePermissionCounts = $rolePermissionRepository->countPermissionsByRoleIds(array_keys($userCounts));
$rows = [];
foreach ($result['rows'] as $row) {
$roleId = (int) ($row['id'] ?? 0);
$usersTotal = (int) ($roleUserCounts[$roleId] ?? 0);
$usersActive = (int) ($roleActiveUserCounts[$roleId] ?? 0);
$usersInactive = max(0, $usersTotal - $usersActive);
$counts = $userCounts[$roleId] ?? ['active_users' => 0, 'inactive_users' => 0];
$rows[] = [
'id' => $row['id'] ?? null,
'uuid' => $row['uuid'] ?? '',
@@ -48,8 +41,8 @@ foreach ($result['rows'] as $row) {
'description' => $row['description'] ?? '',
'code' => $row['code'] ?? '',
'active' => (int) ($row['active'] ?? 1),
'active_users' => $usersActive,
'inactive_users' => $usersInactive,
'active_users' => $counts['active_users'],
'inactive_users' => $counts['inactive_users'],
'permission_count' => (int) ($rolePermissionCounts[$roleId] ?? 0),
'created' => dt($row['created'] ?? ''),
'modified' => dt($row['modified'] ?? ''),