Added api logic with transactions when match is finished, started and joined

Reviewed-on: https://gitea.fernandovideira.com/SyntaxSquad/DADProject/pulls/87
Reviewed-by: Edd <[email protected]>
Reviewed-by: FernandoJVideira <[email protected]>

api/app/Http/Controllers/CoinPurchaseController.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\Http\Controllers\Controller;
+use App\Models\CoinPurchase;
+use App\Models\CoinTransaction;
+use App\Models\CoinTransactionType;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+
+class CoinPurchaseController extends Controller
+{
+    public function store(Request $request)
+    {
+        $validated = $request->validate([
+            'euros' => 'required|numeric|min:1|max:100',
+            'payment_type' => 'required|in:MBWAY,IBAN,MB,VISA,PAYPAL',
+            'payment_reference' => [
+                'required',
+                function ($attribute, $value, $fail) use ($request) {
+                    $type = $request->payment_type;
+                    $regex = null;
+
+                    switch ($type) {
+                        case 'MBWAY': $regex = '/^9[0-9]{8}$/'; break;
+                        case 'IBAN':  $regex = '/^[A-Z]{2}[0-9]{23}$/'; break;
+                        case 'MB':    $regex = '/^[0-9]{5}-[0-9]{9}$/'; break;
+                        case 'VISA':  $regex = '/^4[0-9]{15}$/'; break;
+                        case 'PAYPAL':
+                            if (!filter_var($value, FILTER_VALIDATE_EMAIL)) {
+                                $fail("Invalid PayPal email.");
+                            }
+                            return;
+                    }
+
+                    if ($regex && !preg_match($regex, $value)) {
+                        $fail("Invalid format for $type.");
+                    }
+                },
+            ],
+        ]);
+
+        $user = $request->user();
+        $coinsAmount = $validated['euros'] * 10; 
+
+        return DB::transaction(function () use ($user, $validated, $coinsAmount) {
+            
+            $type = CoinTransactionType::firstOrCreate(['name' => 'Coin purchase'], ['type' => 'C']);
+
+            $transaction = CoinTransaction::create([
+                'user_id' => $user->id,
+                'coin_transaction_type_id' => $type->id,
+                'transaction_datetime' => now(),
+                'coins' => $coinsAmount,
+            ]);
+
+            $purchase = CoinPurchase::create([
+                'purchase_datetime' => now(),
+                'user_id' => $user->id,
+                'coin_transaction_id' => $transaction->id,
+                'euros' => $validated['euros'],
+                'payment_type' => $validated['payment_type'],
+                'payment_reference' => $validated['payment_reference'],
+            ]);
+
+            $user->increment('coins_balance', $coinsAmount);
+
+            return response()->json([
+                'message' => 'Purchase successful',
+                'balance' => $user->coins_balance,
+                'transaction_id' => $transaction->id,
+                'purchase' => $purchase,
+            ], 201);
+        });
+    }
+}

api/app/Http/Controllers/GameController.php

@@ -4,9 +4,7 @@ namespace App\Http\Controllers;
 
 use App\Models\Game;
 use Illuminate\Http\Request;
-use App\Http\Requests\StoreGameRequest;
 use Illuminate\Support\Facades\Auth;
