From 8933ae31509446d2e03335bc99bf09908f3167a7 Mon Sep 17 00:00:00 2001 From: Maxence Lanone Date: Wed, 29 Mar 2023 14:01:14 +0200 Subject: [PATCH] :bug: reglage api players OK --- Sources/Model/Game.cs | 18 +++++++++++------- Sources/Model/Player.cs | 7 +++++++ Sources/Stub/Stub/StubData.Games.cs | 10 ++++------ Sources/Stub/Stub/StubData.Players.cs | 8 ++++---- .../Trek12_API/Controllers/GameController.cs | 2 +- .../Trek12_API/Controllers/PlayerController.cs | 2 +- Sources/Trek12_API/DTO/GameDTO.cs | 2 +- 7 files changed, 29 insertions(+), 20 deletions(-) diff --git a/Sources/Model/Game.cs b/Sources/Model/Game.cs index 72c218e..494dfe2 100644 --- a/Sources/Model/Game.cs +++ b/Sources/Model/Game.cs @@ -13,7 +13,7 @@ namespace Model public TimeSpan Duration { get; set; } - public DateOnly Date { get; set; } + public DateTime Date { get; set; } public ReadOnlyCollection Players { get; private set; } private List players; @@ -42,16 +42,14 @@ namespace Model // Id = id; //} - public Game(DateOnly date, Player ?owner, GameMode gameMode, int id = 0) + public Game(DateTime date, Player ?owner, GameMode gameMode, int id = 0) { Date = date; players = new(); turns = new(); - grilles = new Dictionary(); - scores = new Dictionary(); Players = new ReadOnlyCollection(players); - Grilles = new ReadOnlyDictionary(grilles); - Scores = new ReadOnlyDictionary(scores); + Grilles = new ReadOnlyDictionary(new Dictionary()); + Scores = new ReadOnlyDictionary(new Dictionary()); Turns = new ReadOnlyCollection(turns); grilles.Add(owner, new Grille()); scores.Add(owner, 0); @@ -60,7 +58,13 @@ namespace Model Id = id; } - public Game(int id, TimeSpan duration, DateOnly date, List players, List turns, Dictionary grilles, Dictionary scores, GameMode gameMode) + public Game(int id, ReadOnlyCollection players, GameMode gameMode) + { + Id = id; + GameMode = gameMode; + } + + public Game(int id, TimeSpan duration, DateTime date, List players, List turns, Dictionary grilles, Dictionary scores, GameMode gameMode) { Id = id; Duration = duration; diff --git a/Sources/Model/Player.cs b/Sources/Model/Player.cs index 6e44458..89a0bec 100644 --- a/Sources/Model/Player.cs +++ b/Sources/Model/Player.cs @@ -26,6 +26,13 @@ Stats = new Stats(); } + public Player(string pseudo, int id) + { + Pseudo = pseudo; + Id = id; + Stats = new Stats(); + } + public Player(string pseudo, Stats stats, int id=0) { Pseudo = pseudo; diff --git a/Sources/Stub/Stub/StubData.Games.cs b/Sources/Stub/Stub/StubData.Games.cs index dd74401..c0bdd3e 100644 --- a/Sources/Stub/Stub/StubData.Games.cs +++ b/Sources/Stub/Stub/StubData.Games.cs @@ -13,12 +13,10 @@ namespace Stub { private List games = new() { - new Game(new DateOnly(2023,06,03), new Player("test1"),new GameMode()), - new Game(new DateOnly(2023,06,03), new Player("test2"),new GameMode()), - new Game(new DateOnly(2023,06,03), new Player("test3"),new GameMode()), - new Game(new DateOnly(2023,06,03), new Player("test4"),new GameMode()), - new Game(new DateOnly(2023,06,03), new Player("test5"),new GameMode()), - + new Game(new DateTime(), new Player("Aurélien",0),new GameMode()), + new Game(new DateTime(), new Player("Maxence",1),new GameMode()), + new Game(new DateTime(), new Player("Théo",2),new GameMode()), + new Game(new DateTime(), new Player("Zakariya",3),new GameMode()), }; public class GamesManager : IGamesManager diff --git a/Sources/Stub/Stub/StubData.Players.cs b/Sources/Stub/Stub/StubData.Players.cs index 1f64bb4..9d3d5ab 100644 --- a/Sources/Stub/Stub/StubData.Players.cs +++ b/Sources/Stub/Stub/StubData.Players.cs @@ -12,10 +12,10 @@ namespace Stub { private List players = new() { - new Player("Aurelien"), - new Player("Theo"), - new Player("Maxence"), - new Player("Zakariya"), + new Player("Aurelien", 0), + new Player("Theo",1), + new Player("Maxence",2), + new Player("Zakariya",3), }; public class PlayersManager : IPlayersManager diff --git a/Sources/Trek12_API/Controllers/GameController.cs b/Sources/Trek12_API/Controllers/GameController.cs index b7961d9..c7d0de5 100644 --- a/Sources/Trek12_API/Controllers/GameController.cs +++ b/Sources/Trek12_API/Controllers/GameController.cs @@ -65,7 +65,7 @@ namespace Trek12_API.Controllers return Ok("Partie bien supprimée"); } -/* [HttpPut(Name = "UpdateGameById")] + /*[HttpPut(Name = "UpdateGameById")] public async Task Update(int id, GameDTO newGame) { await gamesManager.UpdateItem(gamesManager.GetItemsById(id).Result.FirstOrDefault(), newGame.toModel()); diff --git a/Sources/Trek12_API/Controllers/PlayerController.cs b/Sources/Trek12_API/Controllers/PlayerController.cs index 8b144e2..a44f8d1 100644 --- a/Sources/Trek12_API/Controllers/PlayerController.cs +++ b/Sources/Trek12_API/Controllers/PlayerController.cs @@ -54,7 +54,7 @@ namespace Trek12_API.Controllers return Ok(player?.toDTOs()); } - [HttpPost] + [HttpPost(Name= "AddPlayer")] public async Task Post(PlayerDTO player) { Player playerToCreate = player.toModel(); diff --git a/Sources/Trek12_API/DTO/GameDTO.cs b/Sources/Trek12_API/DTO/GameDTO.cs index a00d37a..8f37e35 100644 --- a/Sources/Trek12_API/DTO/GameDTO.cs +++ b/Sources/Trek12_API/DTO/GameDTO.cs @@ -7,7 +7,7 @@ namespace Trek12_API.DTO { public int Id { get; set; } public TimeSpan Duration { get; set; } - public DateOnly Date { get; set; } + public DateTime Date { get; set; } public List Turns { get; set; } public Dictionary Grilles { get; set; } public Dictionary Scores { get; set; }