fix code

Reviewed-on: #17

backend/app/Admin/Controllers/ExpertManagementController.php

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

backend/app/Admin/Controllers/ProfileController.php

@@ -3,6 +3,7 @@
 namespace App\Admin\Controllers;
 
 use App\Admin\Requests\Profile\ChangePasswordRequest;
+use App\Admin\Requests\Profile\EditRequest;
 use App\Admin\Resources\ExpertResource;
 use App\Http\Controllers\Controller;
 use App\Traits\ApiResponse;
@@ -19,6 +20,24 @@ class ProfileController extends Controller
         return $this->successResponse(new ExpertResource(Auth::guard('expert')->user()));
     }
 
+    public function edit(EditRequest $request): JsonResponse
+    {
+        $expert = $request->user('expert');
+
+        $expert->update([
+            'username' => $request->username,
+            'first_name' => $request->first_name,
+            'last_name' => $request->last_name,
+            'email' => $expert->email,
+            'national_id' => $request->national_id,
+            'phone_number' => $request->phone_number,
+            'province_id' => $request->province_id,
+            'city_id' => $request->city_id,
+        ]);
+
+        return $this->successResponse();
+    }
+
     public function changePassword(ChangePasswordRequest $request): JsonResponse
     {
         $expert = Auth::guard('expert')->user();

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/EditRequest.php

@@ -0,0 +1,39 @@
+<?php
+
+namespace App\Admin\Requests\Profile;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;
+
+class EditRequest 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
+    {
+        $user = $this->user();
+        return [
+            'username' => 'string|max:255',
+            'first_name' => 'required|string',
+            'last_name' => 'required|string',
+            'national_id' => 'required',
+            'email' => 'string|email|max:255',
+            'phone_number' => 'string',
+            'province_id' => 'string',
+            'city_id' => 'string',
+        ];
+    }
+}

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.*.name' => 'required|string|exists:permissions,name',
+            'permissions' => 'array',
+            '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)],
-            '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',
         ];
     }
 }

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/Models/Gateway.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\GatewayFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Gateway extends Model
+{
+    /** @use HasFactory<GatewayFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Models/GatewayCategory.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\GatewayCategoryFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class GatewayCategory extends Model
+{
+    /** @use HasFactory<GatewayCategoryFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Models/Payment.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\PaymentFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class Payment extends Model
+{
+    /** @use HasFactory<PaymentFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Models/PaymentStatus.php

@@ -0,0 +1,15 @@
+<?php
+
+namespace App\Models;
+
+use Database\Factories\PaymentStatusFactory;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class PaymentStatus extends Model
+{
+    /** @use HasFactory<PaymentStatusFactory> */
+    use HasFactory;
+
+    protected $guarded = ['id'];
+}

backend/app/Services/FIB/AuthorizationService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\User\Services\FIB;
+namespace App\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/Services/FIB/CancelPaymentService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\User\Services\FIB;
+namespace App\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/Services/FIB/CheckPaymentStatusService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\User\Services\FIB;
+namespace App\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/Services/FIB/CreatePaymentService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\User\Services\FIB;
+namespace App\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/Services/FIB/RefundService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\User\Services\FIB;
+namespace App\Services\FIB;
 
 use Exception;
 use Illuminate\Http\Client\ConnectionException;

backend/app/User/Controllers/ProfileController.php

@@ -24,17 +24,7 @@ class ProfileController extends Controller
     {
         $user = Auth::user();
 
-        $user->update([
-            'first_name' => $request->first_name,
-            'last_name' => $request->last_name,
-            'national_id' => $request->national_id,
-            'address' => $request->address,
-            'postal_code' => $request->postal_code,
-            'phone_number' => $request->phone_number,
-            'province_id' => $request->province_id,
-            'city_id' => $request->city_id,
-            'status' => 1
-        ]);
+        $user->update($request->validated());
 
         return $this->successResponse();
     }

backend/app/User/Requests/Profile/EditRequest.php

@@ -4,6 +4,8 @@ namespace App\User\Requests\Profile;
 
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;
 
 class EditRequest extends FormRequest
 {
@@ -22,10 +24,18 @@ class EditRequest extends FormRequest
      */
     public function rules(): array
     {
+        $user = $this->user();
+
         return [
-            'first_name' => 'required|string',
-            'last_name' => 'required|string',
-            'national_id' => 'required',
+            'first_name' => [
+                Rule::prohibitedIf($user->kyc_status == 1), 'string',
+            ],
+            'last_name' => [
+                Rule::prohibitedIf($user->kyc_status == 1), 'string',
+            ],
+            'national_id' => [
+                Rule::prohibitedIf($user->kyc_status == 1), 'string',
+            ],
             'address' => 'required',
             'postal_code' => 'required',
             'phone_number' => 'required',
@@ -33,4 +43,28 @@ class EditRequest extends FormRequest
             'city_id' => 'required',
         ];
     }
+    public function after(): array
+    {
+        return [
+            function (Validator $validator) {
+                $user = $this->user();
+                if ($user->kyc_status == 1) {
+                    $lockedFields = [
+                        'first_name',
+                        'last_name',
+                        'national_id',
+                    ];
+
+                    foreach ($lockedFields as $field) {
+                        if ($this->filled($field)) {
+                            $validator->errors()->add(
+                                $field,
+                                'you cannot change this field.'
+                            );
+                        }
+                    }
+                }
+            },
+        ];
+    }
 }

