stage

Reviewed-on: #31

backend/app/Enums/PaymentStatusEnum.php

@@ -2,7 +2,7 @@
 
 namespace App\Enums;
 
-enum PaymentStatusEnum:int
+enum PaymentStatusEnum: int
 {
     case Unpaid = 0;
     case Cancelled = 1;
@@ -10,6 +10,8 @@ enum PaymentStatusEnum:int
     case Paid = 3;
     case Refunded = 4;
 
+    case PendingVerification = 5;
+
     public function label(): string
     {
         return match ($this) {
@@ -18,6 +20,7 @@ enum PaymentStatusEnum:int
             self::Expired => 'expired',
             self::Paid => 'paid',
             self::Refunded => 'refunded',
+            self::PendingVerification => 'pending_verification',
         };
     }
 }

backend/app/Models/User.php

@@ -24,7 +24,7 @@ class User extends Authenticatable
 
     public function documents(): MorphToMany
     {
-        return $this->morphToMany(Document::class, 'documentable');
+        return $this->morphToMany(Document::class, 'documents');
     }
 
     public function validateForPassportPasswordGrant(string $password): bool

backend/app/Services/FIB/CancelPaymentService.php

@@ -11,21 +11,13 @@ class CancelPaymentService
 {
     protected string $url;
     protected string $channelName;
-    protected string $accessToken;
-    protected array $headers;
+    protected AuthorizationService $authorizationService;
 
-    public function __construct()
+    public function __construct(AuthorizationService $authorizationService)
     {
         $this->url = config('fib.cancelPayment.url');
         $this->channelName = '';
-    }
-
-    public function setHeaders(): void
-    {
-        $this->headers = [
-            'Authorization' => 'Bearer ' . $this->accessToken,
-            'Content-Type' => 'application/json',
-        ];
+        $this->authorizationService = $authorizationService;
     }
 
     /**
@@ -50,13 +42,26 @@ class CancelPaymentService
 
     /**
      * @throws ConnectionException
+     * @throws Exception
      */
     public function sendRequest(): array
     {
-        return Http::withHeaders($this->headers)
+        return Http::withHeaders([
+            'Authorization' => 'Bearer ' . $this->getToken(),
+            'Content-Type' => 'application/json',
+            ])
             ->throw()
             ->withoutVerifying()
             ->post($this->url)
             ->json();
     }
+
+    /**
+     * @throws Exception
+     */
+    public function getToken(): string
+    {
+        $data =  $this->authorizationService->run();
+        return $data['access_token'];
+    }
 }

backend/app/Services/FIB/CheckPaymentStatusService.php

@@ -11,11 +11,13 @@ class CheckPaymentStatusService
 {
     protected string $url;
     protected string $channelName;
+    protected AuthorizationService $authorizationService;
 
-    public function __construct()
+    public function __construct(AuthorizationService $authorizationService)
     {
         $this->url = config('fib.checkPaymentStatus.url');
-        $this->channelName = '';
+        $this->channelName = 'fib_status';
+        $this->authorizationService = $authorizationService;
     }
 
     /**
@@ -40,12 +42,26 @@ class CheckPaymentStatusService
 
     /**
      * @throws ConnectionException
+     * @throws Exception
      */
     public function sendRequest(): array
     {
-        return Http::throw()
+        return Http::withHeaders([
+            'Authorization' => 'Bearer ' . $this->getToken(),
+            'Content-Type' => 'application/json',
+            ])
+            ->throw()
             ->withoutVerifying()
             ->post($this->url)
             ->json();
     }
+
+    /**
+     * @throws Exception
+     */
+    public function getToken(): string
+    {
+        $data =  $this->authorizationService->run();
+        return $data['access_token'];
+    }
 }

backend/app/Services/FIB/CreatePaymentService.php

@@ -11,27 +11,14 @@ class CreatePaymentService
 {
     protected string $url;
     protected string $channelName;
-    protected string $accessToken;
-    protected array $headers;
     protected array $inputParameters;
+    protected AuthorizationService $authorizationService;
 
-    public function __construct()
+    public function __construct(AuthorizationService $authorizationService)
     {
         $this->url = config('fib.createPayment.url');
-        $this->channelName = '';
-    }
-
-    public function setAccessToken(string $accessToken): void
-    {
-        $this->accessToken = $accessToken;
-    }
-
-    public function setHeaders(): void
-    {
-        $this->headers = [
-            'Authorization' => 'Bearer ' . $this->accessToken,
-            'Content-Type' => 'application/json',
-        ];
+        $this->channelName = 'fib_create_payment';
+        $this->authorizationService = $authorizationService;
     }
 
     public function setInputParameters(array $inputParameters): void
@@ -61,13 +48,26 @@ class CreatePaymentService
 
     /**
      * @throws ConnectionException
+     * @throws Exception
      */
     public function sendRequest(): array
     {
-        return Http::withHeaders($this->headers)
+        return Http::withHeaders([
+            'Authorization' => 'Bearer ' . $this->getToken(),
+            'Content-Type' => 'application/json',
+            ])
             ->throw()
             ->withoutVerifying()
             ->post($this->url, $this->inputParameters)
             ->json();
     }
+
+    /**
+     * @throws Exception
+     */
+    public function getToken(): string
+    {
+        $data =  $this->authorizationService->run();
+        return $data['access_token'];
+    }
 }

