Return game ID+code; update hub and Player model

Change GameManager/CreateGame to return (gameId, gameCode) and Make JoinGame return the game Id (or null) instead of a bool. Update IGameManager signature accordingly. Refactor Hub methods to construct Player objects, accept Coordinates for game creation, use the manager results to add connections to groups and send GameCreated with GameId and GameCode, and handle join failures with an error message. Simplify Player class to use a primary-constructor style with property initialization; add necessary using directives.
This commit is contained in:
Jonas
2026-03-01 20:43:18 +01:00
parent ce52d1462f
commit 85521f3b23
4 changed files with 41 additions and 16 deletions
+30 -7
View File
@@ -1,3 +1,5 @@
using API.Models.DataClasses;
using API.Models.Game;
using API.Services.GameManager; using API.Services.GameManager;
using Microsoft.AspNetCore.SignalR; using Microsoft.AspNetCore.SignalR;
@@ -7,18 +9,39 @@ public class GameHubSocket(IGameManager gameManager) : Hub
{ {
private readonly IGameManager _gameManager = gameManager; private readonly IGameManager _gameManager = gameManager;
public async Task CreateGame(string playerName) public async Task CreateGame(string playerName, Coordinates gFs)
{ {
// TODO: create var player = new Player(playerName, Context.ConnectionId);
await Groups.AddToGroupAsync(Context.ConnectionId, "gameId");
await Clients.Group("gameId").SendAsync("PlayerJoined", new var result = _gameManager.CreateGame(gFs, player);
await Groups.AddToGroupAsync(Context.ConnectionId, result.Item1);
await Clients.Caller.SendAsync("GameCreated", new
{ {
Context.ConnectionId, GameId = result.Item1,
PlayerName = playerName GameCode = result.Item2,
}); });
} }
public async Task JoinGame(string gameId, string playerName) public async Task JoinGame(int gameCode, string playerName)
{ {
var player = new Player(playerName, Context.ConnectionId);
var result = _gameManager.JoinGame(player, gameCode);
if (result == null)
{
await Clients.Caller.SendAsync("Error", "Spiel nicht gefunden oder voll.");
return;
}
await Groups.AddToGroupAsync(Context.ConnectionId, gameCode.ToString());
await Clients.Caller.SendAsync("GameCreated", new
{
GameId = result,
GameCode = gameCode,
});
} }
} }
+3 -3
View File
@@ -1,7 +1,7 @@
namespace API.Models.Game; namespace API.Models.Game;
public class Player public class Player(string name, string connectionId)
{ {
public string Name { get; set; } public string Name { get; set; } = name;
public string ConnectionId { get; set; } public string ConnectionId { get; set; } = connectionId;
} }
+6 -4
View File
@@ -6,17 +6,19 @@ namespace API.Services.GameManager;
public class GameManager(IGameRepository gameRepository) : IGameManager public class GameManager(IGameRepository gameRepository) : IGameManager
{ {
public int CreateGame(Coordinates gFs, Player player) public (string, int) CreateGame(Coordinates gFs, Player player)
{ {
var game = gameRepository.Create(gFs, player); var game = gameRepository.Create(gFs, player);
return game.GameCode; return (game.Id, game.GameCode);
} }
public bool JoinGame(Player player, int gameCode) public string? JoinGame(Player player, int gameCode)
{ {
var game = gameRepository.GetOne(new SixDigitInt(gameCode)); var game = gameRepository.GetOne(new SixDigitInt(gameCode));
return game != null && game.AddPlayer(player); var success = game != null && game.AddPlayer(player);
return success ? game?.Id : null;
} }
} }
+2 -2
View File
@@ -4,6 +4,6 @@ namespace API.Services.GameManager;
public interface IGameManager public interface IGameManager
{ {
public int CreateGame(Coordinates gFs, Player player); public (string, int) CreateGame(Coordinates gFs, Player player);
public bool JoinGame(Player playerName, int gameCode); public string? JoinGame(Player playerName, int gameCode);
} }