mirror of
https://github.com/solidtime-io/solidtime.git
synced 2026-08-16 04:02:15 +01:00
move Client visibleByEmployee logic to model scope
This commit is contained in:
@@ -12,7 +12,6 @@ use App\Http\Resources\V1\Client\ClientCollection;
|
|||||||
use App\Http\Resources\V1\Client\ClientResource;
|
use App\Http\Resources\V1\Client\ClientResource;
|
||||||
use App\Models\Client;
|
use App\Models\Client;
|
||||||
use App\Models\Organization;
|
use App\Models\Organization;
|
||||||
use App\Models\Project;
|
|
||||||
use Illuminate\Auth\Access\AuthorizationException;
|
use Illuminate\Auth\Access\AuthorizationException;
|
||||||
use Illuminate\Http\JsonResponse;
|
use Illuminate\Http\JsonResponse;
|
||||||
use Illuminate\Support\Carbon;
|
use Illuminate\Support\Carbon;
|
||||||
@@ -47,13 +46,7 @@ class ClientController extends Controller
|
|||||||
->orderBy('created_at', 'desc');
|
->orderBy('created_at', 'desc');
|
||||||
|
|
||||||
if (! $canViewAllClients) {
|
if (! $canViewAllClients) {
|
||||||
$projectsQuery = Project::query()
|
$clientsQuery->visibleByEmployee($user);
|
||||||
->whereBelongsTo($organization, 'organization')
|
|
||||||
->visibleByEmployee($user)
|
|
||||||
->distinct()
|
|
||||||
->select('client_id');
|
|
||||||
|
|
||||||
$clientsQuery->whereIn('id', $projectsQuery);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$filterArchived = $request->getFilterArchived();
|
$filterArchived = $request->getFilterArchived();
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ namespace App\Models;
|
|||||||
use App\Models\Concerns\CustomAuditable;
|
use App\Models\Concerns\CustomAuditable;
|
||||||
use App\Models\Concerns\HasUuids;
|
use App\Models\Concerns\HasUuids;
|
||||||
use Database\Factories\ClientFactory;
|
use Database\Factories\ClientFactory;
|
||||||
|
use Illuminate\Database\Eloquent\Builder;
|
||||||
use Illuminate\Database\Eloquent\Casts\Attribute;
|
use Illuminate\Database\Eloquent\Casts\Attribute;
|
||||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||||
use Illuminate\Database\Eloquent\Model;
|
use Illuminate\Database\Eloquent\Model;
|
||||||
@@ -62,6 +63,18 @@ class Client extends Model implements AuditableContract
|
|||||||
return $this->hasMany(Project::class, 'client_id');
|
return $this->hasMany(Project::class, 'client_id');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @param Builder<Client> $builder
|
||||||
|
* @return Builder<Client>
|
||||||
|
*/
|
||||||
|
public function scopeVisibleByEmployee(Builder $builder, User $user): Builder
|
||||||
|
{
|
||||||
|
return $builder->whereHas('projects', function (Builder $builder) use ($user): Builder {
|
||||||
|
/** @var Builder<Project> $builder */
|
||||||
|
return $builder->visibleByEmployee($user);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @return Attribute<bool, never>
|
* @return Attribute<bool, never>
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -62,7 +62,7 @@ class ClientEndpointTest extends ApiEndpointTestAbstract
|
|||||||
{
|
{
|
||||||
// Arrange
|
// Arrange
|
||||||
$data = $this->createUserWithPermission([
|
$data = $this->createUserWithPermission([
|
||||||
'clients:view'
|
'clients:view',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$clients = Client::factory()->forOrganization($data->organization)->createMany(2);
|
$clients = Client::factory()->forOrganization($data->organization)->createMany(2);
|
||||||
|
|||||||
Reference in New Issue
Block a user