STEMMechanics/Website
1
0
Fork 0
Code Issues 4 Pull Requests 3 Actions 1 Packages Projects Releases 3 Wiki Activity

fix permissions vs permissions()

Browse Source
This commit is contained in:
James Collins
2023-07-31 09:33:23 +10:00
parent 3ca5e81e34
commit d6524942f7
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
app/Models/User.php
View File

@@ -105,12 +105,9 @@ class User extends Authenticatable implements Auditable
*
* @return Illuminate\Database\Eloquent\Collection
*/
public function permissions(): array
public function permissions(): Collection
{
$cacheKey = "user:{$this->id}:permissions";
return Cache::remember($cacheKey, now()->addDays(28), function () {
return $this->hasMany(Permission::class)->pluck('permission')->toArray();
});
return $this->hasMany(Permission::class);
}
/**
@@ -120,7 +117,10 @@ class User extends Authenticatable implements Auditable
*/
public function getPermissionsAttribute(): array
{
return $this->permissions();
$cacheKey = "user:{$this->id}:permissions";
return Cache::remember($cacheKey, now()->addDays(28), function () {
return $this->permissions()->pluck('permission')->toArray();
});
}
/**
@@ -131,7 +131,7 @@ class User extends Authenticatable implements Auditable
*/
public function hasPermission(string $permission): bool
{
return in_array($permission, $this->permissions());
return in_array($permission, $this->permissions);
}
/**
@@ -150,7 +150,7 @@ class User extends Authenticatable implements Auditable
return ['permission' => $permission];
});
$existingPermissions = $this->permissions()->whereIn('permission', $permissions->pluck('permission'))->get();
$existingPermissions = $this->permissions;
$newPermissions = $permissions->reject(function ($permission) use ($existingPermissions) {
return $existingPermissions->contains('permission', $permission['permission']);
});