Merge pull request 'add three column in user_gateways and use them in controller' (#30) from feature/GetClient into develop

Reviewed-on: #30

backend/app/Admin/Controllers/AuthController.php

@@ -2,26 +2,21 @@
 
 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
-    {
-//        Expert::query()->create();
-
-        $request->session()->regenerate();
-
-        return $this->successResponse();
-    }
-
-    public function login(Request $request): JsonResponse
+    public function login(LoginRequest $request): JsonResponse
     {
         $credentials = ['password' => $request->password];
 
@@ -31,17 +26,10 @@ class AuthController extends Controller
             $credentials['username'] = $request->login;
         }
 
-        if (Auth::attempt($credentials))
-        {
+        if (Auth::guard('expert')->attempt($credentials)) {
             $request->session()->regenerate();
 
-            $user = Auth::user();
-
-            return $this->successResponse([
-                'id' => $user->id,
-                'username' => $user->username,
-                'email' => $user->email,
-            ]);
+            return $this->successResponse();
         }
 
         return $this->errorResponse(__('messages.incorrect_or_username_password'));
@@ -49,7 +37,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',
-                'users.phone_number', 'users.postal_code', 'users.city_id', 'users.province_id',
-                'users.province_name', 'users.city_name', 'users.address', 'documents.title', 'documents.url'
+                'id', 'first_name', 'last_name', 'national_id',
+                'phone_number', 'postal_code', 'city_id', 'province_id',
+                '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

@@ -4,7 +4,6 @@ namespace App\Admin\Controllers;
 
 use App\Admin\Requests\ExpertManagement\StoreRequest;
 use App\Admin\Requests\ExpertManagement\UpdateRequest;
-use App\Admin\Resources\ExpertManagementResource;
 use App\Facades\DataTable\DataTableFacade;
 use App\Http\Controllers\Controller;
 use App\Models\City;
@@ -67,8 +66,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

@@ -2,11 +2,14 @@
 
 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;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\Hash;
 
 class ProfileController extends Controller
 {
@@ -14,6 +17,40 @@ 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 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();
+
+        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/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/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/Enums/BusinessTypeEnum.php

@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Enums;
+
+enum BusinessTypeEnum: int
+{
+    case MEDICAL = 1;
+    case LEGAL = 2;
+    case ENGINEERING = 3;
+    case EDUCATION = 4;
+    case CONSULTING = 5;
+    case BEAUTY = 6;
+    case TECHNICAL_SERVICES = 7;
+    case FINANCIAL = 8;
+    case REAL_ESTATE = 9;
+    case RESTAURANT = 10;
+    case SHOP = 11;
+    case TRANSPORTATION = 12;
+    case ART = 13;
+    case SPORT = 14;
+    case OTHER = 15;
+
+    public function label(): string
+    {
+        return match ($this) {
+            self::MEDICAL => 'medical',
+            self::LEGAL => 'legal',
+            self::ENGINEERING => 'engineering',
+            self::EDUCATION => 'education',
+            self::CONSULTING => 'consulting',
+            self::BEAUTY => 'beauty',
+            self::TECHNICAL_SERVICES => 'technical_services',
+            self::FINANCIAL => 'financial',
+            self::REAL_ESTATE => 'real_estate',
+            self::RESTAURANT => 'restaurant',
+            self::SHOP => 'shop',
+            self::TRANSPORTATION => 'transportation',
+            self::ART => 'art',
+            self::SPORT => 'sport',
+            self::OTHER => 'other',
+        };
+    }
+
+    public static function name($id): string
+    {
+        $mapArray = [
+            1 => 'medical',
+            2 => 'legal',
+            3 => 'engineering',
+            4 => 'education',
+            5 => 'consulting',
+            6 => 'beauty',
+            7 => 'technical_services',
+            8 => 'financial',
+            9 => 'real_estate',
+            10 => 'restaurant',
+            11 => 'shop',
+            12 => 'transportation',
+            13 => 'art',
+            14 => 'sport',
+            15 => 'other',
+        ];
+
+        return $mapArray[$id];
+    }
+}

backend/app/Enums/PaymentStatusEnum.php

@@ -0,0 +1,23 @@
+<?php
+
+namespace App\Enums;
+
+enum PaymentStatusEnum:int
+{
+    case Unpaid = 0;
+    case Cancelled = 1;
+    case Expired = 2;
+    case Paid = 3;
+    case Refunded = 4;
+
+    public function label(): string
+    {
+        return match ($this) {
+            self::Unpaid => 'unpaid',
+            self::Cancelled => 'cancelled',
+            self::Expired => 'expired',
+            self::Paid => 'paid',
+            self::Refunded => 'refunded',
+        };
+    }
+}

backend/app/Models/BusinessType.php

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

backend/app/Models/Expert.php

@@ -5,15 +5,20 @@ namespace App\Models;
 use Database\Factories\ExpertFactory;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Notifications\Notifiable;
+use Illuminate\Foundation\Auth\User as Authenticatable;
+use Spatie\Permission\Traits\HasRoles;
 
 /**
  * @method roles()
  * @method permissions()
  */
-class Expert extends Model
+class Expert extends Authenticatable
 {
     /** @use HasFactory<ExpertFactory> */
-    use HasFactory;
+
+    use Notifiable,HasFactory,HasRoles;
 
     protected $guarded = ['id'];
+    protected string $guard_name = 'web';
 }

backend/app/Models/FibTransaction.php

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

backend/app/Models/FibTransactionStatus.php

@@ -0,0 +1,12 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class FibTransactionStatus extends Model
+{
+    /** @use HasFactory<\Database\Factories\FibTransactionStatusFactory> */
+    use HasFactory;
+}

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

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

backend/app/Models/User.php

@@ -10,6 +10,8 @@ use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Database\Eloquent\Relations\MorphToMany;
 use Illuminate\Foundation\Auth\User as Authenticatable;
 use Illuminate\Notifications\Notifiable;
+use Illuminate\Support\Facades\Hash;
+use Laravel\Passport\Bridge\Client;
 use Laravel\Passport\HasApiTokens;
 
 #[Guarded(['id'])]
@@ -24,4 +26,14 @@ class User extends Authenticatable
     {
         return $this->morphToMany(Document::class, 'documentable');
     }
+
+    public function validateForPassportPasswordGrant(string $password): bool
+    {
+        return Hash::check($password, $this->password);
+    }
+
+    public function findForPassport(string $username, Client $client): User
+    {
+        return $this->where('username', $username)->first();
+    }
 }

backend/app/Models/UserGateway.php

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

backend/app/Providers/AppServiceProvider.php

@@ -22,6 +22,8 @@ class AppServiceProvider extends ServiceProvider
     public function boot(): void
     {
         Passport::enablePasswordGrant();
+        Passport::tokensExpireIn(CarbonInterval::minutes(1));
+        Passport::refreshTokensExpireIn(CarbonInterval::minutes(5));
         Passport::personalAccessTokensExpireIn(CarbonInterval::minutes(1));
     }
 }

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;
@@ -16,7 +16,7 @@ class AuthorizationService
     public function __construct()
     {
         $this->url = config('fib.authorization.url');
-        $this->channelName = '';
+        $this->channelName = 'fib_authorization';
         $this->inputParameters = [
             'client_id' => config('fib.authorization.client_id'),
             'client_secret' => config('fib.authorization.client_secret'),
@@ -51,7 +51,6 @@ class AuthorizationService
     {
         return Http::asForm()
             ->throw()
-            ->withoutVerifying()
             ->post($this->url, $this->inputParameters)
             ->json();
     }

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

@@ -0,0 +1,86 @@
+<?php
+
+namespace App\Services\FIB;
+
+use Illuminate\Support\Facades\Http;
+
+class FIBClient
+{
+
+    public $auth_service;
+    public $create_payment_service;
+
+    public function __construct()
+    {
+    }
+
+    public function client()
+    {
+        return Http::acceptJson()
+            ->contentType('application/json')
+            ->withToken($this->getAccessToken())
+            ->timeout(30);
+    }
+
+    public function getAccessToken()
+    {
+        try {
+            if ($this->isNotProduction()) {
+                return json_decode(
+                    file_get_contents(storage_path('app/mock/fib/token.json'))
+                );
+            }
+            $response = Http::withOptions([
+                'proxy' => 'http://host.docker.internal:10808',
+            ])->asForm()->post('https://fib-stage.fib.iq/auth/realms/fib-online-shop/protocol/openid-connect/token', [
+                'grant_type' => 'client_credentials',
+                'client_id' => 'ipay-test-payment',
+                'client_secret' => '8dae3180-f39c-448e-8b45-a01c8f4c8c15',
+            ]);
+
+            if ($response->failed()) {
+                throw new \Exception(
+                    'Unable to authenticate with FIB: ' .
+                    $response->body()
+                );
+            }
+
+            $data = $response->json();
+
+            if (!isset($data['access_token'])) {
+                throw new \Exception('FIB token missing in response');
+            }
+
+            return $data['access_token'];
+        } catch (\Exception $exception) {
+            return $exception->getMessage();
+        }
+    }
+
+    public function createPaymentService()
+    {
+        if ($this->isNotProduction()) {
+            return json_decode(
+                file_get_contents(storage_path('app/mock/fib/payment_create_success.json'))
+            );
+        }
+        $response = $this->client()->post("https://fib-stage.fib.iq/protected/v1/payments");
+        if ($response->failed()) {
+            throw new \Exception(
+                'Unable to authenticate with FIB: ' .
+                $response->body()
+            );
+        }
+
+        $data = $response->json();
+        if (!isset($data['paymentId'])) {
+            throw new \Exception('FIB paymentId missing in response');
+        }
+        return $data;
+    }
+
+    public function isNotProduction()
+    {
+        return env('APP_ENV') === 'local';
+    }
+}

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/Services/Payments/DTO/FIBPaymentCreateDTO.php

@@ -0,0 +1,38 @@
+<?php
+
+namespace App\Services\Payments\DTO;
+
+class FIBPaymentCreateDTO
+{
+    public string $paymentId;
+    public string $readableCode;
+    public string $qrCode;
+    public string $validUntil;
+    public string $personalAppLink;
+    public string $businessAppLink;
+    public string $corporateAppLink;
+
+    public function __construct(array $data)
+    {
+        $this->paymentId = $data['paymentId'];
+        $this->readableCode = $data['readableCode'];
+        $this->qrCode = $data['qrCode'];
+        $this->validUntil = $data['validUntil'];
+        $this->personalAppLink = $data['personalAppLink'];
+        $this->businessAppLink = $data['businessAppLink'];
+        $this->corporateAppLink = $data['corporateAppLink'];
+    }
+
+    public static function fromResponse($data): FIBPaymentCreateDTO
+    {
+        return new self([
+            'paymentId' => $data->paymentId,
+            'readableCode' => $data->readableCode,
+            'qrCode' => $data->qrCode,
+            'validUntil' => $data->validUntil,
+            'personalAppLink' => $data->personalAppLink,
+            'businessAppLink' => $data->businessAppLink,
+            'corporateAppLink' => $data->corporateAppLink,
+        ]);
+    }
+}

backend/app/Services/Payments/DTO/PaymentCreateDTO.php

@@ -0,0 +1,46 @@
+<?php
+
+namespace App\Services\Payments\DTO;
+
+use Illuminate\Http\Request;
+
+class PaymentCreateDTO
+{
+
+    public string $username;
+    public int $user_id;
+    public string $track_id;
+    public string $amount;
+    public string $currency;
+    public string $callback_url;
+    public string $ip;
+    public int $user_gateway_id;
+
+
+    public function __construct(array $data)
+    {
+        $this->username = $data['username'];
+        $this->user_id = $data['user_id'];
+        $this->track_id = $data['track_id'];
+        $this->amount = $data['amount'];
+        $this->currency = $data['currency'];
+        $this->callback_url = $data['callback_url'];
+        $this->ip = $data['ip'];
+        $this->user_gateway_id = $data['user_gateway_id'];
+
+    }
+
+    public static function fromRequest(Request $request): PaymentCreateDTO
+    {
+        return new self([
+            'username' => $request->username,
+            'user_id' => '2',
+            'track_id' => uuid_create(),
+            'amount' => $request->amount,
+            'currency' => $request->currency,
+            'callback_url' => $request->callback_url,
+            'ip' => $request->getClientIp(),
+            'user_gateway_id' => $request->user_gateway_id,
+        ]);
+    }
+}

backend/app/Services/Payments/FibAdapter.php

@@ -0,0 +1,37 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Models\Payment;
+use App\Services\FIB\CreatePaymentService;
+use App\Services\FIB\FIBClient;
+
+class FibAdapter
+{
+    public function __construct(
+        private CreatePaymentService $create_payment_service,
+        private FIBClient            $fib_client
+    )
+    {
+    }
+
+    public function createPayment(array $data)
+    {
+        Payment::query()->create([
+            'user_id' => auth()->id(),
+            'username' => $data['username'],
+            'track_id' => $data['track_id'],
+            'amount' => $data['amount'],
+            'currency' => $data['currency'],
+            'callback_url' => $data['callback_url'],
+            'expires_at' => $data['expires_at'],
+            'status_id' => $data['status_id'],
+            'status_name' => $data['status_name'],
+            'ip' => $data['ip'],
+            'user_gateway_id' => $data['user_gateway_id'],
+            'created_at' => $data['created_at'],
+            'updated_at' => $data['updated_at'],
+        ]);
+        $this->fib_client->client();
+    }
+}

backend/app/Services/Payments/PaymentService.php

@@ -0,0 +1,72 @@
+<?php
+
+namespace App\Services\Payments;
+
+use App\Enums\PaymentStatusEnum;
+use App\Models\FibTransaction;
+use App\Models\Payment;
+use App\Models\Transaction;
+use App\Services\FIB\FIBClient;
+use App\Services\Payments\DTO\FIBPaymentCreateDTO;
+use App\Services\Payments\DTO\PaymentCreateDTO;
+
+class PaymentService
+{
+    public $fib_client;
+
+    public function __construct()
+    {
+        $this->fib_client = new FibClient();
+    }
+
+    public function createPayment(PaymentCreateDTO $dto)
+    {
+        try {
+            $payment = Payment::query()->create([
+                'user_id' => $dto->user_id,
+                'username' => $dto->username,
+                'track_id' => $dto->track_id,
+                'amount' => $dto->amount,
+                'currency' => $dto->currency,
+                'callback_url' => $dto->callback_url,
+                'status_id' => PaymentStatusEnum::Unpaid->value,
+                'status_name' => PaymentStatusEnum::Unpaid->name,
+                'ip' => $dto->ip,
+                'user_gateway_id' => $dto->user_gateway_id,
+            ]);
+
+            $response = $this->fib_client->createPaymentService();
+            $fib_response_dto = FIBPaymentCreateDTO::fromResponse($response);
+
+            $transaction = Transaction::query()->create([
+                'user_id' => $payment->user_id,
+                'amount' => $payment->amount,
+                'currency' => $payment->currency,
+                'callback_url' => $payment->callback_url,
+//                'description' => '',
+//                'expires_in' => '',
+                'payment_id' => $payment->id,
+                'payment_track_id' => $payment->track_id,
+                'user_gateway_id' => $payment->user_gateway_id,
+//                'status' => '',
+            ]);
+
+            $fib_transactions = FibTransaction::query()->create([
+                'transaction_id' => $transaction->id,
+                'qrcode' => $fib_response_dto->qrCode,
+                'readable_code' => $fib_response_dto->readableCode,
+                'personalAppLink' => $fib_response_dto->personalAppLink,
+                'businessAppLink' => $fib_response_dto->businessAppLink,
+                'corporateAppLink' => $fib_response_dto->corporateAppLink,
+                'paymentId' => $fib_response_dto->paymentId,
+                'paymentMethod' => 'fib',
+                'validUntil' => $fib_response_dto->validUntil,
+                'status_id' => PaymentStatusEnum::Unpaid->value,
+                'status_name' => PaymentStatusEnum::Unpaid->name,
+            ]);
+            return $payment;
+        } catch (\Exception $exception) {
+            throw new \Exception($exception->getMessage());
+        }
+    }
+}

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([
-                'id' => $user->id,
-                'username' => $user->username,
-                'email' => $user->email,
-            ]);
+            return $this->successResponse();
         }
 
         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/app/User/Controllers/CityController.php

@@ -0,0 +1,24 @@
+<?php
+
+namespace App\User\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Models\City;
+use App\Models\Province;
+use App\Traits\ApiResponse;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+class CityController extends Controller
+{
+    use ApiResponse;
+
+    public function list(Request $request): JsonResponse
+    {
+        $cities = City::query()
+            ->where('province_id', '=', $request->query('province_id'))
+            ->get(['id', 'name']);
+
+        return $this->successResponse($cities);
+    }
+}

backend/app/User/Controllers/Dashboard/ConfirmController.php

@@ -1,14 +0,0 @@
-<?php
-
-namespace App\User\Controllers\Dashboard;
-
-use App\Http\Controllers\Controller;
-use Illuminate\Http\Request;
-
-class ConfirmController extends Controller
-{
-    public function index()
-    {
-        //
-    }
-}

backend/app/User/Controllers/Dashboard/DocumentationController.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace App\User\Controller\Dashboard;
-
-use App\Http\Controllers\Controller;
-use App\Traits\ApiResponse;
-use Illuminate\Http\JsonResponse;
-use Illuminate\Http\Request;
-
-class DocumentationController extends Controller
-{
-    use ApiResponse;
-
-    public function store(StoreRequest $request): jsonResponse
-    {
-        //
-    }
-
-    public function update(UpdateRequest $request): JsonResponse
-    {
-        //
-    }
-
-}

backend/app/User/Controllers/DocumentationController.php

@@ -0,0 +1,42 @@
+<?php
+
+namespace App\User\Controllers;
+
+use App\Facades\File\FileFacade;
+use App\Http\Controllers\Controller;
+use App\Traits\ApiResponse;
+use App\User\Requests\Documentation\EditRequest;
+use App\User\Requests\Documentation\UploadRequest;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\Auth;
+
+class DocumentationController extends Controller
+{
+    use ApiResponse;
+
+    public function upload(UploadRequest $request): jsonResponse
+    {
+        $user = Auth::guard('web')->user();
+
+        foreach ($request->documents as $document) {
+            $user->documents()->create([
+                'title' => $document['title'],
+                'url' => FileFacade::save($document['file'], "/{$user->id}/documents", $document['title']),
+            ]);
+        }
+
+        return $this->successResponse();
+    }
+
+    public function edit(EditRequest $request): JsonResponse
+    {
+        $user = Auth::guard('web')->user();
+
+        foreach ($request->documents as $document) {
+            $user->documents()->sync();
+        }
+
+        return $this->successResponse();
+    }
+}

backend/app/User/Controllers/GatewayManagementController.php

@@ -0,0 +1,109 @@
+<?php
+
+namespace App\User\Controllers;
+
+use App\Enums\BusinessTypeEnum;
+use App\Facades\DataTable\DataTableFacade;
+use App\Facades\File\FileFacade;
+use App\Http\Controllers\Controller;
+use App\Models\UserGateway;
+use App\Traits\ApiResponse;
+use App\User\Requests\Gateway\StoreRequest;
+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 Laravel\Passport\ClientRepository;
+use Throwable;
+
+class GatewayManagementController extends Controller
+{
+    use ApiResponse;
+
+    public function index(Request $request)
+    {
+        return DataTableFacade::run(
+            UserGateway::query()->where('user_id', '=', Auth::guard('web')->id()),
+            $request,
+            allowedFilters: ['*'],
+            allowedSortings: ['*'],
+            allowedSelects: ['*'],
+        );
+    }
+
+    /**
+     * @throws Throwable
+     */
+    public function store(StoreRequest $request): JsonResponse
+    {
+        $user = Auth::guard('web')->user();
+
+        $logo = $request->hasFile('logo')
+            ? FileFacade::save($request->file('logo'), "{$user->id}")
+            : null;
+
+        $passportClient = DB::transaction(function () use ($user, $logo, $request) {
+
+            $clientName = "Gateway {$request->name} - User {$user->id}";
+            $client = app(ClientRepository::class)->createPasswordGrantClient($clientName, 'users');
+
+            UserGateway::query()->create([
+                'user_id' => $user->id,
+                'username' => $user->username,
+                'name' => $request->name,
+                'domain' => $request->domain,
+                'tax_id' => $request->tax_id,
+                'bank_name' => $request->bank_name,
+                'account_holder' => $request->account_holder,
+                'iban' => $request->iban,
+                'business_type_id' => $request->business_type_id,
+                'business_type_name' => BusinessTypeEnum::name($request->business_type_id),
+                'logo' => $logo,
+                'client_id' => $client->id,
+                'client_secret' => $client->secret,
+            ]);
+
+            $user->update(['authority_level' => 1]);
+
+            return $client;
+        });
+
+        return $this->successResponse([
+            'client_id' => $passportClient->id,
+            'client_secret' => $passportClient->secret,
+        ]);
+    }
+    public function show(UserGateway $gateway): JsonResponse
+    {
+        return $this->successResponse($gateway);
+    }
+
+    public function update(UpdateRequest $request, UserGateway $gateway): JsonResponse
+    {
+        $logo = null;
+        $user = Auth::guard('web')->user();
+
+        if ($request->has('logo'))
+        {
+            FileFacade::delete($gateway->logo, true);
+            $logo = FileFacade::save(request()->file('logo'), "{$user->id}");
+        }
+
+        $gateway->update([
+            'name' => $request->name,
+            'domain' => $request->domain,
+            'business_type_id' => $request->business_type_id,
+            'business_type_name' => BusinessTypeEnum::name($request->business_type_id),
+            'logo' => $logo,
+        ]);
+
+        return $this->successResponse();
+    }
+
+    public function destroy(UserGateway $gateway): JsonResponse
+    {
+        $gateway->delete();
+        return $this->successResponse();
+    }
+}

backend/app/User/Controllers/Payment/PaymentController.php

@@ -0,0 +1,35 @@
+<?php
+
+namespace App\User\Controllers\Payment;
+
+use App\Http\Controllers\Controller;
+use App\Services\Payments\DTO\PaymentCreateDTO;
+use App\Services\Payments\PaymentService;
+use App\Traits\ApiResponse;
+use App\User\Requests\Payment\FIB\StoreRequest;
+use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
+
+
+class PaymentController extends Controller
+{
+    use ApiResponse;
+
+    public $payment_service;
+
+    public function __construct(PaymentService $payment_service)
+    {
+        $this->payment_service = $payment_service;
+    }
+
+    public function createPayment(StoreRequest $request): JsonResponse
+    {
+        try {
+            $dto = PaymentCreateDTO::fromRequest($request);
+            $result = $this->payment_service->createPayment($dto);
+            return $this->successResponse($result);
+        } catch (\Exception $exception) {
+            throw $exception;
+        }
+    }
+}

backend/app/User/Controllers/ProfileController.php

@@ -2,14 +2,19 @@
 
 namespace App\User\Controllers;
 
+use App\Facades\File\FileFacade;
 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;
 use App\User\Resources\UserResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Hash;
+use Throwable;
 
 class ProfileController extends Controller
 {
@@ -20,21 +25,40 @@ class ProfileController extends Controller
         return $this->successResponse(new UserResource(Auth::user()));
     }
 
+    /**
+     * @throws Throwable
+     */
     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,
-            '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
-        ]);
+        DB::transaction(function () use ($user, $province, $city, $request) {
+            if ($user->kyc_status == 0)
+            {
+                $user->documents()->create([
+                    'title' => 'id_card',
+                    'url' => FileFacade::save($request->file('id_card'), "{$user->id}/"),
+                ]);
+            }
+
+            $user->update([
+                'first_name' => $request->first_name,
+                'last_name' => $request->last_name,
+                'national_id' => $user->kyc_status == 0 ? $request->national_id : $user->national_id,
+                'address' => $request->address,
+                'postal_code' => $request->postal_code,
+                'phone_number' => $request->phone_number,
+                'province_id' => $province->id,
+                'province_name' => $province->name,
+                '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/Controllers/ProvinceController.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\User\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Models\Province;
+use App\Traits\ApiResponse;
+use Illuminate\Http\JsonResponse;
+
+class ProvinceController extends Controller
+{
+    use ApiResponse;
+    public function list(): JsonResponse
+    {
+        return $this->successResponse(Province::all(['id', 'name']));
+    }
+}

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

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\User\Requests\Documentation;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+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 [
+            'documents' => 'required|array',
+            'documents.*.file' => 'required|file|mimes:pdf,jpg,jpeg,png|max:2048',
+            'documents.*.title' => 'required|string',
+        ];
+    }
+}

backend/app/User/Requests/Documentation/UploadRequest.php

@@ -0,0 +1,31 @@
+<?php
+
+namespace App\User\Requests\Documentation;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+
+class UploadRequest 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 [
+            'documents' => 'required|array',
+            'documents.*.file' => 'required|file|mimes:pdf,jpg,jpeg,png|max:2048',
+            'documents.*.title' => 'required|string',
+        ];
+    }
+}