fix code3

Reviewed-on: #13

backend/app/Admin/Controllers/AuthController.php

@@ -2,26 +2,34 @@
 
 namespace App\Admin\Controllers;
 
+use App\Admin\Requests\Auth\LoginRequest;
+use App\Admin\Requests\Auth\RegisterRequest;
 use App\Http\Controllers\Controller;
+use App\Models\Expert;
 use App\Traits\ApiResponse;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 
 class AuthController extends Controller
 {
     use ApiResponse;
 
-    public function register(Request $request): JsonResponse
+    public function register(RegisterRequest $request): JsonResponse
     {
-//        Expert::query()->create();
+        Expert::query()->create([
+            'username' => $request->username,
+            'email' => $request->email,
+            'password' => Hash::make($request->password),
+        ]);
 
         $request->session()->regenerate();
 
         return $this->successResponse();
     }
 
-    public function login(Request $request): JsonResponse
+    public function login(LoginRequest $request): JsonResponse
     {
         $credentials = ['password' => $request->password];
 
@@ -35,13 +43,7 @@ class AuthController extends Controller
         {
             $request->session()->regenerate();
 
-            $user = Auth::user();
+            return $this->successResponse();
-
-            return $this->successResponse([
-                'id' => $user->id,
-                'username' => $user->username,
-                'email' => $user->email,
-            ]);
         }
 
         return $this->errorResponse(__('messages.incorrect_or_username_password'));
@@ -49,7 +51,7 @@ class AuthController extends Controller
 
     public function logout(Request $request): JsonResponse
     {
-        Auth::logout();
+        Auth::guard('expert')->logout();
 
         $request->session()->invalidate();
 

backend/app/Admin/Controllers/DocumentationController.php

@@ -2,6 +2,7 @@
 
 namespace App\Admin\Controllers;
 
+use App\Admin\Requests\Documentation\RejectRequest;
 use App\Facades\DataTable\DataTableFacade;
 use App\Http\Controllers\Controller;
 use App\Models\User;
@@ -16,31 +17,37 @@ class DocumentationController extends Controller
     public function index(Request $request): array
     {
         return DataTableFacade::run(
-            User::query()->with('documents'),
+            User::query(),
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'],
             allowedSelects: [
-                'users.id', 'users.first_name', 'users.last_name', 'users.national_id',
+                'id', 'first_name', 'last_name', 'national_id',
-                'users.phone_number', 'users.postal_code', 'users.city_id', 'users.province_id',
+                'phone_number', 'postal_code', 'city_id', 'province_id',
-                'users.province_name', 'users.city_name', 'users.address', 'documents.title', 'documents.url'
+                'province_name', 'city_name', 'address'
             ]
         );
     }
 
+    public function files(User $user): JsonResponse
+    {
+        return $this->successResponse($user->load('documents'));
+    }
+
     public function confirm(User $user): JsonResponse
     {
         $user->update([
-
+            'authority_level' => 1
         ]);
 
         return $this->successResponse();
     }
 
-    public function reject(User $user): JsonResponse
+    public function reject(RejectRequest $request, User $user): JsonResponse
     {
         $user->update([
-
+            'kyc_status' => 0,
+            'kyc_reject_reason' => $request->kyc_reject_reason
         ]);
 
         return $this->successResponse();

backend/app/Admin/Controllers/ExpertManagementController.php

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

backend/app/Admin/Controllers/ProfileController.php

@@ -2,11 +2,13 @@
 
 namespace App\Admin\Controllers;
 
+use App\Admin\Requests\Profile\ChangePasswordRequest;
 use App\Admin\Resources\ExpertResource;
 use App\Http\Controllers\Controller;
 use App\Traits\ApiResponse;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 
 class ProfileController extends Controller
 {
@@ -14,6 +16,22 @@ class ProfileController extends Controller
 
     public function info(): JsonResponse
     {
-        return $this->successResponse(new ExpertResource(Auth::user()));
+        return $this->successResponse(new ExpertResource(Auth::guard('expert')->user()));
+    }
+
+    public function changePassword(ChangePasswordRequest $request): JsonResponse
+    {
+        $expert = Auth::guard('expert')->user();
+
+        if (! Hash::check($request->current_password, $expert->password))
+        {
+            return $this->errorResponse(__('messages.incorrect_current_password'));
+        }
+
+        $expert->update([
+            'password' => Hash::make($request->new_password)
+        ]);
+
+        return $this->successResponse();
     }
 }

backend/app/Admin/Requests/Auth/LoginRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Admin\Requests\Auth;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class LoginRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'login' => 'required|string',
+            'password' => 'required|string',
+        ];
+    }
+}

backend/app/Admin/Requests/Auth/RegisterRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\Admin\Requests\Auth;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class RegisterRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'username' => 'required|unique:experts,username',
+            'email' => 'required|email|unique:experts,email',
+            'password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:6|confirmed',
+        ];
+    }
+}

backend/app/Admin/Requests/Documentation/RejectRequest.php

@@ -0,0 +1,29 @@
+<?php
+
+namespace App\Admin\Requests\Documentation;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class RejectRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'kyc_reject_reason' => 'required|string',
+        ];
+    }
+}

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

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

