Refactor visible project users into query scope

This commit is contained in:
2026-04-21 00:08:12 +00:00
parent 740a20899c
commit f412e4ec19
3 changed files with 17 additions and 30 deletions
@@ -59,24 +59,10 @@ class BuildProjectBacklogPayload
)->resolve(), )->resolve(),
'users' => UserResource::collection( 'users' => UserResource::collection(
User::query() User::query()
->whereIn('id', $this->visibleUserIds($project)) ->visibleToProject($project)
->orderBy('name') ->orderBy('name')
->get(), ->get(),
)->resolve(), )->resolve(),
]; ];
} }
/**
* @return array<int, int>
*/
private function visibleUserIds(Project $project): array
{
return User::query()
->get()
->filter(fn (User $candidate): bool => $this->permissionService->allows($candidate, Permission::ProjectRead, $project))
->pluck('id')
->map(fn (mixed $userId): int => (int) $userId)
->values()
->all();
}
} }
@@ -116,24 +116,10 @@ class BuildProjectTicketDetailPayload
'ticketTypes' => TicketTypeResource::collection($project->ticketTypes()->get())->resolve(), 'ticketTypes' => TicketTypeResource::collection($project->ticketTypes()->get())->resolve(),
'users' => UserResource::collection( 'users' => UserResource::collection(
User::query() User::query()
->whereIn('id', $this->visibleUserIds($project)) ->visibleToProject($project)
->orderBy('name') ->orderBy('name')
->get(), ->get(),
)->resolve(), )->resolve(),
]; ];
} }
/**
* @return array<int, int>
*/
private function visibleUserIds(Project $project): array
{
return User::query()
->get()
->filter(fn (User $candidate): bool => $this->permissionService->allows($candidate, Permission::ProjectRead, $project))
->pluck('id')
->map(fn (mixed $userId): int => (int) $userId)
->values()
->all();
}
} }
+15
View File
@@ -3,12 +3,14 @@
namespace App\Models; namespace App\Models;
// use Illuminate\Contracts\Auth\MustVerifyEmail; // use Illuminate\Contracts\Auth\MustVerifyEmail;
use App\Actions\Permissions\PermissionService;
use Database\Factories\UserFactory; use Database\Factories\UserFactory;
use Illuminate\Database\Eloquent\Attributes\Fillable; use Illuminate\Database\Eloquent\Attributes\Fillable;
use Illuminate\Database\Eloquent\Attributes\Hidden; use Illuminate\Database\Eloquent\Attributes\Hidden;
use Illuminate\Database\Eloquent\Factories\HasFactory; use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Relations\BelongsToMany; use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany; use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\MorphMany; use Illuminate\Database\Eloquent\Relations\MorphMany;
use Illuminate\Foundation\Auth\User as Authenticatable; use Illuminate\Foundation\Auth\User as Authenticatable;
use Illuminate\Notifications\Notifiable; use Illuminate\Notifications\Notifiable;
@@ -69,4 +71,17 @@ class User extends Authenticatable
{ {
return $this->hasMany(Ticket::class, 'author_user_id'); return $this->hasMany(Ticket::class, 'author_user_id');
} }
public function scopeVisibleToProject(Builder $query, Project $project): Builder
{
$permissionService = app(PermissionService::class);
return $query->where(function (Builder $builder) use ($permissionService, $project): void {
foreach (User::query()->select('id')->cursor() as $candidate) {
if ($permissionService->allows($candidate, \App\Enums\Permission::ProjectRead, $project)) {
$builder->orWhereKey($candidate->id);
}
}
});
}
} }