ran linter added is_user filter param

Author: roncodes

src/Http/Controllers/Internal/v1/UserController.php

@@ -8,13 +8,13 @@
 use Fleetbase\Exports\UserExport;
 use Fleetbase\Http\Controllers\FleetbaseController;
 use Fleetbase\Http\Requests\CreateUserRequest;
-use Fleetbase\Http\Requests\UpdateUserRequest;
 use Fleetbase\Http\Requests\ExportRequest;
 use Fleetbase\Http\Requests\Internal\AcceptCompanyInvite;
 use Fleetbase\Http\Requests\Internal\InviteUserRequest;
 use Fleetbase\Http\Requests\Internal\ResendUserInvite;
 use Fleetbase\Http\Requests\Internal\UpdatePasswordRequest;
 use Fleetbase\Http\Requests\Internal\ValidatePasswordRequest;
+use Fleetbase\Http\Requests\UpdateUserRequest;
 use Fleetbase\Models\Company;
 use Fleetbase\Models\CompanyUser;
 use Fleetbase\Models\Invite;

src/Http/Filter/UserFilter.php

@@ -29,6 +29,11 @@ public function isNotAdmin()
         $this->builder->where('type', '!=', 'admin');
     }
 
+    public function isUser()
+    {
+        $this->builder->whereIn('type', ['user', 'admin']);
+    }
+
     public function query(?string $query)
     {
         $this->builder->search($query);
@@ -51,8 +56,11 @@ public function email(?string $email)
 
     public function role(?string $roleId)
     {
-        $this->builder->whereHas('roles', function ($query) use ($roleId) {
-            $query->where('id', $roleId);
+        $this->builder->whereHas('companyUsers', function ($query) use ($roleId) {
+            $query->where('company_uuid', session('company'));
+            $query->whereHas('roles', function ($query) use ($roleId) {
+                $query->where('id', $roleId);
+            });
         });
     }
 }