backend/app/Services/FIB/DTO/FIBPaymentCreateDTO.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Services\Payments\DTO;
+namespace App\Services\FIB\DTO;
 
 class FIBPaymentCreateDTO
 {
@@ -26,13 +26,13 @@ class FIBPaymentCreateDTO
     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,
+            'paymentId' => $data['paymentId'],
+            'readableCode' => $data['readableCode'],
+            'qrCode' => $data['qrCode'],
+            'validUntil' => $data['validUntil'],
+            'personalAppLink' => $data['personalAppLink'],
+            'businessAppLink' => $data['businessAppLink'],
+            'corporateAppLink' => $data['corporateAppLink'],
         ]);
     }
 }

backend/app/Services/FIB/FIBClient.php

@@ -1,86 +0,0 @@
-<?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

@@ -11,21 +11,13 @@ class RefundService
 {
     protected string $url;
     protected string $channelName;
-    protected string $accessToken;
-    protected array $headers;
+    protected AuthorizationService $authorizationService;
 
-    public function __construct()
+    public function __construct(AuthorizationService $authorizationService)
     {
         $this->url = config('fib.refund.url');
-        $this->channelName = '';
-    }
-
-    public function setHeaders(): void
-    {
-        $this->headers = [
-            'Authorization' => 'Bearer ' . $this->accessToken,
-            'Content-Type' => 'application/json',
-        ];
+        $this->channelName = 'fib_refund';
+        $this->authorizationService = $authorizationService;
     }
 
     /**
@@ -50,13 +42,26 @@ class RefundService
 
     /**
      * @throws ConnectionException
+     * @throws Exception
      */
     public function sendRequest(): array
     {
-        return Http::withHeaders($this->headers)
+        return Http::withHeaders([
+            'Authorization' => 'Bearer ' . $this->getToken(),
+            'Content-Type' => 'application/json',
+            ])
             ->throw()
             ->withoutVerifying()
             ->post($this->url)
             ->json();
     }
+
+    /**
+     * @throws Exception
+     */
+    public function getToken(): string
+    {
+        $data =  $this->authorizationService->run();
+        return $data['access_token'];
+    }
 }

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

@@ -9,7 +9,6 @@ class PaymentCreateDTO
 
     public string $username;
     public int $user_id;
-    public string $track_id;
     public string $amount;
     public string $currency;
     public string $callback_url;
