Skip to content

upgraded to native enums #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

upgraded to native enums #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/Models/User.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@
use LaravelEnso\People\Models\Person;
use LaravelEnso\People\Traits\IsPerson;
use LaravelEnso\Rememberable\Traits\Rememberable;
use LaravelEnso\Roles\Enums\Roles;
use LaravelEnso\Roles\Enums\Role as RoleEnum;
use LaravelEnso\Roles\Models\Role;
use LaravelEnso\Tables\Traits\TableCache;
use LaravelEnso\UserGroups\Enums\UserGroups;
use LaravelEnso\UserGroups\Enums\UserGroup as UserGroupEnum;
use LaravelEnso\UserGroups\Models\UserGroup;
use stdClass;

Expand Down Expand Up @@ -87,12 +87,12 @@ public function canAccess(string $route): bool

public function isAdmin(): bool
{
return $this->role_id === App::make(Roles::class)::Admin;
return $this->role_id === RoleEnum::Admin->value;
}

public function isSupervisor(): bool
{
return $this->role_id === App::make(Roles::class)::Supervisor;
return $this->role_id === RoleEnum::Supervisor->value;
}

public function isSuperior(): bool
Expand All @@ -102,7 +102,7 @@ public function isSuperior(): bool

public function belongsToAdminGroup(): bool
{
return $this->group_id === App::make(UserGroups::class)::Admin;
return $this->group_id === UserGroupEnum::Admin->value;
}

public function isPerson(Person $person): bool
Expand Down Expand Up @@ -133,12 +133,12 @@ public function lang(): string

public function scopeAdmins(Builder $builder): Builder
{
return $builder->whereRoleId(App::make(Roles::class)::Admin);
return $builder->whereRoleId(RoleEnum::Admin->value);
}

public function scopeSupervisors(Builder $builder): Builder
{
return $builder->whereRoleId(App::make(Roles::class)::Supervisor);
return $builder->whereRoleId(RoleEnum::Supervisor->value);
}

public function storeGlobalPreferences($global): void
Expand Down