change edit method

Reviewed-on: #18

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

@@ -0,0 +1,38 @@
+<?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
+    {
+        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/User/Controllers/GatewayManagementController.php

@@ -13,6 +13,8 @@ use App\User\Requests\Gateway\UpdateRequest;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
+use Throwable;
 
 class GatewayManagementController extends Controller
 {
@@ -29,25 +31,33 @@ class GatewayManagementController extends Controller
         );
     }
 
+    /**
+     * @throws Throwable
+     */
     public function store(StoreRequest $request): JsonResponse
     {
         $user = Auth::guard('web')->user();
 
         $logo = $request->has('logo') ? FileFacade::save($request->file('logo'), "{$user->id}") : null;
 
-        UserGateway::query()->create([
+        DB::transaction(function () use ($user, $logo, $request) {
-            'user_id' => $user->id,
+            UserGateway::query()->create([
-            'username' => $user->username,
+                'user_id' => $user->id,
-            'name' => $request->name,
+                'username' => $user->username,
-            'domain' => $request->domain,
+                'name' => $request->name,
-            'tax_id' => $request->tax_id,
+                'domain' => $request->domain,
-            'bank_name' => $request->bank_name,
+                'tax_id' => $request->tax_id,
-            'account_holder' => $request->account_holder,
+                'bank_name' => $request->bank_name,
-            'iban' => $request->iban,
+                'account_holder' => $request->account_holder,
-            'business_type_id' => $request->business_type_id,
+                'iban' => $request->iban,
-            'business_type_name' => BusinessTypeEnum::name($request->business_type_id),
+                'business_type_id' => $request->business_type_id,
-            'logo' => $logo,
+                'business_type_name' => BusinessTypeEnum::name($request->business_type_id),
-        ]);
+                'logo' => $logo,
+            ]);
+
+            $user->update(['authority_level' => 1]);
+        });
+
 
         return $this->successResponse();
     }

backend/app/User/Controllers/ProfileController.php

@@ -3,6 +3,8 @@
 namespace App\User\Controllers;
 
 use App\Http\Controllers\Controller;
+use App\Models\City;
+use App\Models\Province;
 use App\Traits\ApiResponse;
 use App\User\Requests\Profile\ChangePasswordRequest;
 use App\User\Requests\Profile\EditRequest;
@@ -23,6 +25,8 @@ class ProfileController extends Controller
     public function edit(EditRequest $request): JsonResponse
     {
         $user = Auth::user();
+        $province = Province::query()->find($request->province_id);
+        $city = City::query()->find($request->city_id);
 
         $user->update([
             'first_name' => $request->first_name,
@@ -31,9 +35,13 @@ class ProfileController extends Controller
             'address' => $request->address,
             'postal_code' => $request->postal_code,
             'phone_number' => $request->phone_number,
-            'province_id' => $request->province_id,
+            'province_id' => $province->id,
-            'city_id' => $request->city_id,
+            'province_name' => $province->name,
-            'status' => 1
+            'city_id' => $city->id,
+            'city_name' => $city->name,
+            'birth_date' => $request->birth_date,
+            'email' => $request->email,
+            'kyc_status' => 1,
         ]);
 
         return $this->successResponse();

backend/app/User/Requests/Gateway/StoreRequest.php

@@ -4,6 +4,7 @@ namespace App\User\Requests\Gateway;
 
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
 
 class StoreRequest extends FormRequest
 {
@@ -12,7 +13,7 @@ class StoreRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return true;
+        return Auth::guard('web')->user()->kyc_status;
     }
 
     /**

backend/app/User/Requests/Gateway/UpdateRequest.php

@@ -4,6 +4,7 @@ namespace App\User\Requests\Gateway;
 
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
 
 class UpdateRequest extends FormRequest
 {
@@ -12,7 +13,7 @@ class UpdateRequest extends FormRequest
      */
     public function authorize(): bool
     {
-        return true;
+        return Auth::guard('web')->user()->kyc_status;
     }
 
     /**

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

@@ -4,6 +4,9 @@ namespace App\User\Requests\Profile;
 
 use Illuminate\Contracts\Validation\ValidationRule;
 use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
+use Illuminate\Validation\Rule;
+use Illuminate\Validation\Validator;
 
 class EditRequest extends FormRequest
 {
@@ -22,15 +25,21 @@ class EditRequest extends FormRequest
      */
     public function rules(): array
     {
+        $user = Auth::guard('web')->user();
+
         return [
-            'first_name' => 'required|string',
+            'first_name' => 'required|string|max:255',
-            'last_name' => 'required|string',
+            'last_name' => 'required|string|max:255',
-            'national_id' => 'required',
+            'national_id' => [
-            'address' => 'required',
+                Rule::prohibitedIf($user->kyc_status == 1), 'string',
-            'postal_code' => 'required',
+            ],
-            'phone_number' => 'required',
+            'email' => 'required|email|max:255',
-            'province_id' => 'required',
+            'address' => 'required|string',
-            'city_id' => 'required',
+            'postal_code' => 'required|string',
+            'phone_number' => 'required|string',
+            'province_id' => 'required|exists:provinces,id',
+            'city_id' => 'required|exists:cities,id',
+            'birth_date' => 'required|date',
         ];
     }
 }

backend/database/migrations/0001_01_01_000000_create_users_table.php

@@ -22,7 +22,6 @@ return new class extends Migration
             $table->string('national_id')->nullable();
             $table->string('address')->nullable();
             $table->string('postal_code')->nullable();
-            $table->string('tax_id')->nullable();
             $table->string('phone_number')->nullable();
             $table->date('birth_date')->nullable();
             $table->foreignId('province_id')->nullable()->constrained('provinces');

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;
 
@@ -74,3 +75,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');
+    });