fix route for expert in profile

backend/app/Models/FibTransaction.php

@@ -9,6 +9,4 @@ class FibTransaction extends Model
 {
     /** @use HasFactory<\Database\Factories\FibTransactionFactory> */
     use HasFactory;
-
-    protected $guarded = ['id'];
 }

backend/app/Services/FIB/CancelPaymentService.php

@@ -11,13 +11,21 @@ class CancelPaymentService
 {
     protected string $url;
     protected string $channelName;
-    protected AuthorizationService $authorizationService;
+    protected string $accessToken;
+    protected array $headers;
 
-    public function __construct(AuthorizationService $authorizationService)
+    public function __construct()
     {
         $this->url = config('fib.cancelPayment.url');
         $this->channelName = '';
-        $this->authorizationService = $authorizationService;
+    }
+
+    public function setHeaders(): void
+    {
+        $this->headers = [
+            'Authorization' => 'Bearer ' . $this->accessToken,
+            'Content-Type' => 'application/json',
+        ];
     }
 
     /**
@@ -42,26 +50,13 @@ class CancelPaymentService
 
     /**
      * @throws ConnectionException
-     * @throws Exception
      */
     public function sendRequest(): array
     {
-        return Http::withHeaders([
+        return Http::withHeaders($this->headers)
-            '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,13 +11,11 @@ class CheckPaymentStatusService
 {
     protected string $url;
     protected string $channelName;
-    protected AuthorizationService $authorizationService;
 
-    public function __construct(AuthorizationService $authorizationService)
+    public function __construct()
     {
         $this->url = config('fib.checkPaymentStatus.url');
-        $this->channelName = 'fib_status';
+        $this->channelName = '';
-        $this->authorizationService = $authorizationService;
     }
 
     /**
@@ -42,26 +40,12 @@ class CheckPaymentStatusService
 
     /**
      * @throws ConnectionException
-     * @throws Exception
      */
     public function sendRequest(): array
     {
-        return Http::withHeaders([
+        return Http::throw()
-            '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,14 +11,27 @@ class CreatePaymentService
 {
     protected string $url;
     protected string $channelName;
+    protected string $accessToken;
+    protected array $headers;
     protected array $inputParameters;
-    protected AuthorizationService $authorizationService;
 
-    public function __construct(AuthorizationService $authorizationService)
+    public function __construct()
     {
         $this->url = config('fib.createPayment.url');
-        $this->channelName = 'fib_create_payment';
+        $this->channelName = '';
-        $this->authorizationService = $authorizationService;
+    }
+
+    public function setAccessToken(string $accessToken): void
+    {
+        $this->accessToken = $accessToken;
+    }
+
+    public function setHeaders(): void
+    {
+        $this->headers = [
+            'Authorization' => 'Bearer ' . $this->accessToken,
+            'Content-Type' => 'application/json',
+        ];
     }
 
     public function setInputParameters(array $inputParameters): void
@@ -48,26 +61,13 @@ class CreatePaymentService
 
     /**
      * @throws ConnectionException
-     * @throws Exception
      */
     public function sendRequest(): array
     {
-        return Http::withHeaders([
+        return Http::withHeaders($this->headers)
-            '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,38 +0,0 @@
-<?php
-
-namespace App\Services\FIB\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/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,13 +11,21 @@ class RefundService
 {
     protected string $url;
     protected string $channelName;
-    protected AuthorizationService $authorizationService;
+    protected string $accessToken;
+    protected array $headers;
 
-    public function __construct(AuthorizationService $authorizationService)
+    public function __construct()
     {
         $this->url = config('fib.refund.url');
-        $this->channelName = 'fib_refund';
+        $this->channelName = '';
-        $this->authorizationService = $authorizationService;
+    }
+
+    public function setHeaders(): void
+    {
+        $this->headers = [
+            'Authorization' => 'Bearer ' . $this->accessToken,
+            'Content-Type' => 'application/json',
+        ];
     }
 
     /**
@@ -42,26 +50,13 @@ class RefundService
 
     /**
      * @throws ConnectionException
-     * @throws Exception
      */
     public function sendRequest(): array
     {
-        return Http::withHeaders([
+        return Http::withHeaders($this->headers)
-            '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

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

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

@@ -1,79 +0,0 @@
-<?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\CreatePaymentService;
-use App\Services\FIB\DTO\FIBPaymentCreateDTO;
-use App\Services\Payments\DTO\PaymentCreateDTO;
-use Exception;
-use Illuminate\Support\Facades\DB;
-use Throwable;
-
-class PaymentService
-{
-    protected CreatePaymentService $create_payment_service;
-
-    public function __construct(CreatePaymentService $create_payment_service)
-    {
-        $this->create_payment_service = $create_payment_service;
-    }
-
-    /**
-     * @throws Exception
-     * @throws Throwable
-     */
-    public function createPayment(PaymentCreateDTO $dto)
-    {
-        return DB::transaction(function () use ($dto) {
-
-            $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->create_payment_service->run();
-            $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' => '',
-            ]);
-
-            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;
-        });
-    }
-}

backend/app/User/Controllers/GatewayManagementController.php

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

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

@@ -1,35 +0,0 @@
-<?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/Requests/Payment/FIB/StoreRequest.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace App\User\Requests\Payment\FIB;
-
-use Illuminate\Contracts\Validation\ValidationRule;
-use Illuminate\Foundation\Http\FormRequest;
-use Illuminate\Support\Facades\Auth;
-
-class StoreRequest extends FormRequest
-{
-    /**
-     * Determine if the user is authorized to make this request.
-     */
-    public function authorize(): bool
-    {
-        return true;
-        return Auth::guard('web')->user()->kyc_status;
-    }
-
-    /**
-     * Get the validation rules that apply to the request.
-     *
-     * @return array<string, ValidationRule|array|string>
-     */
-    public function rules(): array
-    {
-        return [
-            'username' => ['required'],
-            'track_id' => ['required'],
-            'amount' => ['required'],
-            'currency' => ['required'],
-            'callback_url' => ['required'],
-            'user_gateway_id' => ['required'],
-        ];
-    }
-}

backend/config/logging.php

@@ -133,24 +133,6 @@ 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_05_18_095610_create_transactions_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */
@@ -13,15 +14,15 @@ return new class extends Migration {
         Schema::create('transactions', function (Blueprint $table) {
             $table->id();
             $table->foreignId('user_id')->constrained('users');
-            $table->string('amount')->nullable();
+            $table->string('amount');
-            $table->string('currency')->nullable();
+            $table->string('currency');
-            $table->string('callback_url')->nullable();
+            $table->string('callback_url');
-            $table->string('description')->nullable();
+            $table->string('description');
-            $table->dateTime('expires_in')->nullable();
+            $table->dateTime('expires_in');
             $table->foreignId('payment_id')->constrained('payments');
-            $table->string('payment_track_id')->nullable();
+            $table->string('payment_track_id');
             $table->foreignId('user_gateway_id')->constrained('user_gateways');
-            $table->integer('status')->nullable();
+            $table->integer('status');
             $table->timestamps();
         });
     }

backend/database/migrations/2026_05_18_104524_create_fib_transactions_table.php

@@ -4,7 +4,8 @@ use Illuminate\Database\Migrations\Migration;
 use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Support\Facades\Schema;
 
-return new class extends Migration {
+return new class extends Migration
+{
     /**
      * Run the migrations.
      */
@@ -13,23 +14,23 @@ return new class extends Migration {
         Schema::create('fib_transactions', function (Blueprint $table) {
             $table->id();
             $table->foreignId('transaction_id')->constrained('transactions');
-            $table->text('qrcode')->nullable();
+            $table->text('qrcode');
-            $table->string('readable_code')->nullable();
+            $table->string('readable_code');
-            $table->string('personalAppLink')->nullable();
+            $table->string('personalAppLink');
-            $table->string('businessAppLink')->nullable();
+            $table->string('businessAppLink');
-            $table->string('corporateAppLink')->nullable();
+            $table->string('corporateAppLink');
-            $table->string('paymentId')->nullable();
+            $table->string('paymentId');
-            $table->string('paymentMethod')->nullable();
+            $table->string('paymentMethod');
-            $table->timestamp('validUntil')->nullable();
+            $table->timestamp('validUntil');
             $table->foreignId('status_id')->constrained('fib_transaction_statuses');
-            $table->string('status_name')->nullable();
+            $table->string('status_name');
-            $table->timestamp('paidAt')->nullable();
+            $table->timestamp('paidAt');
-            $table->string('paidAmount')->nullable();
+            $table->string('paidAmount');
-            $table->string('paidCurrency')->nullable();
+            $table->string('paidCurrency');
-            $table->string('decliningReason')->nullable();
+            $table->string('decliningReason');
-            $table->timestamp('declinedAt')->nullable();
+            $table->timestamp('declinedAt');
-            $table->string('paidByName')->nullable();
+            $table->string('paidByName');
-            $table->string('paidByIban')->nullable();
+            $table->string('paidByIban');
             $table->timestamps();
         });
     }

backend/database/seeders/FibTransactionStatusSeeder.php

@@ -4,7 +4,6 @@ namespace Database\Seeders;
 
 use Illuminate\Database\Console\Seeds\WithoutModelEvents;
 use Illuminate\Database\Seeder;
-use Illuminate\Support\Facades\DB;
 
 class FibTransactionStatusSeeder extends Seeder
 {
@@ -13,12 +12,6 @@ class FibTransactionStatusSeeder extends Seeder
      */
     public function run(): void
     {
-        DB::table('fib_transaction_statuses')->insert([
+        //
-            ['id' => 0,  'name' => 'unpaid', 'created_at' => now(), 'updated_at' => now(),],
-            ['id' => 1,  'name' => 'cancelled', 'created_at' => now(), 'updated_at' => now(),],
-            ['id' => 2,  'name' => 'expired', 'created_at' => now(), 'updated_at' => now(),],
-            ['id' => 3,  'name' => 'paid', 'created_at' => now(), 'updated_at' => now(),],
-            ['id' => 4,  'name' => 'refunded', 'created_at' => now(), 'updated_at' => now(),],
-        ]);
     }
 }

backend/routes/api.php

@@ -1,19 +1,8 @@
 <?php
 
-
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Route;
-use \App\User\Controllers\Payment\PaymentController;
 
 Route::get('/user', function (Request $request) {
     return $request->user();
 })->middleware('auth:api');
-
-Route::prefix('v1')->group(function () {
-    Route::prefix('payment')
-//        ->middleware('auth:api')
-        ->group(function () {
-            Route::post('/create_payment', [PaymentController::class, 'createPayment'])->name('create_payment');
-        });
-
-});

backend/routes/expert.php

@@ -77,7 +77,7 @@ Route::prefix('expert')
 
 Route::prefix('profile')
     ->name('profile.')
-    ->middleware('auth')
+    ->middleware('auth:expert')
     ->controller(ProfileController::class)
     ->group(function () {
         Route::get('info', 'info')->name('info');

docker-compose.yml

@@ -40,7 +40,9 @@ services:
       - payment
 
   backend:
-    image: payment-backend:latest
+    build:
+      context: ${BACKEND_PATH}
+      dockerfile: Dockerfile
     container_name: laravel
     tty: true
     restart: unless-stopped
@@ -52,8 +54,6 @@ services:
       - postgres
     networks:
       - payment
-    command: ["php", "artisan", "serve", "--host=0.0.0.0", "--port=9000"]
-    # Prints "Overridden command!"
 #    logging:
 #      driver: "syslog"
 #      options: