feature/FixManagment #14
@@ -67,6 +67,8 @@ class ExpertManagementController extends Controller
|
||||
*/
|
||||
public function show(Expert $expert): JsonResponse
|
||||
{
|
||||
$expert->load('roles', 'permissions');
|
||||
|
||||
return $this->successResponse(
|
||||
new ExpertManagementResource($expert)
|
||||
);
|
||||
|
||||
@@ -27,7 +27,7 @@ class UpdateRequest extends FormRequest
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'name' => ['required', 'string', 'max:255', Rule::unique('permission', 'name')->ignore($this->permission->id)],
|
||||
'name' => ['required', 'string', 'max:255', Rule::unique('permissions', 'name')->ignore($this->permission->id)],
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -24,8 +24,8 @@ class StoreRequest extends FormRequest
|
||||
{
|
||||
return [
|
||||
'name' => 'required|string|unique:roles,name',
|
||||
'permissions' => 'required|array',
|
||||
'permissions.*.name' => 'required|string|exists:permissions,name',
|
||||
'permissions' => 'array',
|
||||
'permissions.*' => 'integer|exists:permissions,id',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -27,9 +27,9 @@ class UpdateRequest extends FormRequest
|
||||
public function rules(): array
|
||||
{
|
||||
return [
|
||||
'name' => ['required', 'string', 'max:255', Rule::unique('roles', 'name')->ignore($this->role->id)],
|
||||
'permissions' => 'required|array',
|
||||
'permissions.*.name' => 'required|string|exists:permissions,name',
|
||||
'name' => ['string', 'max:255', Rule::unique('roles', 'name')->ignore($this->role->id)],
|
||||
'permissions' => 'array',
|
||||
'permissions.*' => 'integer|exists:permissions,id',
|
||||
];
|
||||
}
|
||||
}
|
||||
|
||||
@@ -28,11 +28,11 @@ class ExpertManagementResource extends JsonResource
|
||||
'phone_number' => $this->phone_number,
|
||||
'province_name' => $this->province_name,
|
||||
'city_name' => $this->city_name,
|
||||
'roles' => $this->roles()
|
||||
'roles' => $this->resource->roles
|
||||
->pluck('name')
|
||||
->values(),
|
||||
|
||||
'permissions' => $this->getAllPermissions()
|
||||
'permissions' => $this->resource->getAllPermissions()
|
||||
->pluck('name')
|
||||
->values(),
|
||||
];
|
||||
|
||||
@@ -5,6 +5,7 @@ namespace App\Models;
|
||||
use Database\Factories\ExpertFactory;
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
use Spatie\Permission\Traits\HasRoles;
|
||||
|
||||
/**
|
||||
* @method roles()
|
||||
@@ -14,6 +15,8 @@ class Expert extends Model
|
||||
{
|
||||
/** @use HasFactory<ExpertFactory> */
|
||||
use HasFactory;
|
||||
use HasRoles;
|
||||
|
||||
protected $guarded = ['id'];
|
||||
protected string $guard_name = 'web';
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user