move Client visibleByEmployee logic from controller to model

Author: Onatcer

app/Http/Controllers/Api/V1/ClientController.php

@@ -12,7 +12,6 @@
 use App\Http\Resources\V1\Client\ClientResource;
 use App\Models\Client;
 use App\Models\Organization;
-use App\Models\Project;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Carbon;
@@ -47,13 +46,7 @@ public function index(Organization $organization, ClientIndexRequest $request):
             ->orderBy('created_at', 'desc');
 
         if (! $canViewAllClients) {
-            $projectsQuery = Project::query()
-                ->whereBelongsTo($organization, 'organization')
-                ->visibleByEmployee($user)
-                ->distinct()
-                ->select('client_id');
-
-            $clientsQuery->whereIn('id', $projectsQuery);
+            $clientsQuery->visibleByEmployee($user);
         }
 
         $filterArchived = $request->getFilterArchived();

app/Models/Client.php

@@ -7,6 +7,7 @@
 use App\Models\Concerns\CustomAuditable;
 use App\Models\Concerns\HasUuids;
 use Database\Factories\ClientFactory;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
@@ -62,6 +63,18 @@ public function projects(): HasMany
         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>
      */

tests/Unit/Endpoint/Api/V1/ClientEndpointTest.php

@@ -62,7 +62,7 @@ public function test_index_endpoint_returns_list_of_clients_assigned_to_employee
     {
         // Arrange
         $data = $this->createUserWithPermission([
-            'clients:view'
+            'clients:view',
         ]);
 
         $clients = Client::factory()->forOrganization($data->organization)->createMany(2);