-use App\Models\MatchGame;
 
 class GameController extends Controller
 {

api/app/Http/Controllers/MatchController.php

@@ -4,12 +4,15 @@ namespace App\Http\Controllers;
 
 use App\Models\MatchGame;
 use App\Models\Game;
+use App\Models\CoinTransaction;
+use App\Models\CoinTransactionType;
 use Illuminate\Http\Request;
 use App\Http\Requests\StoreMatchRequest;
 use Illuminate\Support\Facades\Auth;
+use Illuminate\Support\Facades\DB;
 
 class MatchController extends Controller
-{
+{    
     public function index(Request $request)
     {
         $query = MatchGame::query()->with(['winner', 'player1', 'player2']);
@@ -28,44 +31,61 @@ class MatchController extends Controller
     }
 
     public function store(StoreMatchRequest $request)
-    {
+    {        
         $validated = $request->validated();
-        $user = Auth::user();
+        $user = $request->user(); 
+        $stake = $validated['stake'];
+
+        if ($user->coins_balance < $stake) {
+            return response()->json(['message' => 'Insufficient coin balance'], 400);
+        }
 
         $activeMatch = MatchGame::where(function ($q) use ($user) {
             $q->where('player1_user_id', $user->id)
               ->orWhere('player2_user_id', $user->id);
         })->whereIn('status', ['Pending', 'Playing'])->exists();
 
-        $activeGame = Game::where(function ($q) use ($user) {
-            $q->where('player1_user_id', $user->id)
-              ->orWhere('player2_user_id', $user->id);
-        })->whereIn('status', ['Pending', 'Playing'])->exists();
-
-        if ($activeMatch || $activeGame) {
-            return response()->json(['message' => 'You already have an active game or match.'], 400);
+        if ($activeMatch) { 
+            return response()->json(['message' => 'You already have an active match.'], 400);
         }
 
-        $match = MatchGame::create([
-            'type' => $validated['type'],
-            'status' => 'Pending',
-            'player1_user_id' => $user->id,
-            'player2_user_id' => $user->id,
-            'winner_user_id' => $user->id,
-            'loser_user_id' => $user->id,
-            'stake' => $validated['stake'],
-            'began_at' => now(),
-            'player1_marks' => 0,
-            'player2_marks' => 0,
-            'player1_points' => 0,
-            'player2_points' => 0,
-            'custom' => null
-        ]);
+        return DB::transaction(function () use ($validated, $user, $stake) {
+            $GHOST_ID = 1;
 
-        return response()->json([
-            'message' => 'Match created successfully',
-            'match' => $match
-        ], 201);
+            $user->decrement('coins_balance', $stake);
+
+            $stakeType = CoinTransactionType::firstOrCreate(
+                ['name' => 'Match stake'],
+                ['type' => 'D'] // Debit
+            );
+
+            $match = MatchGame::create([
+                'type' => $validated['type'],
+                'status' => 'Pending',
+                'player1_user_id' => $user->id,
+                'player2_user_id' => $GHOST_ID, 
+                'winner_user_id' => $GHOST_ID,
+                'loser_user_id' => $GHOST_ID,
+                'stake' => $stake,
+                'began_at' => now(),
+                'player1_marks' => 0, 'player2_marks' => 0,
+                'player1_points' => 0, 'player2_points' => 0,
+            ]);
+
+            CoinTransaction::create([
+                'user_id' => $user->id,
+                'match_id' => $match->id,
+                'coin_transaction_type_id' => $stakeType->id,
+                'transaction_datetime' => now(),
+                'coins' => -$stake,
+            ]);
+
+            return response()->json([
+                'message' => 'Match created successfully',
+                'match' => $match,
+                'balance' => $user->coins_balance
+            ], 201);
+        });
     }
 
     public function show(MatchGame $match)
@@ -76,16 +96,19 @@ class MatchController extends Controller
 
     public function join(MatchGame $match)
     {
-        $user = Auth::user();
+        $user = request()->user();
 
         if ($match->player1_user_id == $user->id) {
-            return response()->json(['message' => 'Waiting for opponent...', 'match' => $match]);
+            return response()->json(['message' => 'You cannot join your own match'], 400);
         }
-
         if ($match->status !== 'Pending') {
             return response()->json(['message' => 'Match is full or started'], 400);
         }
 
+        if ($user->coins_balance < $match->stake) {
+            return response()->json(['message' => 'Insufficient coin balance to join this match'], 400);
+        }
+
         $activeMatch = MatchGame::where(function ($q) use ($user) {
             $q->where('player1_user_id', $user->id)
               ->orWhere('player2_user_id', $user->id);
@@ -95,15 +118,33 @@ class MatchController extends Controller
              return response()->json(['message' => 'You are already in another active match.'], 400);
         }
 
-        $match->update([
-            'status' => 'Playing',
-            'player2_user_id' => $user->id
-        ]);
+        return DB::transaction(function () use ($match, $user) {
+            $user->decrement('coins_balance', $match->stake);
 
-        return response()->json([
-            'message' => 'Joined match successfully!',
-            'match' => $match
-        ]);
+            $stakeType = CoinTransactionType::firstOrCreate(
+                ['name' => 'Match stake'],
+                ['type' => 'D']
+            );
+
+            CoinTransaction::create([
+                'user_id' => $user->id,
+                'match_id' => $match->id,
+                'coin_transaction_type_id' => $stakeType->id,
+                'transaction_datetime' => now(),
+                'coins' => -$match->stake, 
+            ]);
+
+            $match->update([
+                'status' => 'Playing',
+                'player2_user_id' => $user->id
+            ]);
+
+            return response()->json([
+                'message' => 'Joined match successfully!',
+                'match' => $match,
+                'balance' => $user->coins_balance
+            ]);
+        });
     }
 
     public function update(Request $request, MatchGame $match)
@@ -123,12 +164,36 @@ class MatchController extends Controller
             'total_time' => 'numeric'
         ]);
 
-        if (isset($data['status']) && $data['status'] === 'Ended') {
-            $data['ended_at'] = now();
-        }
+        return DB::transaction(function () use ($match, $data) {
+            
+            if (isset($data['status']) && $data['status'] === 'Ended') {
+                $data['ended_at'] = now();
+            }
 
-        $match->update($data);
+            $match->update($data);
 
-        return response()->json($match);
+            if ($match->status === 'Ended' && $match->stake > 0 && $match->winner_user_id) {
+                
+                $payoutType = CoinTransactionType::firstOrCreate(
+                    ['name' => 'Match payout'],
+                    ['type' => 'C'] // Credit
+                );
+
+                $totalPrize = $match->stake * 2;
+
+                CoinTransaction::create([
+                    'user_id' => $match->winner_user_id,
+                    'match_id' => $match->id,
+                    'coin_transaction_type_id' => $payoutType->id,
+                    'transaction_datetime' => now(),
+                    'coins' => $totalPrize,
+                ]);
+
+
+                $match->winner->increment('coins_balance', $totalPrize);
+            }
+
+            return response()->json($match);
+        });
     }
 }

api/app/Http/Controllers/UserController.php

@@ -183,16 +183,65 @@ class UserController extends Controller
     {
         $this->authorize('view', $user);
 
-        $matches = Game::query()
-            ->where(function ($q) use ($user) {
-                $q->where('player1_user_id', $user->id)->orWhere(
-                    'player2_user_id',
-                    $user->id,
-                );
-            })
-            ->with(['winner', 'player1', 'player2'])
-            ->orderBy('began_at', 'desc')
-            ->paginate(10);
+        $outcomeSql = "CASE 
+            WHEN is_draw = 1 THEN 'DRAW'
+            WHEN winner_user_id = {$user->id} THEN 'WIN'
+            ELSE 'LOSS'
+        END";
+
+        $query = Game::query()
+        ->select('*')
+        ->selectRaw("($outcomeSql) as outcome_text")
+        ->where(function ($q) use ($user) {
+            $q->where('player1_user_id', $user->id)
+              ->orWhere('player2_user_id', $user->id);
+        })
+        ->with(['winner', 'player1', 'player2']);
+
+        if ($request->has('type')) {
+            $query->where('type', $request->type); 
+        }
+
+        if ($request->has('status')) {
+            $query->where('status', $request->status);
+        }
+
+        if ($request->filled('outcome')) {
+        switch ($request->outcome) {
+            case 'win':
+                $query->where('winner_user_id', $user->id)
+                      ->where('is_draw', 0);
+                break;
+            case 'loss':
+            case 'forfeit': // Forfeit treated as loss for now
+                $query->where('loser_user_id', $user->id)
+                      ->where('is_draw', 0);
+                break;
+            case 'draw':
+                $query->where('is_draw', 1);
+                break;
+        }
+    }
+
+        if ($request->has('date_from')) {
+            $query->whereDate('began_at', '>=', $request->date_from);
+        }
+
+        if ($request->has('date_to')) {
+            $query->whereDate('ended_at', '<=', $request->date_to);
+        }
+
+        $order = $request->get('sort_by', 'began_at');
+        $direction = $request->get('sort_direction', 'desc');
+
+        if ($order === 'outcome') {
+            $query->orderBy('outcome_text', $direction);
+        } else {
+            $query->orderBy($order, $direction);
+        }
+
+        $matches = $query->orderBy($order, $direction)
+                              ->paginate(10);
 
         return response()->json($matches);
     }
@@ -230,7 +279,7 @@ class UserController extends Controller
 
         if ($request->has('type')) {
             $query->whereHas('type', function ($q) use ($request) {
-                $q->where('name', $request->type);
+                $q->where('type', $request->type);
             });
         }
 

api/app/Models/CoinPurchase.php

@@ -0,0 +1,34 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Database\Eloquent\Model;
+
+class CoinPurchase extends Model
+{
+    use HasFactory;
+    
+    protected $table = 'coin_purchases';
+    public $timestamps = false;
+
+    protected $fillable = [
+        'purchase_datetime',
+        'user_id',
+        'coin_transaction_id',
+        'euros',
+        'payment_type',
+        'payment_reference',
+        'custom'
+    ];
+
+    protected $casts = [
+        'purchase_datetime' => 'datetime',
+        'custom' => 'array',
+    ];
+
+    public function transaction()
+    {
+        return $this->belongsTo(CoinTransaction::class, 'coin_transaction_id');
+    }
+}

api/routes/api.php

@@ -6,6 +6,7 @@ use App\Http\Controllers\MatchController;
 use App\Http\Controllers\ProfileController;
 use App\Http\Controllers\StatisticsController;
 use App\Http\Controllers\UserController;
+use App\Http\Controllers\CoinPurchaseController;
 use Illuminate\Support\Facades\Route;
 
 Route::prefix('v1')->group(function () {
@@ -19,6 +20,7 @@ Route::prefix('v1')->group(function () {
     // Authenticated Routes
     Route::middleware(['auth:sanctum', 'throttle:60,1'])->group(function () {
         Route::post('/logout', [AuthController::class, 'logout']);
+        Route::post('/coin-purchases', [CoinPurchaseController::class, 'store']);
         Route::get('/statistics/me', [StatisticsController::class, 'getPersonalStats']);
         Route::prefix('users/me')->group(function () {
             Route::get('/', [ProfileController::class, 'show']);

api/sample-requests.http

@@ -29,4 +29,10 @@ Authorization: Bearer {{token}}
 GET http://localhost:8000/api/v1/users/{{id}}/matches
 Content-Type: application/json
 Accept: application/json
+Authorization: Bearer {{token}}
+
+### Get me transactions
+GET http://localhost:8000/api/v1/users/{{id}}/transactions?type=C
+Content-Type: application/json
+Accept: application/json
 Authorization: Bearer {{token}}

frontend/src/pages/user/UserPage.vue

@@ -229,45 +229,44 @@
 
         <!-- Transaction History Tab -->
         <div v-if="activeTab === 'transaction-history'" class="p-8">
+
+          <div class="flex flex-wrap gap-4 mb-6 items-end">
+            <div class="flex flex-col gap-1">
+              <label class="text-xs font-medium text-muted-foreground">Type</label>
+              <select v-model="filters.type" @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none">
+                <option value="all">All Types</option>
+                <option value="credit">Credit (+)</option>
+                <option value="debit">Debit (-)</option>
+              </select>
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <label class="text-xs font-medium text-muted-foreground">From</label>
+              <input type="date" v-model="filters.startDate" :max="filters.endDate" @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none" />
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <label class="text-xs font-medium text-muted-foreground">To</label>
+              <input type="date" v-model="filters.endDate" :min="filters.startDate" @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none" />
+            </div>
+
+            <button @click="clearFilters" class="text-xs text-purple-500 hover:underline pb-2">
+              Clear Filters
+            </button>
+          </div>
+
           <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
             <div v-if="transactions.length === 0" class="p-6 text-center text-sm text-muted-foreground">
               No transactions yet.
             </div>
             <div v-else class="max-h-[450px] overflow-y-auto custom-scrollbar p-1">
 
-              <div class="flex flex-wrap gap-4 mb-6 items-end">
-                <div class="flex flex-col gap-1">
-                  <label class="text-xs font-medium text-muted-foreground">Type</label>
-                  <select v-model="filters.type" @change="resetAndFetch"
-                    class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none">
-                    <option value="all">All Types</option>
-                    <option value="credit">Credit (+)</option>
-                    <option value="debit">Debit (-)</option>
-                  </select>
-                </div>
-
-                <div class="flex flex-col gap-1">
-                  <label class="text-xs font-medium text-muted-foreground">From</label>
-                  <input type="date" v-model="filters.startDate" :max="filters.endDate" @change="handleStartDateChange"
-                    class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none" />
-                </div>
-
-                <div class="flex flex-col gap-1">
-                  <label class="text-xs font-medium text-muted-foreground">To</label>
-                  <input type="date" v-model="filters.endDate" :min="filters.startDate" @change="resetAndFetch"
-                    class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none" />
-                </div>
-
-                <button @click="clearFilters" class="text-xs text-purple-500 hover:underline pb-2">
-                  Clear Filters
-                </button>
-              </div>
-
               <div v-for="(transaction) in transactions" :key="transaction.id"
                 class="flex items-center justify-between p-4 mb-3 border rounded-lg transition-all hover:bg-muted/50 hover:border-purple-500"
-                :class="[
-                  transaction.type === 'credit' ? 'border-green-500/30' : 'border-red-500/30'
-                ]">
+                :class="[transaction.type === 'credit' ? 'border-green-500/30' : 'border-red-500/30']">
 
                 <div class="flex items-center gap-4">
                   <div class="flex h-10 w-10 shrink-0 items-center justify-center rounded-full text-xs font-bold"
@@ -277,12 +276,12 @@
                   </div>
 
                   <div class="flex flex-col">
-                    <div class="font-semibold text-sm capitalize">
-                      {{ transaction.type }} Payment
-                    </div>
+                    <div class="font-semibold text-sm">
+                      {{ transaction.category }} </div>
                     <div class="text-xs text-muted-foreground">
-                      {{ new Date(transaction.created_at).toLocaleDateString() }} • {{ new
-                        Date(transaction.created_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }) }}
+                      {{ new Date(transaction.began_at).toLocaleDateString() }} •
+                      {{ new Date(transaction.began_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' })
+                      }}
                     </div>
                   </div>
                 </div>
@@ -290,11 +289,10 @@
                 <div class="text-right">
                   <div class="font-bold text-sm"
                     :class="transaction.type === 'credit' ? 'text-green-600' : 'text-red-600'">
-                    {{ transaction.type === 'credit' ? '+' : '-' }}${{ transaction.amount.toLocaleString() }}
+                    {{ transaction.type === 'credit' ? '+' : '-' }}{{ transaction.amount }} coins
                   </div>
                   <div class="text-[10px] text-muted-foreground uppercase tracking-wider">
-                    {{ transaction.id.split('_')[0] }}
-                  </div>
+                    {{ transaction.reference }} </div>
                 </div>
               </div>
 
@@ -308,62 +306,72 @@
 
         <!-- Game History Tab -->
         <div v-if="activeTab === 'game-history'" class="p-8">
+          <div class="flex flex-wrap gap-4 mb-6 items-end">
+            <div class="flex flex-col gap-1">
+              <label class="text-xs font-medium text-muted-foreground">Variant</label>
+              <select v-model="filters.variant" @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm outline-none">
+                <option value="all">All Variants</option>
+                <option value="3">Bisca 3</option>
+                <option value="9">Bisca 9</option>
+              </select>
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <label class="text-xs font-medium text-muted-foreground">Outcome</label>
+              <select v-model="filters.outcome" @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm outline-none">
+                <option value="all">All Results</option>
+                <option value="win">Win</option>
+                <option value="loss">Loss</option>
+                <option value="draw">Draw</option>
+                <option value="forfeit">Forfeit</option>
+              </select>
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <label class="text-xs font-medium text-muted-foreground">From</label>
+              <input type="date" v-model="filters.startDate" :max="filters.endDate" @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none" />
+            </div>
+
+            <div class="flex flex-col gap-1">
+              <label class="text-xs font-medium text-muted-foreground">To</label>
+              <input type="date" v-model="filters.endDate" :min="filters.startDate" @change="resetAndFetch"
+                class="bg-background border rounded-md px-3 py-2 text-sm focus:ring-2 focus:ring-purple-500 outline-none" />
+            </div>
+
+            <button @click="clearFilters" class="text-xs text-purple-500 hover:underline pb-2">
+              Clear Filters
+            </button>
+
+            <div class="flex flex-row gap-4 ml-auto">
+              <div class="flex flex-col gap-1">
+                <label class="text-xs font-medium text-muted-foreground">Sort By</label>
+                <div class="flex gap-2">
+                  <select v-model="filters.sort.column" @change="resetAndFetch"
+                    class="bg-background border rounded-md px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-purple-500">
+                    <option value="began_at">Date</option>
+                    <option value="outcome">Outcome</option>
+                    <option value="total_time">Duration</option>
+                  </select>
+
+                  <button @click="handleSortChange(filters.sort.column)"
+                    class="bg-background border rounded-md px-4 py-2 text-sm outline-none transition-all hover:ring-2 hover:ring-purple-500 flex items-center justify-center min-w-[42px]"
+                    title="Toggle Order">
+                    <span v-if="filters.sort.order === 'desc'" class="leading-none">↓</span>
+                    <span v-else class="leading-none">↑</span>
+                  </button>
+                </div>
+              </div>
+            </div>
+
+          </div>
           <div class="rounded-lg border bg-card text-card-foreground shadow-sm">
             <div v-if="games.length === 0" class="p-6 text-center text-sm text-muted-foreground">
               No games played yet.
             </div>
             <div v-else class="max-h-[450px] overflow-y-auto custom-scrollbar p-1">
-
-              <div class="flex flex-wrap gap-4 mb-6 items-end">
-                <div class="flex flex-col gap-1">
-                  <label class="text-xs font-medium text-muted-foreground">Variant</label>
-                  <select v-model="filters.variant" @change="resetAndFetch"
-                    class="bg-background border rounded-md px-3 py-2 text-sm outline-none">
-                    <option value="all">All Variants</option>
-                    <option value="3">Bisca 3</option>
-                    <option value="9">Bisca 9</option>
-                  </select>
-                </div>
-
-                <div class="flex flex-col gap-1">
-                  <label class="text-xs font-medium text-muted-foreground">Outcome</label>
-                  <select v-model="filters.outcome" @change="resetAndFetch"
-                    class="bg-background border rounded-md px-3 py-2 text-sm outline-none">
-                    <option value="all">All Results</option>
-                    <option value="win">Win</option>
-                    <option value="loss">Loss</option>
-                    <option value="draw">Draw</option>
-                    <option value="forfeit">Forfeit</option>
-                  </select>
-                </div>
-
-                <button @click="clearFilters" class="text-xs text-purple-500 hover:underline pb-2">
-                  Clear Filters
-                </button>
-
-                <div class="flex flex-row gap-4 ml-auto">
-                  <div class="flex flex-col gap-1">
-                    <label class="text-xs font-medium text-muted-foreground">Sort By</label>
-                    <div class="flex gap-2">
-                      <select v-model="filters.sort.column" @change="resetAndFetch"
-                        class="bg-background border rounded-md px-3 py-2 text-sm outline-none focus:ring-2 focus:ring-purple-500">
-                        <option value="began_at">Date</option>
-                        <option value="outcome">Outcome</option>
-                        <option value="total_time">Duration</option>
-                      </select>
-
-                      <button @click="handleSortChange(filters.sort.column)"
-                        class="bg-background border rounded-md px-4 py-2 text-sm outline-none transition-all hover:ring-2 hover:ring-purple-500 flex items-center justify-center min-w-[42px]"
-                        title="Toggle Order">
-                        <span v-if="filters.sort.order === 'desc'" class="leading-none">↓</span>
-                        <span v-else class="leading-none">↑</span>
-                      </button>
-                    </div>
-                  </div>
-                </div>
-
-              </div>
-
               <div v-for="game in games" :key="game.id"
                 class="p-4 mb-3 border rounded-lg transition-all hover:bg-muted/50 hover:border-purple-500">
                 <div class="flex items-center justify-between">
@@ -383,13 +391,13 @@
                   <div class="text-right">
                     <div class="font-bold text-sm">{{ game.amount }} pts</div>
                     <div class="text-[10px] text-muted-foreground">
-                      {{ new Date(game.created_at).toLocaleTimeString() }}
+                      {{ new Date(game.began_at).toLocaleDateString() }} • {{ new
+                        Date(game.began_at).toLocaleTimeString([], { hour: '2-digit', minute: '2-digit' }) }}
                     </div>
                   </div>
                 </div>
 
                 <div class="mt-3 pt-3 border-t flex gap-4 text-[10px] uppercase font-medium text-muted-foreground">
-                  <span>Marks: {{ game.details.marks }}</span>
                   <span>Capotes: {{ game.details.capotes }}</span>
                   <span>Bandeiras: {{ game.details.bandeiras }}</span>
                 </div>
@@ -579,7 +587,6 @@ const error = ref(null)
 const activeTab = ref('info')
 const fileInput = ref(null)
 
-// Profile form
 const profileForm = reactive({
   name: '',
   nickname: ''
@@ -588,7 +595,6 @@ const updatingProfile = ref(false)
 const profileMessage = ref('')
 const profileMessageType = ref('')
 
-// Password form
 const passwordForm = reactive({
   current_password: '',
   new_password: '',
@@ -598,7 +604,6 @@ const updatingPassword = ref(false)
 const passwordMessage = ref('')
 const passwordMessageType = ref('')
 
-// Delete account
 const deleteConfirmEmail = ref('')
 const showDeleteConfirmation = ref(false)
 const deletingAccount = ref(false)
@@ -622,13 +627,12 @@ const filters = ref({
   startDate: '',
   endDate: '',
   sort: {
-    column: 'created_at',
+    column: 'began_at',
     order: 'desc'
   }
 });
 
 const handleSortChange = (column) => {
-  // If clicking same column, toggle order, else default to desc
   if (filters.value.sort.column === column) {
     filters.value.sort.order = filters.value.sort.order === 'asc' ? 'desc' : 'asc';
   } else {
@@ -660,18 +664,26 @@ const fetchData = async () => {
 
   try {
     let newData = [];
-    if (isTransaction) {
-      // const response = await apiStore.getTransactions(params);
-      // Logic: if response.data.length < limit, set hasMore.value = false
 
-      for (let i = 0; i < 15; i++) {
-        newData.push({
-          id: `txn_${Date.now()}_${i}`,
-          amount: Math.floor(Math.random() * 1000),
-          type: Math.random() > 0.5 ? 'credit' : 'debit',
-          created_at: new Date().toISOString()
-        });
-      }
+    if (isTransaction) {
+      const apiParams = {
+        page: state.page,
+        type: filters.value.type === 'credit' ? 'C' : filters.value.type === 'debit' ? 'D' : undefined,
+        date_from: filters.value.startDate || undefined,
+        date_to: filters.value.endDate || undefined,
+      };
+
+      const response = await apiStore.getCurrentUserTransactions(apiParams);
+      const apiTxns = response.data.data;
+
+      newData = apiTxns.map(txn => ({
+        id: txn.id.toString(),
+        type: txn.type.type === 'D' ? 'debit' : 'credit',
+        category: txn.type.name,
+        amount: Math.abs(txn.coins),
+        began_at: txn.transaction_datetime,
+        reference: txn.match_id ? `Match #${txn.match_id}` : txn.game_id ? `Game #${txn.game_id}` : 'N/A'
+      }));
 
       transactions.value.push(...newData);
     }
@@ -680,25 +692,24 @@ const fetchData = async () => {
       const apiParams = {
         page: state.page,
         type: filters.value.variant !== 'all' ? filters.value.variant : undefined,
-        status: filters.value.outcome !== 'all' ? 'Ended' : undefined,
+        outcome: filters.value.outcome !== 'all' ? filters.value.outcome : undefined,
+        status: 'Ended',
+        date_from: filters.value.startDate || undefined,
+        date_to: filters.value.endDate || undefined,
         sort_by: filters.value.sort.column,
-        sort_direction: filters.value.sort.order
+        sort_direction: filters.value.sort.order,
       };
 
       const response = await apiStore.getCurrentUserMatches(apiParams);
-      const apiGames = response.data.data
+      const apiGames = response.data.data;
 
       newData = apiGames.map(game => {
-        const isPlayer1 = game.player1_user_id === authStore.currentUserID;
+        const isPlayer1 = game.player1_user_id === authStore.currentUser.id;
         const opponent = isPlayer1 ? game.player2 : game.player1;
 
         let outcome = 'loss';
         if (game.is_draw) outcome = 'draw';
-        else if (game.winner_user_id === authStore.currentUserID) outcome = 'win';
-
-        const minutes = Math.floor(game.total_time / 60);
-        const seconds = game.total_time % 60;
-        const durationStr = `${minutes}m ${seconds}s`;
+        else if (game.winner_user_id === authStore.currentUser.id) outcome = 'win';
 
         return {
           id: game.id,
@@ -706,16 +717,14 @@ const fetchData = async () => {
           outcome: outcome,
           opponent: opponent?.nickname || 'Unknown Player',
           amount: isPlayer1 ? game.player1_points : game.player2_points,
-          duration: durationStr,
-          created_at: game.began_at,
+          duration: `${Math.floor(game.total_time / 60)}m ${game.total_time % 60}s`,
+          began_at: game.began_at,
           details: {
-            marks: game.custom?.marks || 0,
-            capotes: game.custom?.capotes || 0,
-            bandeiras: game.custom?.bandeiras || 0
+            capotes: 0,
+            bandeiras: 0
           }
         };
       });
-
       games.value.push(...newData);
     }
 
@@ -733,16 +742,23 @@ const setupObserver = () => {
 
   const scrollContainer = document.querySelector('.custom-scrollbar');
 
-  observer.value = new IntersectionObserver((entries) => {
-    if (entries[0].isIntersecting && !isLoading.value) {
+  observer.value = new IntersectionObserver(async (entries) => {
+    const isGame = activeTab.value === 'game-history';
+    const hasMore = isGame ? pagination.value.games.hasMore : pagination.value.transactions.hasMore;
+
+    if (entries[0].isIntersecting && !isLoading.value && hasMore) {
       fetchData();
     }
-  }, { root: scrollContainer, threshold: 0.1 });
+  }, {
+    root: scrollContainer,
+    threshold: 0.1,
+    rootMargin: '100px'
+  });
 
   if (observerTarget.value) observer.value.observe(observerTarget.value);
 };
 
-const resetAndFetch = () => {
+const resetAndFetch = async () => {
   if (activeTab.value === 'transaction-history') {
     transactions.value = [];
     pagination.value.transactions = { page: 1, hasMore: true };
@@ -753,7 +769,44 @@ const resetAndFetch = () => {
     pagination.value.games = { page: 1, hasMore: true };
   }
 
-  fetchData();
+  await nextTick();
+  await fetchData();
+  setupObserver();
+};
+
+const clearFilters = () => {
+  const isGameTab = activeTab.value === 'game-history';
+  const defaultSortColumn = isGameTab ? 'began_at' : 'transaction_datetime';
+
+  const isAlreadyDefault =
+    filters.value.startDate === '' &&
+    filters.value.endDate === '' &&
+    filters.value.sort.column === defaultSortColumn &&
+    filters.value.sort.order === 'desc' &&
+    (isGameTab
+      ? (filters.value.variant === 'all' && filters.value.outcome === 'all')
+      : (filters.value.type === 'all')
+    );
+
+  if (isAlreadyDefault) {
+    return;
+  }
+
+  if (isGameTab) {
+    filters.value.variant = 'all';
+    filters.value.outcome = 'all';
+  } else {
+    filters.value.type = 'all';
+  }
+
+  filters.value.startDate = '';
+  filters.value.endDate = '';
+  filters.value.sort = {
+    column: defaultSortColumn,
+    order: 'desc'
+  };
+
+  resetAndFetch();
 };
 
 const formatDate = (dateString) => {
@@ -895,13 +948,10 @@ const deleteAccount = async () => {
   try {
     await axios.delete(`${API_BASE_URL}/users/me`)
 
-    // Logout user
     await authStore.logout()
 
-    // Close modal
     showDeleteConfirmation.value = false
 
-    // Redirect to home/login
     router.push('/login')
   } catch (err) {
     deletingAccount.value = false

frontend/src/stores/api.js

@@ -80,22 +80,35 @@ export const useAPIStore = defineStore('api', () => {
     const queryParams = new URLSearchParams({
       page: params.page || 1,
       ...(params.type && { type: params.type }),
+      ...(params.outcome && { outcome: params.outcome }),
       ...(params.status && { status: params.status }),
-      sort_by: params.sort || 'began_at',
-      sort_direction: params.direction || 'desc',
+      ...(params.date_from && { date_from: params.date_from }),
+      ...(params.date_to && { date_to: params.date_to }),
+      sort_by: params.sort_by || 'began_at',
+      sort_direction: params.sort_direction || 'desc',
     }).toString()
 
-    console.log(params, queryParams)
-
     return axios.get(`${API_BASE_URL}/users/${authStore.currentUserID}/matches?${queryParams}`)
   }
 
+  const getCurrentUserTransactions = (params = {}) => {
+    const queryParams = new URLSearchParams({
+      page: params.page || 1,
+      ...(params.type && { type: params.type }),
+      ...(params.date_from && { date_from: params.date_from }),
+      ...(params.date_to && { date_to: params.date_to }),
+    }).toString()
+
+    return axios.get(`${API_BASE_URL}/users/${authStore.currentUserID}/transactions?${queryParams}`)
+  }
+
   return {
     postLogin,
     postLogout,
     getAuthUser,
     getGames,
     getCurrentUserMatches,
+    getCurrentUserTransactions,
     gameQueryParameters,
   }
 })