Zoren-Software · CeruttiMaicon · Jun 6, 2024 · Jun 6, 2024 · Jun 6, 2024
diff --git a/app/GraphQL/Validators/Mutation/UserEditValidator.php b/app/GraphQL/Validators/Mutation/UserEditValidator.php
@@ -24,7 +24,7 @@ public function rules(): array
             'password' => [
                 'sometimes',
                 'min:6' => function (): bool {
-                    return ! empty($this->arg('password')) && $this->arg('password') !== '';
+                    return !empty($this->arg('password')) && $this->arg('password') !== '';
                 },
                 new OwnsPassword($this->arg('id')),
             ],

diff --git a/app/Models/Role.php b/app/Models/Role.php
@@ -3,6 +3,7 @@
 namespace App\Models;
 
 use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Database\Eloquent\Casts\Attribute;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Spatie\Permission\Models\Role as SpatieRole;
 
@@ -69,8 +70,10 @@ public function scopeFilterName(Builder $query, string $search)
         });
     }
 
-    public function getNameAttribute($value)
+    protected function name(): Attribute
     {
-        return trans('RoleRegister.' . $value);
+        return Attribute::make(
+            get: fn ($value) => trans('RoleRegister.' . $value)
+        );
     }
 }
diff --git a/app/Models/User.php b/app/Models/User.php
@@ -17,6 +17,7 @@
 use Laravel\Sanctum\HasApiTokens;
 use Spatie\Activitylog\LogOptions;
 use Spatie\Activitylog\Traits\LogsActivity;
+use Spatie\Permission\PermissionRegistrar;
 use Spatie\Permission\Traits\HasRoles;
 
 /**
@@ -83,14 +84,17 @@ public function rolesCustom(): BelongsToMany
             'model',
             config('permission.table_names.model_has_roles'),
             config('permission.column_names.model_morph_key'),
-            'role_id'
+            app(PermissionRegistrar::class)->pivotRole
         );
 
-        return $relation->wherePivot('model_id', getPermissionsTeamId()) // Substitua 'model_id' pela coluna correta, se necessário
-            ->where(function ($q) {
-                $teamField = config('permission.table_names.roles') . '.id'; // Ajuste conforme a nova configuração
-                $q->whereNull($teamField)->orWhere($teamField, getPermissionsTeamId());
-            });
+        if (!app(PermissionRegistrar::class)->teams) {
+            return $relation;
+        }
+
+        $teamField = config('permission.table_names.roles') . '.' . app(PermissionRegistrar::class)->teamsKey;
+
+        return $relation->wherePivot(app(PermissionRegistrar::class)->teamsKey, getPermissionsTeamId())
+            ->where(fn ($q) => $q->whereNull($teamField)->orWhere($teamField, getPermissionsTeamId()));
     }
 
     public function positions()

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "zoren-software/volei-club",
     "type": "project",
     "description": "API for VoleiClub project",
-    "version": "1.4.1",
+    "version": "1.4.2",
     "keywords": ["framework", "laravel"],
     "license": "MIT",
     "require": {