fix code

backend/app/Admin/Controllers/ExpertManagementController.php

@@ -57,7 +57,6 @@ class ExpertManagementController extends Controller
             'province_name' => $province->name,
             'city_id' => $request->city_id,
             'city_name' => $city->name,
-            'level' => $request->level,
         ]);
 
         return $this->successResponse();
@@ -93,7 +92,6 @@ class ExpertManagementController extends Controller
             'province_name' => $province->name,
             'city_id' => $request->city_id,
             'city_name' => $city->name,
-            'level' => $request->level,
         ]);
 
         return $this->successResponse();

backend/app/Admin/Controllers/RoleManagementController.php

@@ -24,7 +24,7 @@ class RoleManagementController extends Controller
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'],
-            allowedSelects: ['id', 'name', 'description']
+            allowedSelects: ['id', 'name']
         );
 
         return response()->json($data);

backend/app/Admin/Controllers/UserManagementController.php

@@ -4,7 +4,6 @@ namespace App\Admin\Controllers;
 
 use App\Admin\Requests\UserManagement\StoreRequest;
 use App\Admin\Requests\UserManagement\UpdateRequest;
-use App\Admin\Resources\UserManagementResource;
 use App\Facades\DataTable\DataTableFacade;
 use App\Http\Controllers\Controller;
 use App\Models\City;
@@ -29,7 +28,7 @@ class UserManagementController extends Controller
             allowedSortings: ['*'],
             allowedSelects: ['id', 'username','first_name', 'last_name','kyc_status','national_id',
                 'phone_number','postal_code','province_id','province_name', 'city_id', 'city_name',
-                'birth_date','tax_id', 'password', 'email', 'level', 'key_status'],
+                'birth_date','tax_id', 'password', 'email'],
         );
 
         return response()->json($data);
@@ -69,9 +68,8 @@ class UserManagementController extends Controller
      */
     public function show(User $user): JsonResponse
     {
-        return $this->successResponse(
+        return $this->successResponse($user);
-            new UserManagementResource($user)
+
-        );
     }
 
     /**

backend/app/Admin/Requests/ExpertManagement/StoreRequest.php

@@ -23,13 +23,13 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'username' => 'required|string|max:255|unique:users,username',
+            'username' => 'required|string|max:255|unique:experts,username',
             'first_name' => 'required|string|max:255',
             'last_name' => 'required|string|max:255',
-            'national_id' => 'required|string|max:20|unique:users,national_id',
+            'national_id' => 'required|string|max:20|unique:experts,national_id',
             'password' => 'required|string|min:8|confirmed',
-            'email' => 'required|email|max:255|unique:users,email',
+            'email' => 'required|email|max:255|unique:experts,email',
-            'phone_number' => 'required|string|max:20|unique:users,phone_number',
+            'phone_number' => 'required|string|max:20|unique:experts,phone_number',
             'province_id' => 'required|integer|exists:provinces,id',
             'city_id' => 'required|integer|exists:cities,id',
             ];

backend/app/Admin/Requests/ExpertManagement/UpdateRequest.php

@@ -7,7 +7,7 @@ use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Validation\Rule;
 
 /**
- * @property mixed $user
+ * @property mixed $expert
  */
 class UpdateRequest extends FormRequest
 {
@@ -28,16 +28,16 @@ class UpdateRequest extends FormRequest
     {
         return [
             'username' => ['string', 'max:255',
-                Rule::unique('users', 'username')->ignore($this->user->id),],
+                Rule::unique('experts', 'username')->ignore($this->expert->id),],
             'first_name' => 'string|max:255',
             'last_name' => 'string|max:255',
             'national_id' => ['string', 'max:20',
-                Rule::unique('users', 'national_id')->ignore($this->user->id),],
+                Rule::unique('experts', 'national_id')->ignore($this->expert->id),],
-            'password' => 'nullable|string|min:8|confirmed',
+            'password' => 'string|min:8|confirmed',
             'email' => ['email', 'max:255',
-                Rule::unique('users', 'email')->ignore($this->user->id),],
+                Rule::unique('experts', 'email')->ignore($this->expert->id),],
             'phone_number' => ['string', 'max:20',
-                Rule::unique('users', 'phone_number')->ignore($this->user->id),],
+                Rule::unique('experts', 'phone_number')->ignore($this->expert->id),],
             'province_id' => 'required|integer|exists:provinces,id',
             'city_id' => 'required|integer|exists:cities,id',
         ];

backend/app/Admin/Requests/UserManagement/UpdateRequest.php

@@ -34,7 +34,7 @@ class UpdateRequest extends FormRequest
             'last_name' => 'string|max:255',
             'national_id' => ['string', 'max:20',
                 Rule::unique('users', 'national_id')->ignore($this->user->id),],
-            'password' => 'nullable|string|min:8|confirmed',
+            'password' => 'string|min:8|confirmed',
             'email' => ['email', 'max:255',
                 Rule::unique('users', 'email')->ignore($this->user->id),],
             'birth_date' => 'nullable|date',

backend/app/Admin/Resources/UserManagementResource.php

@@ -1,43 +0,0 @@
-<?php
-
-namespace App\Admin\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @method roles()
- * @method getAllPermissions()
- */
-class UserManagementResource extends JsonResource
-{
-    /**
-     * Transform the resource into an array.
-     *
-     * @return array<string, mixed>
-     */
-    public function toArray(Request $request): array
-    {
-        return [
-            'id' => $this->id,
-            'username' => $this->username,
-            'first_name' => $this->first_name,
-            'last_name' => $this->last_name,
-            'national_id' => $this->national_id,
-            'email' => $this->email,
-            'phone_number' => $this->phone_number,
-            'postal_code' => $this->postal_code,
-            'address' => $this->address,
-            'province_name' => $this->province_name,
-            'city_name' => $this->city_name,
-            'roles' => $this->roles()
-                ->pluck('name')
-                ->values(),
-
-            'permissions' => $this->getAllPermissions()
-                ->pluck('name')
-                ->values(),
-        ];
-    }
-}
-