From 06ad0572915c69271cee6a979f40b3244b530d71 Mon Sep 17 00:00:00 2001 From: Aurelien PINTRAND Date: Sun, 19 Mar 2023 14:51:26 +0100 Subject: [PATCH 1/2] :ambulance: changement GameDTO toDTO() --- Sources/Model/Game.cs | 1 + Sources/Trek12_API/Converter/GameConverter.cs | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Sources/Model/Game.cs b/Sources/Model/Game.cs index a8f0d8e..54f7029 100644 --- a/Sources/Model/Game.cs +++ b/Sources/Model/Game.cs @@ -51,6 +51,7 @@ namespace Model Turns = new ReadOnlyCollection(turns); grilles.Add(owner, new Grille()); scores.Add(owner, 0); + players.Add(owner); GameMode = gameMode; Id = id; } diff --git a/Sources/Trek12_API/Converter/GameConverter.cs b/Sources/Trek12_API/Converter/GameConverter.cs index ecc1f8d..b8d65c1 100644 --- a/Sources/Trek12_API/Converter/GameConverter.cs +++ b/Sources/Trek12_API/Converter/GameConverter.cs @@ -8,7 +8,7 @@ namespace Trek12_API.Converter { public static GameDTO toDTO(this Game game) { - var gameDTO = new GameDTO(game.Id, game.Date, game.Player.toDTO(), game.GameMode.toDTO()); + var gameDTO = new GameDTO(game.Id, game.Date, game.Players.toDTOs().First(), game.GameMode.toDTO()); gameDTO.Duration = game.Duration; gameDTO.Date = game.Date; gameDTO.Turns = new List(); From 41583946c9dfc0fcac38f26b15ac14bc5f326367 Mon Sep 17 00:00:00 2001 From: Aurelien PINTRAND Date: Sun, 19 Mar 2023 16:44:39 +0100 Subject: [PATCH 2/2] :ambulance: correction multiple endpoints detected --- Sources/Model/IDataManager.cs | 2 +- Sources/Stub/Stub/StubData.Players.cs | 5 +++-- Sources/Trek12_API/Controllers/PlayerController.cs | 13 +++++++------ 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/Sources/Model/IDataManager.cs b/Sources/Model/IDataManager.cs index f73444b..e21281a 100644 --- a/Sources/Model/IDataManager.cs +++ b/Sources/Model/IDataManager.cs @@ -20,7 +20,7 @@ namespace Model public interface IPlayersManager : IGenericDataManager { - Task> GetItemsByPseudo(string charPseudo, int index, int count, string? orderingPropertyName, bool descending = false); + Task> GetItemsByPseudo(string charPseudo); Task GetNbItemsByPseudo(string charPseudo); Task> GetItemsById(int id); diff --git a/Sources/Stub/Stub/StubData.Players.cs b/Sources/Stub/Stub/StubData.Players.cs index f47ccc3..3c95fa1 100644 --- a/Sources/Stub/Stub/StubData.Players.cs +++ b/Sources/Stub/Stub/StubData.Players.cs @@ -4,6 +4,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using static Stub.StubData; namespace Stub { @@ -46,8 +47,8 @@ namespace Stub private Func filterById = (player, id) => player.Id.Equals(id); - public Task> GetItemsByPseudo(string charPseudo, int index, int count, string? orderingPropertyName, bool descending = false) - => parent.players.GetItemsWithFilterAndOrdering(player => filterByPseudo(player, charPseudo), index, count, orderingPropertyName, descending); + public Task> GetItemsByPseudo(string charPseudo) + => parent.players.GetItemsWithFilterAndOrdering(player => filterByPseudo(player, charPseudo), 0, parent.players.Count()); public Task GetNbItemsByPseudo(string charPseudo) { diff --git a/Sources/Trek12_API/Controllers/PlayerController.cs b/Sources/Trek12_API/Controllers/PlayerController.cs index 9cbb16f..eaca2af 100644 --- a/Sources/Trek12_API/Controllers/PlayerController.cs +++ b/Sources/Trek12_API/Controllers/PlayerController.cs @@ -31,7 +31,7 @@ namespace Trek12_API.Controllers //} - [HttpGet] + [HttpGet ("/AllPlayers")] public async Task Get() { try @@ -49,15 +49,16 @@ namespace Trek12_API.Controllers } - [HttpGet("players/{pseudo}")] - public async Task GetByPseudo([FromRoute] string pseudo, int index, int count, string? order = null, bool descending = false) + [HttpGet("/PlayerByPseudo/{pseudo}")] + + public async Task GetByPseudo([FromRoute] string pseudo) { - var player = await playersManager.GetItemsByPseudo(pseudo, index, count, order, descending); + var player = await playersManager.GetItemsByPseudo(pseudo); return Ok(player?.toDTOs()); } - [HttpGet("players/{id}")] - public async Task GetById([FromRoute] int id, int index, int count, string? order = null, bool descending = false) + [HttpGet ("/PlayerById/{id}")] + public async Task GetById([FromRoute] int id) { var player = await playersManager.GetItemsById(id); return Ok(player?.toDTOs());