diff --git a/Sources/apiLOL/Controllers/ControllerChampions.cs b/Sources/apiLOL/Controllers/ControllerChampions.cs index cfb8269..0817c85 100644 --- a/Sources/apiLOL/Controllers/ControllerChampions.cs +++ b/Sources/apiLOL/Controllers/ControllerChampions.cs @@ -12,38 +12,32 @@ namespace apiLOL.Controllers public class ControllerChampions : Controller { - private readonly IDataManager data; - - // EFdata manager qui implémente l'interface IDataManager - // coté client : Refaire un APIdata manager qui implémente l'interface IDataManager + private readonly IDataManager _data; private readonly ILogger _logger; public ControllerChampions(IDataManager manager, ILogger log) { - data = manager; + _data = manager; _logger = log; } - // GET: api/ [HttpGet] + [ProducesResponseType(typeof(ChampionPageDTO), 200)] public async Task Get([FromQuery] int index = 0, int count = 10, string? name = "") { - //FromQuery permet de filtrer dans la collection de champions en fonction du nom - _logger.LogInformation( - $"methode Get de ControllerChampions appelée index:{index}, count: {count} et name:{name}"); - int nbChampions = await data.ChampionsMgr.GetNbItems(); + _logger.LogInformation($"methode Get de ControllerChampions appelée index:{index}, count: {count} et name:{name}"); + int nbChampions = await _data.ChampionsMgr.GetNbItems(); _logger.LogInformation($"Nombre de champions : {nbChampions}"); - //var champs = (await data.ChampionsMgr.GetItems(index, count)).Where(Model => Model.Name.Contains(name)).Select(Model => Model.ToDTO()); - var champs = (await data.ChampionsMgr.GetItems(index, await data.ChampionsMgr.GetNbItems())) - .Where(Model => Model.Name.Contains(name)).Skip(index * count).Take(count) - .Select(Model => Model.ToDTO()); + var champions = await _data.ChampionsMgr.GetItems(index, nbChampions); + var filteredChampions = champions.Where(Model => Model.Name.Contains(name)).Skip(index * count).Take(count); + var championDTO = filteredChampions.Select(Model => Model.ToDTO()); var page = new ChampionPageDTO { - Data = (IEnumerable) champs, + Data = championDTO, Index = index, Count = count, TotalCount = nbChampions @@ -52,15 +46,15 @@ namespace apiLOL.Controllers } - // GET api//Charle [HttpGet] [Route("{name}")] + [ProducesResponseType(typeof(ChampionDTO), 200)] public async Task GetChampion(string name) { _logger.LogInformation($"methode GetChampion de ControllerChampions appelée avec le paramètre {name}"); try { - var champs = (await data.ChampionsMgr.GetItemsByName(name, 0, 1)); + var champs = (await _data.ChampionsMgr.GetItemsByName(name, 0, 1)); return Ok(champs.First().ToDTO()); } catch (Exception ex) @@ -71,7 +65,6 @@ namespace apiLOL.Controllers } - // POST api/ [HttpPost] public async Task Post(ChampionDTO champDTO) { @@ -79,7 +72,7 @@ namespace apiLOL.Controllers try { Champion tmp = champDTO.ToModel(); - Champion champion = await data.ChampionsMgr.AddItem(tmp); + Champion champion = await _data.ChampionsMgr.AddItem(tmp); ChampionDTO dtoChamp = champion.ToDTO(); return CreatedAtAction(nameof(GetChampion), new {name = dtoChamp.Name}, dtoChamp); } @@ -90,7 +83,6 @@ namespace apiLOL.Controllers } } - // PUT api//5 [HttpPut("{name}")] public async Task Put(string name, string bio) { @@ -99,7 +91,7 @@ namespace apiLOL.Controllers try { - var champs = (await data.ChampionsMgr.GetItemsByName(name, 0, 1)).First(); + var champs = (await _data.ChampionsMgr.GetItemsByName(name, 0, 1)).First(); champs.Bio = bio; return Ok(champs.ToDTO()); } @@ -110,7 +102,6 @@ namespace apiLOL.Controllers } } - // DELETE api//5 [HttpDelete("{name}")] public async Task Delete(string name) { @@ -118,8 +109,8 @@ namespace apiLOL.Controllers try { - var champ = (await data.ChampionsMgr.GetItemsByName(name, 0, 1)).First(); - await data.ChampionsMgr.DeleteItem(champ); + var champ = (await _data.ChampionsMgr.GetItemsByName(name, 0, 1)).First(); + await _data.ChampionsMgr.DeleteItem(champ); return Ok(champ.ToDTO()); } catch (Exception ex) @@ -145,26 +136,22 @@ namespace apiLOL.Controllers } - // GET api//5 [HttpGet()] public string Get(int id) { return "Version 2 of GET"; } - // POST api/ [HttpPost] public void Post([FromBody] string value) { } - // PUT api//5 [HttpPut("{id}")] public void Put(int id, [FromBody] string value) { } - // DELETE api//5 [HttpDelete("{id}")] public void Delete(int id) {