feature/FixManagment #14

Merged
amirghasempoor merged 3 commits from feature/FixManagment into develop 2026-05-16 11:31:59 +00:00
6 changed files with 13 additions and 8 deletions
Showing only changes of commit 581e7af1fd - Show all commits

View File

@@ -67,6 +67,8 @@ class ExpertManagementController extends Controller
*/
public function show(Expert $expert): JsonResponse
{
$expert->load('roles', 'permissions');
return $this->successResponse(
new ExpertManagementResource($expert)
);

View File

@@ -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)],
];
}
}

View File

@@ -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',
];
}
}

View File

@@ -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',
];
}
}

View File

@@ -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(),
];

View File

@@ -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';
}