backend/database/factories/GatewayCategoryFactory.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\GatewayCategory;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends Factory<GatewayCategory>
+ */
+class GatewayCategoryFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            //
+        ];
+    }
+}

backend/database/factories/GatewayFactory.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\Gateway;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends Factory<Gateway>
+ */
+class GatewayFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            //
+        ];
+    }
+}

backend/database/factories/PaymentFactory.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\Payment;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends Factory<Payment>
+ */
+class PaymentFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            //
+        ];
+    }
+}

backend/database/factories/PaymentStatusFactory.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace Database\Factories;
+
+use App\Models\PaymentStatus;
+use Illuminate\Database\Eloquent\Factories\Factory;
+
+/**
+ * @extends Factory<PaymentStatus>
+ */
+class PaymentStatusFactory extends Factory
+{
+    /**
+     * Define the model's default state.
+     *
+     * @return array<string, mixed>
+     */
+    public function definition(): array
+    {
+        return [
+            //
+        ];
+    }
+}

backend/database/migrations/2026_05_17_053830_create_payment_statuses_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::create('payment_statuses', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('payment_statuses');
+    }
+};

backend/database/migrations/2026_05_17_053831_create_gateway_categories_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::create('gateway_categories', function (Blueprint $table) {
+            $table->id();
+            $table->string('name');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('gateway_categories');
+    }
+};

backend/database/migrations/2026_05_17_053832_create_gateways_table.php

@@ -0,0 +1,38 @@
+<?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::create('gateways', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('user_id')->constrained('users');
+            $table->string('username');
+            $table->string('name');
+            $table->string('domain');
+            $table->string('tax_id');
+            $table->string('bank_name');
+            $table->string('account_holder');
+            $table->string('logo')->nullable();
+            $table->string('iban');
+            $table->foreignId('category_id')->constrained('gateway_categories');
+            $table->string('category_name');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('gateways');
+    }
+};

backend/database/migrations/2026_05_17_053833_create_payments_table.php

@@ -0,0 +1,38 @@
+<?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::create('payments', function (Blueprint $table) {
+            $table->id();
+            $table->foreignId('user_id')->constrained('users');
+            $table->string('username');
+            $table->uuid('track_id');
+            $table->string('amount');
+            $table->string('currency');
+            $table->string('callback_url');
+            $table->dateTime('expires_at');
+            $table->foreignId('status_id')->constrained('payment_statuses');
+            $table->string('status_name');
+            $table->ipAddress('ip');
+            $table->foreignId('gateway_id')->constrained('gateways');
+            $table->timestamps();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::dropIfExists('payments');
+    }
+};

backend/database/seeders/GatewayCategorySeeder.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+
+class GatewayCategorySeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        //
+    }
+}

backend/database/seeders/GatewaySeeder.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+
+class GatewaySeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        //
+    }
+}

backend/database/seeders/PaymentSeeder.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+
+class PaymentSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        //
+    }
+}

backend/database/seeders/PaymentStatusSeeder.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace Database\Seeders;
+
+use Illuminate\Database\Console\Seeds\WithoutModelEvents;
+use Illuminate\Database\Seeder;
+
+class PaymentStatusSeeder extends Seeder
+{
+    /**
+     * Run the database seeds.
+     */
+    public function run(): void
+    {
+        //
+    }
+}

backend/routes/expert.php

@@ -4,6 +4,7 @@ use App\Admin\Controllers\AuthController;
 use App\Admin\Controllers\DocumentationController;
 use App\Admin\Controllers\ExpertManagementController;
 use App\Admin\Controllers\PermissionManagementController;
+use App\Admin\Controllers\ProfileController;
 use App\Admin\Controllers\RoleManagementController;
 use App\Admin\Controllers\UserManagementController;
 
@@ -71,3 +72,13 @@ Route::prefix('expert')
         Route::post('/{expert}', 'update')->name('update');
         Route::delete('/{expert}', 'destroy')->name('destroy');
     });
+
+Route::prefix('profile')
+    ->name('profile.')
+    ->middleware('auth')
+    ->controller(ProfileController::class)
+    ->group(function () {
+        Route::get('info', 'info')->name('info');
+        Route::post('edit', 'edit')->name('edit');
+        Route::post('change_password', 'changePassword')->name('changePassword');
+    });