backend/app/Admin/Requests/Profile/ChangePasswordRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Admin\Requests\Profile;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class ChangePasswordRequest extends FormRequest
+{
+    /**
+     * Determine if the user is authorized to make this request.
+     */
+    public function authorize(): bool
+    {
+        return true;
+    }
+
+    /**
+     * Get the validation rules that apply to the request.
+     *
+     * @return array<string, ValidationRule|array|string>
+     */
+    public function rules(): array
+    {
+        return [
+            'current_password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:8',
+            'new_password' => 'required|string|regex:/^(?=.*[a-zA-Z])(?=.*\d).+$/|min:8',
+        ];
+    }
+}

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

@@ -24,8 +24,8 @@ class StoreRequest extends FormRequest
     {
         return [
             'name' => 'required|string|unique:roles,name',
-            'permissions' => 'required|array',
+            'permissions' => 'array',
-            'permissions.*.name' => 'required|string|exists:permissions,name',
+            'permissions.*' => 'integer|exists:permissions,id',
         ];
     }
 }

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

@@ -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)],
+            'name' => ['string', 'max:255', Rule::unique('roles', 'name')->ignore($this->role->id)],
-            'permissions' => 'required|array',
+            'permissions' => 'array',
-            'permissions.*.name' => 'required|string|exists:permissions,name',
+            'permissions.*' => 'integer|exists:permissions,id',
         ];
     }
 }

backend/app/Admin/Resources/ExpertManagementResource.php

@@ -1,41 +0,0 @@
-<?php
-
-namespace App\Admin\Resources;
-
-use Illuminate\Http\Request;
-use Illuminate\Http\Resources\Json\JsonResource;
-
-/**
- * @method roles()
- * @method getAllPermissions()
- */
-class ExpertManagementResource 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,
-            'province_name' => $this->province_name,
-            'city_name' => $this->city_name,
-            'roles' => $this->roles()
-                ->pluck('name')
-                ->values(),
-
-            'permissions' => $this->getAllPermissions()
-                ->pluck('name')
-                ->values(),
-        ];
-    }
-}
-

backend/app/Models/Expert.php

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

backend/app/User/Controllers/AuthController.php

@@ -18,12 +18,14 @@ class AuthController extends Controller
 
     public function register(RegisterRequest $request): JsonResponse
     {
-        User::query()->create([
+        $user = User::query()->create([
             'username' => $request->username,
             'email' => $request->email,
             'password' => Hash::make($request->password),
         ]);
 
+        Auth::guard('web')->login($user);
+
         $request->session()->regenerate();
 
         return $this->successResponse();
@@ -43,13 +45,7 @@ class AuthController extends Controller
         {
             $request->session()->regenerate();
 
-            $user = Auth::user();
+            return $this->successResponse();
-
-            return $this->successResponse([
-                'id' => $user->id,
-                'username' => $user->username,
-                'email' => $user->email,
-            ]);
         }
 
         return $this->errorResponse(__('messages.incorrect_or_username_password'));
@@ -57,7 +53,7 @@ class AuthController extends Controller
 
     public function logout(Request $request): JsonResponse
     {
-        Auth::logout();
+        Auth::guard('web')->logout();
 
         $request->session()->invalidate();
 

backend/database/migrations/0001_01_01_000000_create_users_table.php

@@ -29,6 +29,7 @@ return new class extends Migration
             $table->string('province_name')->nullable();
             $table->foreignId('city_id')->nullable()->constrained('cities');
             $table->string('city_name')->nullable();
+            $table->tinyInteger('authority_level')->default(0);
             $table->timestamps();
         });
 

backend/database/migrations/2026_05_12_074230_create_experts_table.php

@@ -24,7 +24,6 @@ return new class extends Migration
             $table->string('province_name')->nullable();
             $table->foreignId('city_id')->nullable()->constrained('cities');
             $table->string('city_name')->nullable();
-            $table->tinyInteger('level')->default(1);
             $table->timestamps();
         });
     }

backend/database/migrations/2026_05_13_054404_add_column_to_users_table.php

@@ -0,0 +1,28 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->string('kyc_reject_reason')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('users', function (Blueprint $table) {
+            $table->dropColumn('kyc_reject_reason');
+        });
+    }
+};

backend/routes/expert.php

@@ -1,12 +1,24 @@
 <?php
 
+use App\Admin\Controllers\AuthController;
 use App\Admin\Controllers\DocumentationController;
 
+Route::prefix('auth')
+    ->name('auth.')
+    ->controller(AuthController::class)
+    ->group(function () {
+        Route::post('register', 'register')->name('register');
+        Route::post('login', 'login')->name('login');
+        Route::post('logout', 'logout')->name('logout');
+});
+
 Route::prefix('documents')
     ->name('documents.')
+    ->middleware('auth:expert')
     ->controller(DocumentationController::class)
     ->group(function () {
-        Route::post('/', 'index')->name('index');
+        Route::get('/', 'index')->name('index');
         Route::post('confirm', 'confirm')->name('confirm');
         Route::post('reject', 'reject')->name('reject');
+        Route::get('files/{user}', 'files')->name('files');
     });