@@ -21,7 +20,6 @@ class PaymentCreateDTO
     {
         $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'];
@@ -35,7 +33,6 @@ class 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,

backend/app/Services/Payments/PaymentService.php

@@ -6,36 +6,66 @@ 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\Models\UserGateway;
+use App\Services\FIB\CheckPaymentStatusService;
+use App\Services\FIB\CreatePaymentService;
+use App\Services\FIB\DTO\FIBPaymentCreateDTO;
 use App\Services\Payments\DTO\PaymentCreateDTO;
+use Exception;
+use Illuminate\Support\Facades\DB;
+use Throwable;
 
 class PaymentService
 {
-    public $fib_client;
+    protected CreatePaymentService $create_payment_service;
+    protected CheckPaymentStatusService $check_payment_status_service;
 
-    public function __construct()
+
+    public function __construct(
+        CreatePaymentService      $create_payment_service,
+        CheckPaymentStatusService $check_payment_status_service
+    )
     {
-        $this->fib_client = new FibClient();
+        $this->create_payment_service = $create_payment_service;
+        $this->check_payment_status_service = $check_payment_status_service;
     }
 
+    /**
+     * @throws Exception
+     * @throws Throwable
+     */
     public function createPayment(PaymentCreateDTO $dto)
     {
-        try {
+        $gateway = UserGateway::query()
+            ->where('id', $dto->user_gateway_id)
+            ->where('user_id', $dto->user_id)
+            ->firstOrFail();
+
+        return DB::transaction(function () use ($dto, $gateway) {
+
             $payment = Payment::query()->create([
                 'user_id' => $dto->user_id,
                 'username' => $dto->username,
-                'track_id' => $dto->track_id,
+                'track_id' => $this->generateTrackId(),
                 'amount' => $dto->amount,
                 'currency' => $dto->currency,
-                'callback_url' => $dto->callback_url,
+                'callback_url' => 'https://user_callback',
                 'status_id' => PaymentStatusEnum::Unpaid->value,
                 'status_name' => PaymentStatusEnum::Unpaid->name,
                 'ip' => $dto->ip,
-                'user_gateway_id' => $dto->user_gateway_id,
+                'user_gateway_id' => $gateway->id,
             ]);
 
-            $response = $this->fib_client->createPaymentService();
+            $this->create_payment_service->setInputParameters([
+                'monetaryValue' => [
+                    'amount' => $dto->amount,
+                    'currency' => $dto->currency,
+                ],
+                'statusCallbackUrl' => 'https://ipay/api/fib_callback',
+                'description' => $dto->description ?? "Payment #{$payment->track_id}",
+            ]);
+
+            $response = $this->create_payment_service->run();
             $fib_response_dto = FIBPaymentCreateDTO::fromResponse($response);
 
             $transaction = Transaction::query()->create([
@@ -43,15 +73,15 @@ class PaymentService
                 'amount' => $payment->amount,
                 'currency' => $payment->currency,
                 'callback_url' => $payment->callback_url,
-//                'description' => '',
-//                'expires_in' => '',
+                //                'description' => '',
+                //                'expires_in' => '',
                 'payment_id' => $payment->id,
                 'payment_track_id' => $payment->track_id,
                 'user_gateway_id' => $payment->user_gateway_id,
-//                'status' => '',
+                //                'status' => '',
             ]);
 
-            $fib_transactions = FibTransaction::query()->create([
+            FibTransaction::query()->create([
                 'transaction_id' => $transaction->id,
                 'qrcode' => $fib_response_dto->qrCode,
                 'readable_code' => $fib_response_dto->readableCode,
@@ -64,9 +94,83 @@ class PaymentService
                 'status_id' => PaymentStatusEnum::Unpaid->value,
                 'status_name' => PaymentStatusEnum::Unpaid->name,
             ]);
-            return $payment;
-        } catch (\Exception $exception) {
-            throw new \Exception($exception->getMessage());
-        }
+
+            return [
+                'payment_id' => $payment->id,
+                'track_id' => $payment->track_id,
+                'qr_code' => $fib_response_dto->qrCode,
+                'readable_code' => $fib_response_dto->readableCode,
+                'personal_app_link' => $fib_response_dto->personalAppLink,
+                'business_app_link' => $fib_response_dto->businessAppLink,
+                'corporate_app_link' => $fib_response_dto->corporateAppLink,
+                'valid_until' => $fib_response_dto->validUntil,
+                'status' => PaymentStatusEnum::Unpaid->name,
+            ];
+        });
+    }
+
+    private function generateTrackId(): string
+    {
+        do {
+            $id = uuid_create();
+        } while (Payment::query()->where('track_id', $id)->exists());
+
+        return $id;
+    }
+
+    public function checkPaymentStatus($track_id)
+    {
+        $user_id = auth()->id();
+        return Payment::query()->where('track_id', $track_id)
+            ->where('user_id', 2)
+            ->firstOrFail();
+    }
+
+    public function verifyPayment($track_id)
+    {
+        $user_id = auth()->id();
+        return DB::transaction(function () use ($track_id, $user_id) {
+
+            $payment = Payment::query()
+                ->where('track_id', $track_id)
+                ->where('user_id', $user_id)
+                ->lockForUpdate()
+                ->firstOrFail();
+
+            if ($payment->status_id === PaymentStatusEnum::Paid->value) {
+                return [
+                    'status' => 'already_verified',
+                    'paid' => true,
+                ];
+            }
+
+            if ($payment->status_id !== PaymentStatusEnum::PendingVerification->value) {
+                return [
+                    'status' => $payment->status_name,
+                    'paid' => false,
+                ];
+            }
+
+            $payment->update([
+                'status_id' => PaymentStatusEnum::Paid->value,
+                'status_name' => PaymentStatusEnum::Paid->name,
+            ]);
+
+            Transaction::query()
+                ->where('payment_id', $payment->id)
+                ->update([
+                    'status_id' => PaymentStatusEnum::Paid->value,
+                    'status_name' => PaymentStatusEnum::Paid->name,
+                ]);
+
+            return [
+                'status' => 'verified',
+                'paid' => true,
+                'track_id' => $payment->track_id,
+                'amount' => $payment->amount,
+                'currency' => $payment->currency,
+            ];
+        });
+
     }
 }

backend/app/User/Controllers/GatewayManagementController.php

@@ -24,7 +24,7 @@ class GatewayManagementController extends Controller
     public function index(Request $request)
     {
         return DataTableFacade::run(
-            UserGateway::query()->where('user_id', '=', Auth::guard('web')->id()),
+            UserGateway::query()->where('user_id', '=', Auth::guard('web')->user()->id),
             $request,
             allowedFilters: ['*'],
             allowedSortings: ['*'],

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

@@ -6,9 +6,12 @@ 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\InquiryRequest;
 use App\User\Requests\Payment\FIB\StoreRequest;
+use App\User\Resources\Payment\InquiryResource;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
+use Illuminate\Support\Js;
 
 
 class PaymentController extends Controller
@@ -32,4 +35,20 @@ class PaymentController extends Controller
             throw $exception;
         }
     }
+
+    public function checkPaymentStatus(InquiryRequest $request): JsonResponse
+    {
+        try {
+            $result = $this->payment_service->checkPaymentStatus($request->track_id);
+            return $this->successResponse(new InquiryResource($result));
+        } catch (\Exception $exception) {
+            throw $exception;
+        }
+    }
+
+    public function verify()
+    {
+
+    }
+
 }

backend/app/User/Requests/Payment/FIB/InquiryRequest.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\User\Requests\Payment\FIB;
+
+use Illuminate\Contracts\Validation\ValidationRule;
+use Illuminate\Foundation\Http\FormRequest;
+use Illuminate\Support\Facades\Auth;
+
+class InquiryRequest 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 [
+            'track_id' => ['required', 'uuid'],
+        ];
+    }
+}

