SyntaxSquad/DADProject
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 3 Releases Wiki Activity

removed comments

Browse Source
This commit is contained in:
KZix
2026-01-03 14:45:14 +00:00
parent b046a85806
commit f7328d59eb
29 changed files with 266 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/app/Http/Controllers/GameController.php
+2 -14
View File
@@ -17,7 +17,6 @@ class GameController extends Controller
$user = Auth::user();
$query = Game::query()->with(["winner", "player1", "player2"]);
// Se não for Admin, mostra apenas os jogos do utilizador
if ($user->type !== 'A') {
$query->where(function ($q) use ($user) {
$q->where('player1_user_id', $user->id)
@@ -50,9 +49,6 @@ class GameController extends Controller
return response()->json($query->paginate(15));
}
// --- MÉTODOS ADICIONADOS ---
// Host a new multiplayer Game
public function host(Request $request)
{
$request->validate([
@@ -61,7 +57,6 @@ class GameController extends Controller
$user = $request->user();
// Check for active game
$activeGame = Game::where(function ($q) use ($user) {
$q->where("player1_user_id", $user->id)
->orWhere("player2_user_id", $user->id);
@@ -77,7 +72,7 @@ class GameController extends Controller
'type' => $request->type,
'status' => 'Pending',
'player1_user_id' => $user->id,
'player2_user_id' => self::GHOST_ID, // Ghost ID = 1 (Waiting for player)
'player2_user_id' => self::GHOST_ID,
'began_at' => now(),
'player1_points' => 0,
'player2_points' => 0,
@@ -86,14 +81,13 @@ class GameController extends Controller
return response()->json($game, 201);
}
// List open games (Available to join)
public function open(Request $request)
{
$type = $request->query('type', '9');
$GHOST_ID = 1;
$games = Game::where('status', 'Pending')
->where('player2_user_id', $GHOST_ID) // Games waiting for P2
->where('player2_user_id', $GHOST_ID)
->where('type', $type)
->with('player1')
->orderBy('began_at', 'asc')
@@ -101,7 +95,6 @@ class GameController extends Controller
return response()->json($games);
}
// ---------------------------
public function store(Request $request)
{
@@ -132,7 +125,6 @@ class GameController extends Controller
$initialStatus = $request->input('status', 'Pending');
// If specific player 2 is provided, auto-start game
if ($player2Id !== self::GHOST_ID && !$request->has('status')) {
$initialStatus = 'Playing';
}
@@ -159,17 +151,14 @@ class GameController extends Controller
public function join(Request $request, Game $game)
{
// Prevent joining if already full or started
if ($game->status !== 'Pending' || $game->player2_user_id !== self::GHOST_ID) {
return response()->json(['message' => 'Game is not available'], 400);
}
// Prevent joining your own game
if ($game->player1_user_id === $request->user()->id) {
return response()->json(['message' => 'Cannot join your own game'], 400);
}
// Check if joining user has another active game
$activeGame = Game::where(function ($q) use ($request) {
$q->where("player1_user_id", $request->user()->id)
->orWhere("player2_user_id", $request->user()->id);
@@ -247,7 +236,6 @@ class GameController extends Controller
public function destroy(Game $game)
{
// Ensure only the host can delete, and ONLY if it's still Pending
if ($game->player1_user_id !== auth()->id()) {
return response()->json(['message' => 'Unauthorized'], 403);
}
api/app/Http/Controllers/MatchController.php
+5 -11
View File
@@ -70,7 +70,7 @@ class MatchController extends Controller
$stakeType = CoinTransactionType::firstOrCreate(
["name" => "Match stake"],
["type" => "D"], // Debit
["type" => "D"],
);
$match = MatchGame::create([
@@ -213,7 +213,7 @@ class MatchController extends Controller
) {
$payoutType = CoinTransactionType::firstOrCreate(
["name" => "Match payout"],
["type" => "C"], // Credit
["type" => "C"],
);
$totalPrize = $match->stake * 2;
@@ -273,7 +273,7 @@ class MatchController extends Controller
$stakeType = CoinTransactionType::firstOrCreate(
["name" => "Match stake"],
["type" => "D"], // Debit
["type" => "D"],
);
$match = MatchGame::create([
@@ -307,7 +307,7 @@ class MatchController extends Controller
$query = MatchGame::where('status', 'Pending')
->where(function($q) {
$q->whereNull('player2_user_id')
->orWhere('player2_user_id', 1); // 1 = Ghost ID
->orWhere('player2_user_id', 1);
});
if ($request->has('type')) {
@@ -321,7 +321,6 @@ class MatchController extends Controller
return response()->json($matches);
}
// --- FIX: Safely Delete Match by removing dependencies first ---
public function destroy(MatchGame $match)
{
$user = request()->user();
@@ -335,13 +334,10 @@ class MatchController extends Controller
}
return DB::transaction(function () use ($match, $user) {
// 1. Delete associated Games first (The FK constraint cause)
DB::table('games')->where('match_id', $match->id)->delete();
// 2. Unlink existing Coin Transactions (Set match_id to NULL)
CoinTransaction::where('match_id', $match->id)->update(['match_id' => null]);
// 3. Process Refund
if ($match->stake > 0) {
$user->increment('coins_balance', $match->stake);
@@ -350,10 +346,9 @@ class MatchController extends Controller
['type' => 'C']
);
// Create Refund Transaction with NO LINK to the deleted match
CoinTransaction::create([
'user_id' => $user->id,
'match_id' => null, // IMPORTANT: Must be null
'match_id' => null,
'coin_transaction_type_id' => $refundType->id,
'transaction_datetime' => now(),
'coins' => $match->stake,
@@ -361,7 +356,6 @@ class MatchController extends Controller
]);
}
// 4. Finally delete the match
$match->delete();
return response()->json([
api/app/Http/Controllers/StatisticsController.php
+2 -2
View File
@@ -65,7 +65,7 @@ class StatisticsController extends Controller
->where('winner_user_id', $user->id)
->count();
$totalLosses = $totalGames - $totalWins; // Simplest math
$totalLosses = $totalGames - $totalWins;
$winRate = 0;
if ($totalGames > 0) {
@@ -78,7 +78,7 @@ class StatisticsController extends Controller
'total_wins' => $totalWins,
'total_losses' => $totalLosses,
'win_rate' => $winRate . '%',
'current_balance' => $user->coins_balance, // Extra info
'current_balance' => $user->coins_balance,
]);
}
api/app/Http/Controllers/UserController.php
+3 -54
View File
@@ -12,10 +12,6 @@ use Illuminate\Validation\Rule;
class UserController extends Controller
{
/**
* GET /api/users
* Lista todos os utilizadores (Apenas para Admins)
*/
public function index(Request $request)
{
$this->authorize("viewAny", User::class);
@@ -41,10 +37,6 @@ class UserController extends Controller
return response()->json($query->paginate(15));
}
/**
* POST /api/users
* Registar um novo utilizador (Admin only)
*/
public function store(Request $request)
{
$this->authorize("create", User::class);
@@ -63,25 +55,15 @@ class UserController extends Controller
return response()->json($user, 201);
}
/**
* GET /api/users/me
* Retorna o perfil do utilizador autenticado atual.
* Usado pelo VueJS para saber quem está logado.
*/
public function me(Request $request)
{
return response()->json($request->user());
}
/**
* GET /api/users/{user}
* Mostra um perfil específico.
*/
public function show(User $user)
{
$currentUser = Auth::user();
// Admins and owners get full profile, others get limited view
if ($currentUser->type === "A" || $currentUser->id === $user->id) {
return response()->json($user);
} else {
@@ -95,10 +77,6 @@ class UserController extends Controller
}
}
/**
* PUT/PATCH /api/users/{user}
* Atualizar perfil (Nome, Nickname, Password, Foto)
*/
public function update(Request $request, User $user)
{
$this->authorize("update", $user);
@@ -119,12 +97,6 @@ class UserController extends Controller
"password" => "sometimes|string|min:3",
]);
// Lógica de Upload de Foto (Exemplo Básico)
// if ($request->hasFile('photo_avatar')) {
// $path = $request->file('photo_avatar')->store('avatars', 'public');
// $validated['photo_avatar_filename'] = basename($path);
// }
$user->update($validated);
return response()->json($user);
@@ -139,7 +111,6 @@ class UserController extends Controller
"new_password" => "required|string|min:3|confirmed",
]);
// Verificar se a password atual está correta
if (!Hash::check($validated["current_password"], $user->password)) {
return response()->json(
["message" => "Current password is incorrect"],
@@ -147,22 +118,16 @@ class UserController extends Controller
);
}
// Atualizar para a nova password
$user->password = Hash::make($validated["new_password"]);
$user->save();
return response()->json(["message" => "Password updated successfully"]);
}
/**
* DELETE /api/users/{user}
* Apagar conta (Soft Delete)
*/
public function destroy(User $user)
{
$this->authorize("delete", $user);
// Check if user has transactions or games - if so, soft delete
$hasTransactions = $user->transactions()->exists();
$hasGames = Game::where(function ($q) use ($user) {
$q->where("player1_user_id", $user->id)->orWhere(
@@ -172,26 +137,21 @@ class UserController extends Controller
})->exists();
if ($hasTransactions || $hasGames) {
$user->delete(); // Soft delete
$user->delete();
$message =
"User account deactivated (soft-deleted due to transaction/game history)";
} else {
$user->forceDelete(); // Hard delete
$user->forceDelete();
$message = "User permanently deleted";
}
return response()->json(["message" => $message]);
}
/**
* GET /api/users/{user}/games
* Histórico de Partidas Individuais (Cartas)
*/
public function getGames(Request $request, User $user)
{
$this->authorize("view", $user);
// Define a query base para GAMES
$query = \App\Models\Game::query()
->where(function ($q) use ($user) {
$q->where("player1_user_id", $user->id)->orWhere(
@@ -209,7 +169,6 @@ class UserController extends Controller
$query->where("status", $request->status);
}
// Date filtering
if ($request->has("date_from")) {
$query->whereDate("began_at", ">=", $request->date_from);
}
@@ -218,11 +177,9 @@ class UserController extends Controller
$query->whereDate("began_at", "<=", $request->date_to);
}
// Flexible sorting
$sortColumn = $request->get("sort_by", "began_at");
$sortDirection = $request->get("sort_direction", "desc");
// Whitelist sortable columns for security
$allowedColumns = [
"began_at",
"ended_at",
@@ -251,10 +208,6 @@ class UserController extends Controller
return response()->json($games);
}
/**
* GET /api/users/{user}/matches
* Histórico de Matches (Apostas / Marcas)
*/
public function getMatches(Request $request, User $user)
{
$this->authorize("view", $user);
@@ -276,7 +229,6 @@ class UserController extends Controller
$query->where("status", $request->status);
}
// Date filtering
if ($request->has("date_from")) {
$query->whereDate("began_at", ">=", $request->date_from);
}
@@ -285,11 +237,9 @@ class UserController extends Controller
$query->whereDate("began_at", "<=", $request->date_to);
}
// Flexible sorting
$sortColumn = $request->get("sort_by", "began_at");
$sortDirection = $request->get("sort_direction", "desc");
// Whitelist sortable columns for security
$allowedColumns = ["began_at", "ended_at", "stake", "total_time"];
if (in_array($sortColumn, $allowedColumns)) {
$query->orderBy($sortColumn, $sortDirection);
@@ -308,7 +258,7 @@ class UserController extends Controller
) {
$match->outcome = "loss";
} else {
$match->outcome = "interrupted"; // Matches geralmente não empatam (alguém chega a 4 marcas)
$match->outcome = "interrupted";
}
return $match;
});
@@ -323,7 +273,6 @@ class UserController extends Controller
$user->blocked = true;
$user->save();
// Revoke all active tokens for immediate effect
$user->tokens()->delete();
return response()->json(["message" => "User blocked successfully"]);
api/app/Http/Requests/StoreGameRequest.php
-13
View File
@@ -7,31 +7,18 @@ use Illuminate\Support\Facades\Auth;
class StoreGameRequest extends FormRequest
{
/**
* Determine if the user is authorized to make this request.
*/
public function authorize(): bool
{
// Só utilizadores autenticados podem criar jogos
return Auth::check();
}
/**
* Get the validation rules that apply to the request.
*
* @return array<string, \Illuminate\Contracts\Validation\ValidationRule|array<mixed>|string>
*/
public function rules(): array
{
return [
// Agora validamos diretamente '3' ou '9' para bater certo com a BD
'type' => 'required|in:3,9',
];
}
/**
* Mensagens personalizadas (Opcional)
*/
public function messages(): array
{
return [