fs
6c99c040b2
Consolidates the scattered `array_values(array_unique(array_map('intval',
$x)))` + manual positive-filter pattern behind a single lenient helper
`toIntIds(mixed $value): array` in core/Support/helpers/array.php.
- `RepositoryArrayHelper::sanitizePositiveIds()` now delegates (keeps
strict array-input contract + existing tests intact).
- Drops two private duplicates: `UserProfileViewService::normalizeIds()`
and `AddressBookService::normalizeIds()`.
- Replaces 12 inline occurrences across admin action pages with the
helper, cutting boilerplate by 3-5 lines per site.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
60 lines
2.3 KiB
PHP
60 lines
2.3 KiB
PHP
<?php
|
|
|
|
use MintyPHP\Http\SessionStoreInterface;
|
|
use MintyPHP\Service\Access\DepartmentAuthorizationPolicy;
|
|
use MintyPHP\Support\Guard;
|
|
|
|
$session = app(SessionStoreInterface::class)->all();
|
|
Guard::requireLogin();
|
|
gridRequireGetRequest();
|
|
|
|
$currentUserId = (int) ($session['user']['id'] ?? 0);
|
|
$decision = Guard::requireAbilityDecisionOrForbidden(DepartmentAuthorizationPolicy::ABILITY_ADMIN_DEPARTMENTS_VIEW);
|
|
$capabilities = $decision->attribute('capabilities', []);
|
|
$tenantIds = is_array($capabilities) ? toIntIds($capabilities['allowed_tenant_ids'] ?? []) : [];
|
|
|
|
$filters = gridParseFiltersFromSchemaFile(__DIR__ . '/filter-schema.php');
|
|
|
|
$result = app(\MintyPHP\Service\Org\DepartmentService::class)->listPaged([
|
|
'limit' => $filters['limit'],
|
|
'offset' => $filters['offset'],
|
|
'search' => $filters['search'],
|
|
'order' => $filters['order'],
|
|
'dir' => $filters['dir'],
|
|
'tenant' => $filters['tenant'],
|
|
'active' => $filters['active'],
|
|
'tenantIds' => $tenantIds,
|
|
'tenantUserId' => $currentUserId,
|
|
]);
|
|
|
|
$settingsDefaultsGateway = app(\MintyPHP\Service\Settings\SettingsDefaultsGateway::class);
|
|
$defaultDepartmentId = $settingsDefaultsGateway->getDefaultDepartmentId();
|
|
$userDepartmentRepository = app(\MintyPHP\Repository\Org\UserDepartmentRepository::class);
|
|
$userCounts = app(\MintyPHP\Service\Data\GridUserCountEnricher::class)->computeCounts(
|
|
$result['rows'],
|
|
$userDepartmentRepository->countUsersByDepartmentIds(...),
|
|
$userDepartmentRepository->countActiveUsersByDepartmentIds(...)
|
|
);
|
|
|
|
$rows = [];
|
|
foreach ($result['rows'] as $row) {
|
|
$departmentId = (int) ($row['id'] ?? 0);
|
|
$counts = $userCounts[$departmentId] ?? ['active_users' => 0, 'inactive_users' => 0];
|
|
$rows[] = [
|
|
'id' => $row['id'] ?? null,
|
|
'uuid' => $row['uuid'] ?? '',
|
|
'is_default' => $departmentId > 0 && $defaultDepartmentId === $departmentId,
|
|
'description' => $row['description'] ?? '',
|
|
'code' => $row['code'] ?? '',
|
|
'cost_center' => $row['cost_center'] ?? '',
|
|
'active' => $row['active'] ?? 1,
|
|
'active_users' => $counts['active_users'],
|
|
'inactive_users' => $counts['inactive_users'],
|
|
'tenants' => $row['tenant_labels'] ?? [],
|
|
'created' => dt($row['created'] ?? ''),
|
|
'modified' => dt($row['modified'] ?? ''),
|
|
];
|
|
}
|
|
|
|
gridJsonDataResult($rows, (int) ($result['total'] ?? 0));
|