backend/app/User/Requests/Payment/FIB/StoreRequest.php

@@ -25,12 +25,12 @@ class StoreRequest extends FormRequest
     public function rules(): array
     {
         return [
-            'username' => ['required'],
-            'track_id' => ['required'],
+            'username' => ['required', 'string'],
             'amount' => ['required'],
-            'currency' => ['required'],
+            'currency' => ['required', 'string'],
             'callback_url' => ['required'],
-            'user_gateway_id' => ['required'],
+            'user_gateway_id' => ['required', 'integer', 'exists:user_gateways,id'],
+            'description' => ['nullable', 'string', 'max:500'],
         ];
     }
 }

backend/app/User/Resources/Payment/InquiryResource.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\User\Resources\Payment;
+
+use Illuminate\Http\Request;
+use Illuminate\Http\Resources\Json\JsonResource;
+
+class InquiryResource extends JsonResource
+{
+    /**
+     * Transform the resource into an array.
+     *
+     * @return array<string, mixed>
+     */
+    public function toArray(Request $request): array
+    {
+        return [
+            "track_id" => $this->track_id,
+            "amount" => $this->amount,
+            "currency" => $this->currency,
+            "status_id" => $this->status_id,
+            "status_name" => $this->status_name,
+            'payment_method' => $this->payment_method,
+            'paid_currency' => $this->paid_currency,
+            'paid_amount' => $this->paid_amount,
+            'paid_at' => $this->paid_at,
+            'verified_at' => $this->verified_at,
+        ];
+    }
+}

backend/config/logging.php

@@ -133,6 +133,24 @@ return [
             'level' => 'error',
         ],
 
+        'fib_create_payment' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/fib/createPayment.log'),
+            'level' => 'error',
+        ],
+
+        'fib_status' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/fib/status.log'),
+            'level' => 'error',
+        ],
+
+        'fib_refund' => [
+            'driver' => 'single',
+            'path' => storage_path('logs/fib/refund.log'),
+            'level' => 'error',
+        ],
+
     ],
 
 ];

backend/database/migrations/2026_06_05_142646_add_columns_to_payments_table.php

@@ -0,0 +1,34 @@
+<?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('payments', function (Blueprint $table) {
+            $table->string('payment_method')->nullable();
+            $table->string('paid_currency')->nullable();
+            $table->string('paid_amount')->nullable();
+            $table->timestamp('paid_at')->nullable();
+            $table->timestamp('verified_at')->nullable();
+            $table->timestamp('refunded_at')->nullable();
+            $table->string('refund_reason')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('payments', function (Blueprint $table) {
+            $table->dropColumn(['payment_method', 'paid_currency', 'paid_amount',
+                'paid_at', 'verified_at', 'refunded_at', 'refund_reason',]);
+        });
+    }
+};

backend/routes/api.php

@@ -14,6 +14,8 @@ Route::prefix('v1')->group(function () {
 //        ->middleware('auth:api')
         ->group(function () {
             Route::post('/create_payment', [PaymentController::class, 'createPayment'])->name('create_payment');
+            Route::post('/inquiry', [PaymentController::class, 'checkPaymentStatus'])->name('inquiry');
+            Route::post('/verify', [PaymentController::class, 'checkPaymentStatus'])->name('inquiry');
         });
 
 });