From a81d7c6c239c13be29aa9d905d33e110395dc8c1 Mon Sep 17 00:00:00 2001 From: Aurelien PINTRAND Date: Mon, 20 Mar 2023 10:59:54 +0100 Subject: [PATCH] =?UTF-8?q?:poop:=20d=C3=A9but=20GameController,=20mais=20?= =?UTF-8?q?error=20sur=20le=20stubData.Games=20avec=20les=20public=20je=20?= =?UTF-8?q?sais=20pas=20pourquoi=20je=20cherche=20l=C3=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Sources/Model/GameMode.cs | 3 +- Sources/Stub/Stub/StubData.Games.cs | 28 +++++----- .../Trek12_API/Controllers/GameController.cs | 25 +++++++++ .../Controllers/PlayerController.cs | 52 ------------------- 4 files changed, 43 insertions(+), 65 deletions(-) create mode 100644 Sources/Trek12_API/Controllers/GameController.cs diff --git a/Sources/Model/GameMode.cs b/Sources/Model/GameMode.cs index 67377e2..1ea1c73 100644 --- a/Sources/Model/GameMode.cs +++ b/Sources/Model/GameMode.cs @@ -24,8 +24,9 @@ namespace Model } private string name = ""; - public GameMode(string name) + public GameMode(string name, int id =0) { + this.Id = id; Name = name; } } diff --git a/Sources/Stub/Stub/StubData.Games.cs b/Sources/Stub/Stub/StubData.Games.cs index 56a2cc2..9acd050 100644 --- a/Sources/Stub/Stub/StubData.Games.cs +++ b/Sources/Stub/Stub/StubData.Games.cs @@ -12,8 +12,12 @@ namespace Stub { private List games = new() { - //new Game(new TimeSpan(1,20,0),new DateOnly(2023,06,03)), - //new Game(), + new Game(new DateOnly(2023,06,03), new Player("test1"),new GameMode("gamemode test1")), + new Game(new DateOnly(2023,06,03), new Player("test2"),new GameMode("gamemode test2")), + new Game(new DateOnly(2023,06,03), new Player("test3"),new GameMode("gamemode test3")), + new Game(new DateOnly(2023,06,03), new Player("test4"),new GameMode("gamemode test4")), + new Game(new DateOnly(2023,06,03), new Player("test5"),new GameMode("gamemode test5")), + }; public class GamesManager : IGamesManager @@ -23,7 +27,7 @@ namespace Stub public GamesManager(StubData parent) => this.parent = parent; - Task IGamesManager.AddCaseValueToPlayer(int idGame, int idPlayer, int value, int index) + public Task IGamesManager.AddCaseValueToPlayer(int idGame, int idPlayer, int value, int index) { var game = parent.games.FirstOrDefault(g => g.Id == idGame); if(game == null) @@ -39,7 +43,7 @@ namespace Stub return Task.FromResult(true); } - Task IGamesManager.AddPlayer(Player player) + public Task IGamesManager.AddPlayer(Player player) { var game = parent.games.FirstOrDefault(); if(game == null) @@ -50,7 +54,7 @@ namespace Stub return Task.FromResult(true); } - Task IGamesManager.AddScoreToPlayer(int idGame, int idPlayer, int score) + public Task IGamesManager.AddScoreToPlayer(int idGame, int idPlayer, int score) { var game = parent.games.FirstOrDefault(g => g.Id == idGame); if( game == null) @@ -66,7 +70,7 @@ namespace Stub return Task.FromResult(true); } - Task IGamesManager.AddTime(TimeSpan time) + public Task IGamesManager.AddTime(TimeSpan time) { var game = parent.games.FirstOrDefault(); if (game == null) @@ -77,7 +81,7 @@ namespace Stub return Task.FromResult(true); } - Task IGamesManager.AddTurn(Turn turn) + public Task IGamesManager.AddTurn(Turn turn) { var game = parent.games.FirstOrDefault(); if( game == null) @@ -88,22 +92,22 @@ namespace Stub return Task.FromResult(true); } - Task IGenericDataManager.AddItem(Game? item) + public Task IGenericDataManager.AddItem(Game? item) => parent.games.AddItem(item); - Task IGenericDataManager.DeleteItem(Game? item) + public Task IGenericDataManager.DeleteItem(Game? item) => parent.games.DeleteItem(item); - Task> IGenericDataManager.GetItems(int index, int count, string? orderingPropertyName, bool descending) + public Task> IGenericDataManager.GetItems(int index, int count, string? orderingPropertyName, bool descending) => parent.games.GetItemsWithFilterAndOrdering( g => true, index, count, orderingPropertyName, descending); - Task IGenericDataManager.GetNbItems() + public Task IGenericDataManager.GetNbItems() => Task.FromResult(parent.games.Count()); - Task IGenericDataManager.UpdateItem(Game? oldItem, Game? newItem) + public Task IGenericDataManager.UpdateItem(Game? oldItem, Game? newItem) => parent.games.UpdateItem(oldItem, newItem); } } diff --git a/Sources/Trek12_API/Controllers/GameController.cs b/Sources/Trek12_API/Controllers/GameController.cs new file mode 100644 index 0000000..b014b88 --- /dev/null +++ b/Sources/Trek12_API/Controllers/GameController.cs @@ -0,0 +1,25 @@ +using Microsoft.AspNetCore.Mvc; +using Stub; + +namespace Trek12_API.Controllers +{ + [ApiController] + [Route("[controller]")] + public class GameController: ControllerBase + { + private readonly ILogger _logger; + private StubData.GamesManager gamesManager { get; set; } = new StubData.GamesManager(new StubData()); + + + public GameController(ILogger logger) + { + _logger = logger; + } + + [HttpGet("/AllGames")] + public async Task Get() + { + var list = await gamesManager + } + } +} diff --git a/Sources/Trek12_API/Controllers/PlayerController.cs b/Sources/Trek12_API/Controllers/PlayerController.cs index eaca2af..e4fa627 100644 --- a/Sources/Trek12_API/Controllers/PlayerController.cs +++ b/Sources/Trek12_API/Controllers/PlayerController.cs @@ -20,23 +20,12 @@ namespace Trek12_API.Controllers _logger = logger; } - //[HttpGet] - //public async Task Get(int index, int count, string? order = null, bool descending = false ) - //{ - // //si count > nb_max - // //_logger.LogWarning + reaffecter count - // //var list = await playersManager.GetItems(0, await playersManager.GetNbItems(), order, descending); - // var list = await playersManager.GetItems(index, count, order, descending); - // return Ok(list.Select(player => player?.toDTO())); - - //} [HttpGet ("/AllPlayers")] public async Task Get() { try { - var list = await playersManager.GetItems(0, playersManager.GetNbItems().Result); return Ok(list); @@ -76,7 +65,6 @@ namespace Trek12_API.Controllers public async Task Delete(PlayerDTO player) { var playerToDelete = player.toModel(); - //faire recherche pour voir si player existe await playersManager.DeleteItem(playerToDelete); return Ok(); } @@ -97,45 +85,5 @@ namespace Trek12_API.Controllers await playersManager.UpdateItem(playersManager.GetItems(0,1).Result.FirstOrDefault(), newPlayer.toModel()); return Ok(newPlayer); } -/* - [HttpPut("name=UpdateMaxChain")] - public async Task UpdateMaxChain(int newMaxChain, PlayerDTO playerOld) - { - Player playerOldModel = playerOld.toModel(); - Player playerNew = new Player(playerOldModel.Pseudo, playerOldModel.Stats); - playerNew.Stats.MaxChain = newMaxChain; - await playersManager.UpdateItem(playerOldModel, playerNew); - return Ok(playerNew); - } - - [HttpPut("name=UpdateMaxPoints")] - public async Task UpdateMaxPoints(int newMaxPoints, PlayerDTO playerOld) - { - Player playerOldModel = playerOld.toModel(); - Player playerNew = new Player(playerOldModel.Pseudo, playerOldModel.Stats); - playerNew.Stats.MaxPoints = newMaxPoints; - await playersManager.UpdateItem(playerOldModel, playerNew); - return Ok(playerNew); - } - - [HttpPut("name=UpdateMaxZone")] - public async Task UpdateMaxZone(int newMaxZone, PlayerDTO playerOld) - { - Player playerOldModel = playerOld.toModel(); - Player playerNew = new Player(playerOldModel.Pseudo, playerOldModel.Stats); - playerNew.Stats.MaxZone = newMaxZone; - await playersManager.UpdateItem(playerOldModel, playerNew); - return Ok(playerNew); - } - - [HttpPut("name=UpdateWin")] - public async Task UpdateWin(int newMaxZone, PlayerDTO playerOld) - { - Player playerOldModel = playerOld.toModel(); - Player playerNew = new Player(playerOldModel.Pseudo, playerOldModel.Stats); - playerNew.AddWin(); - await playersManager.UpdateItem(playerOldModel, playerNew); - return Ok(playerNew); - }*/ } }