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

Version 1.0 #102

Merged
FernandoJVideira merged 163 commits from develop into master 2026-01-03 14:49:00 +00:00
Conversation 3 Commits 163 Files Changed 145
+25 -64
1 changed files with 25 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit d29e44c61c - Show all commits
api/app/Http/Controllers/GameController.php
+25 -64
View File
@@ -10,6 +10,8 @@ use App\Models\MatchGame;
class GameController extends Controller
{
const GHOST_ID = 1;
public function index(Request $request)
{
$query = Game::query()->with(["winner", "player1", "player2"]);
@@ -47,51 +49,34 @@ class GameController extends Controller
$user = Auth::user();
$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,
);
$q->where("player1_user_id", $user->id)
->orWhere("player2_user_id", $user->id);
})
->whereIn("status", ["Pending", "Playing"])
->exists();
->whereIn("status", ["Pending", "Playing"])
->exists();
if ($activeMatch || $activeGame) {
return response()->json(
["message" => "You already have an active game or match."],
400,
);
if ($activeGame) {
return response()->json(["message" => "You already have an active game."], 400);
}
$game = Game::create([
"type" => $validated["type"],
"status" => "Pending",
"player1_user_id" => $user->id,
"player2_user_id" => null,
"winner_user_id" => null,
"loser_user_id" => null,
"player2_user_id" => self::GHOST_ID,
"winner_user_id" => self::GHOST_ID,
"loser_user_id" => self::GHOST_ID,
"began_at" => now(),
"player1_points" => 0,
"player2_points" => 0,
"custom" => null,
]);
return response()->json(
[
"message" => "Multiplayer game room created",
"game" => $game,
],
201,
);
return response()->json([
"message" => "Multiplayer game room created",
"game" => $game,
], 201);
}
public function join(Game $game)
@@ -99,35 +84,14 @@ class GameController extends Controller
$user = Auth::user();
if ($game->player1_user_id == $user->id) {
return response()->json(
[
"message" => "Waiting for opponent...",
"game" => $game,
],
200,
);
return response()->json([
"message" => "You are the host. Waiting for opponent...",
"game" => $game
], 200);
}
if ($game->status !== "Pending") {
return response()->json(
["message" => "Game is full or already started"],
400,
);
}
$activeGame = Game::where(function ($query) use ($user) {
$query
->where("player1_user_id", $user->id)
->orWhere("player2_user_id", $user->id);
})
->whereIn("status", ["Pending", "Playing"])
->exists();
if ($activeGame) {
return response()->json(
["message" => "You are already in another active game."],
400,
);
if ($game->player2_user_id !== self::GHOST_ID) {
return response()->json(["message" => "Game is full"], 400);
}
$game->update([
@@ -135,13 +99,10 @@ class GameController extends Controller
"player2_user_id" => $user->id,
]);
return response()->json(
[
"message" => "Joined successfully! Game starts now.",
"game" => $game,
],
200,
);
return response()->json([
"message" => "Joined successfully!",
"game" => $game,
], 200);
}
public function show(Game $game)