Updating ChampionsController but not finish ✅

README.md

@@ -41,6 +41,23 @@ Vous pouvez le cloner via un terminal dans le répertoire de votre choix en util
 
 :information_source: *Si vous ne disposez pas de Visual Studio, allez sur le site [Microsoft Visual Studio](https://visualstudio.microsoft.com/fr/downloads/) pour pouvoir le télécharger !!!*
 
+- ### Comment lancer l'API dotnet ? 
+
+Pour pouvoir utiliser toutes les requêtes de l'API, il est nécessaire de récupérer le projet si cela n'a pas été fait, puis de le lancer à partir de Visual Studio. Vous pouvez directement cliquer sur la solution du projet. Ensuite, dans les projets de démarrage, choisissez "Api-Lol" :
+
+<div align = center>
+
+![Lancer l'API](doc/Images/Api_Launcher.png)
+
+</div>
+
+Normalement, tout est bon et vous serez redirigé vers Swagger, qui est l'interface graphique permettant d'effectuer facilement des requêtes. Il vous suffit ensuite de choisir la version en haut à droite. La version 3.0 est normalement la plus récente et la plus performante en termes de gestion d'erreur :
+
+<div align = center>
+
+![Version API](doc/Images/Swagger_Version.png)
+
+</div>
 
 - ### Comment lancer Le projet Entity Framework ? 
 

src/EntityFramework_LoL/Sources/ApiLol/Controllers/SkinsController.cs

@@ -54,20 +54,23 @@ namespace ApiLol.Controllers
 
         // POST api/<SkinsController>
         [HttpPost]
-        public async void Post([FromBody] string value)
+        public async Task<IActionResult> Post([FromBody] string value)
         {
+            return Ok();
         }
 
         // PUT api/<SkinsController>/5
         [HttpPut("{name}")]
-        public async void Put(int id, [FromBody] string value)
+        public async Task<IActionResult> Put(int id, [FromBody] string value)
         {
+            return Ok();
         }
 
         // DELETE api/<SkinsController>/5
         [HttpDelete("{name}")]
-        public async void Delete(string name)
+        public async Task<IActionResult> Delete(string name)
         {
+            return Ok();
         }
     }
 }

src/EntityFramework_LoL/Sources/ApiLol/Controllers/v1/ChampionsController.cs

@@ -25,12 +25,9 @@ namespace ApiLol.Controllers.v1
         [HttpGet]
         public async Task<IActionResult> Get([FromQuery] PageRequest pageRequest)
         {
-
-            int nbTotal = await _manager.ChampionsMgr.GetNbItems();
-
             _logger.LogInformation("Executing {Action} with parameters: {Parameters}", nameof(Get), pageRequest);
-            IEnumerable<ChampionDto> dtos = (await _manager.ChampionsMgr.GetItems(pageRequest.index, pageRequest.count))
+            IEnumerable<ChampionDto> dtos = (await _manager.ChampionsMgr.GetItems(pageRequest.index, pageRequest.count, pageRequest.orderingPropertyName, pageRequest.descending))
-                    .Select(x => x.ToDto());
+                .Select(x => x.ToDto());
             return Ok(dtos);
         }
 
@@ -39,7 +36,7 @@ namespace ApiLol.Controllers.v1
         public async Task<IActionResult> Get(string name)
         {
             _logger.LogInformation("method {Action} call with {name}", nameof(Get), name);
-            var dtos = (await _manager.ChampionsMgr.GetItemsByName(name, 0, await _manager.ChampionsMgr.GetNbItems()))
+            var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems()))
                 .Select(x => x.ToDto());
 
             return Ok(dtos.First());
@@ -63,7 +60,7 @@ namespace ApiLol.Controllers.v1
         {
 
             _logger.LogInformation("method {Action} call with {name} and {item}", nameof(Put), name, champion);
-            var dtos = (await _manager.ChampionsMgr.GetItemsByName(name, 0, await _manager.ChampionsMgr.GetNbItems()));
+            var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems()));
 
             return Ok(await _manager.ChampionsMgr.UpdateItem(dtos.First(), champion.ToModel()));
 
@@ -75,7 +72,7 @@ namespace ApiLol.Controllers.v1
         {
 
             _logger.LogInformation("method {Action} call with {name}", nameof(Delete), name);
-            var dtos = (await _manager.ChampionsMgr.GetItemsByName(name, 0, await _manager.ChampionsMgr.GetNbItems()));
+            var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems()));
 
             return Ok(await _manager.ChampionsMgr.DeleteItem(dtos.First()));
 

src/EntityFramework_LoL/Sources/ApiLol/Controllers/v2/ChampionsController.cs

@@ -30,13 +30,17 @@ namespace ApiLol.Controllers.v2
             try
             {
                 int nbTotal = await _manager.ChampionsMgr.GetNbItems();
-                if (pageRequest.count * pageRequest.index >= nbTotal)
+                if (pageRequest.count == 0)
+                {
+                    pageRequest = new PageRequest() { index = 0, count = nbTotal };
+                }
+                else if (pageRequest.count * pageRequest.index >= nbTotal)
                 {
                     _logger.LogWarning($"too many, maximum {nbTotal}");
                     return BadRequest($"Champion limit exceed, max {nbTotal}");
                 }
 
-                _logger.LogInformation("Executing {Action} with parameters: {Parameters}", nameof(Get), pageRequest);
+                _logger.LogInformation("Executing {Action} with parameters: {Parameters}", nameof(Get), pageRequest.count);
                 IEnumerable<ChampionDto> dtos = (await _manager.ChampionsMgr.GetItems(pageRequest.index, pageRequest.count))
                         .Select(x => x.ToDto());
                 return Ok(dtos);
@@ -54,14 +58,13 @@ namespace ApiLol.Controllers.v2
             try
             {
                 int nbTotal = await _manager.ChampionsMgr.GetNbItems();
-                if (pageRequest == null)
+                if (pageRequest.count == 0)
                 {
-                    pageRequest.index = 0;
+                    pageRequest = new PageRequest() { index = 0, count = nbTotal };
-                    pageRequest.count = nbTotal;
                 }
                 else if (pageRequest.count * pageRequest.index >= nbTotal || pageRequest.count > nbTotal)
                 {
-                    _logger.LogWarning($"too many, maximum {nbTotal}");
+                    _logger.LogWarning("too many, maximum {number}", nbTotal);
                     return BadRequest($"Champion limit exceed, max {nbTotal}");
                 }
 
@@ -83,7 +86,7 @@ namespace ApiLol.Controllers.v2
             try
             {
                 _logger.LogInformation("method {Action} call with {name}", nameof(Get), name);
-                var dtos = (await _manager.ChampionsMgr.GetItemsByName(name, 0, await _manager.ChampionsMgr.GetNbItems()))
+                var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems()))
                     .Select(x => x.ToDto());
                 if (dtos.IsNullOrEmpty())
                 {
@@ -105,7 +108,7 @@ namespace ApiLol.Controllers.v2
             try
             {
                 _logger.LogInformation("method {Action} call with {item}", nameof(Post), champion);
-                var dtos = (await _manager.ChampionsMgr.GetItemsByName(champion.Name, 0, await _manager.ChampionsMgr.GetNbItems()));
+                var dtos = (await _manager.ChampionsMgr.GetItemByName(champion.Name, 0, await _manager.ChampionsMgr.GetNbItems()));
                 if (!dtos.IsNullOrEmpty())
                 {
                     return BadRequest("Name is already exist");
@@ -126,7 +129,7 @@ namespace ApiLol.Controllers.v2
             try
             {
                 _logger.LogInformation("method {Action} call with {name} and {item}", nameof(Put), name, champion);
-                var dtos = (await _manager.ChampionsMgr.GetItemsByName(name, 0, await _manager.ChampionsMgr.GetNbItems()));
+                var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems()));
                 if (dtos.IsNullOrEmpty())
                 {
                     return NotFound($"Name {name} not exist");
@@ -134,8 +137,8 @@ namespace ApiLol.Controllers.v2
                 // Checks if the new name exists
                 if (name != champion.Name)
                 {
-                    var dtos2 = (await _manager.ChampionsMgr.GetItemsByName(champion.Name, 0, await _manager.ChampionsMgr.GetNbItems()));
+                    var dtos2 = (await _manager.ChampionsMgr.GetItemByName(champion.Name, 0, await _manager.ChampionsMgr.GetNbItems()));
-                    if (dtos.IsNullOrEmpty() || dtos2.Count() > 0)
+                    if (dtos2.IsNullOrEmpty() || dtos2.Count() > 0)
                     {
                         return BadRequest("Name is already exist");
                     }
@@ -154,7 +157,7 @@ namespace ApiLol.Controllers.v2
             try
             {
                 _logger.LogInformation("method {Action} call with {name}", nameof(GetChampionsSkins), name);
-                var champions = await _manager.ChampionsMgr.GetItemsByName(name, 0, await _manager.ChampionsMgr.GetNbItems());
+                var champions = await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems());
                 //skinsDTO
                 IEnumerable<SkinDto> res = champions.First().Skins.Select(e => e.ToDto());
 
@@ -172,7 +175,7 @@ namespace ApiLol.Controllers.v2
             try
             {
                 _logger.LogInformation("method {Action} call with {name}", nameof(GetChampionsSkills), name);
-                var champions = await _manager.ChampionsMgr.GetItemsByName(name, 0, await _manager.ChampionsMgr.GetNbItems());
+                var champions = await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems());
                 //SkillDTO
                 IEnumerable<SkillDto> res = champions.First().Skills.Select(e => e.ToDto());
 
@@ -191,7 +194,7 @@ namespace ApiLol.Controllers.v2
             try
             {
                 _logger.LogInformation("method {Action} call with {name}", nameof(Delete), name);
-                var dtos = (await _manager.ChampionsMgr.GetItemsByName(name, 0, await _manager.ChampionsMgr.GetNbItems()));
+                var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems()));
                 if (dtos.IsNullOrEmpty())
                 {
                     _logger.LogWarning("{name} was not found", name);

src/EntityFramework_LoL/Sources/DTO/PageRequest.cs

@@ -9,6 +9,8 @@ namespace DTO
     public class PageRequest
     {
         public int index { get; set; } = 0;
-        public int count { get; set; } = 10;
+        public int count { get; set; } = 0;
+        public string? orderingPropertyName { get; set; } = null;
+        public bool descending { get; set; } = true;
     }
 }

src/EntityFramework_LoL/Sources/Shared/IGenericDataManager.cs

@@ -5,7 +5,8 @@ public interface IGenericDataManager<T>
 	Task<IEnumerable<T>> GetItems(int index, int count, string? orderingPropertyName = null, bool descending = false);
 	Task<int> GetNbItemsByName(string substring);
 	Task<IEnumerable<T>> GetItemsByName(string substring, int index, int count, string? orderingPropertyName = null, bool descending = false);
-	Task<T> UpdateItem(T oldItem, T newItem);
+    Task<IEnumerable<T>> GetItemByName(string substring, int index, int count, string? orderingPropertyName = null, bool descending = false);
+    Task<T> UpdateItem(T oldItem, T newItem);
 	Task<T> AddItem(T item);
 	Task<bool> DeleteItem(T item);
 }

src/EntityFramework_LoL/Sources/StubLib/StubData.Champions.cs

@@ -92,11 +92,11 @@ namespace StubLib
                 => parent.champions.GetNbItemsWithFilter(champ => filterByName(champ, substring));
 
             public Task<IEnumerable<Champion?>> GetItemsByName(string substring, int index, int count, string? orderingPropertyName, bool descending = false)
-                => parent.champions.GetItemsWithFilterAndOrdering(champ => filterByName(champ, substring), index, count, orderingPropertyName, descending);
-
-            public Task<IEnumerable<Champion?>> GetItemsByNameContains(string substring, int index, int count, string? orderingPropertyName, bool descending = false)
                 => parent.champions.GetItemsWithFilterAndOrdering(champ => filterByNameContains(champ, substring), index, count, orderingPropertyName, descending);
 
+            public Task<IEnumerable<Champion?>> GetItemByName(string substring, int index, int count, string? orderingPropertyName, bool descending = false)
+                => parent.champions.GetItemsWithFilterAndOrdering(champ => filterByName(champ, substring), index, count, orderingPropertyName, descending);
+
             public Task<Champion?> UpdateItem(Champion? oldItem, Champion? newItem)
                 => parent.champions.UpdateItem(oldItem, newItem);
         }

src/EntityFramework_LoL/Sources/StubLib/StubData.RunePages.cs

@@ -27,6 +27,9 @@ namespace StubLib
 				=> this.parent = parent;
 
             private static Func<RunePage, string, bool> filterByName
+                = (rp, substring) => rp.Name.Equals(substring, StringComparison.InvariantCultureIgnoreCase);
+
+            private static Func<RunePage, string, bool> filterByNameContains
                 = (rp, substring) => rp.Name.Contains(substring, StringComparison.InvariantCultureIgnoreCase);
 
             private static Func<RunePage, Rune?, bool> filterByRune
@@ -51,6 +54,11 @@ namespace StubLib
                         .Skip(index*count).Take(count));
 
             public Task<IEnumerable<RunePage?>> GetItemsByName(string substring, int index, int count, string? orderingPropertyName = null, bool descending = false)
+                => parent.runePages.GetItemsWithFilterAndOrdering(
+                    rp => filterByNameContains(rp, substring),
+                    index, count, orderingPropertyName, descending);
+
+            public Task<IEnumerable<RunePage?>> GetItemByName(string substring, int index, int count, string? orderingPropertyName = null, bool descending = false)
                 => parent.runePages.GetItemsWithFilterAndOrdering(
                     rp => filterByName(rp, substring),
                     index, count, orderingPropertyName, descending);

src/EntityFramework_LoL/Sources/StubLib/StubData.Runes.cs

@@ -37,6 +37,9 @@ namespace StubLib
                 = (rune, family) => rune.Family == family;
 
             private static Func<Rune, string, bool> filterByName
+                = (rune, substring) => rune.Name.Equals(substring, StringComparison.InvariantCultureIgnoreCase);
+
+            private static Func<Rune, string, bool> filterByNameContains
                 = (rune, substring) => rune.Name.Contains(substring, StringComparison.InvariantCultureIgnoreCase);
 
             public Task<IEnumerable<Rune?>> GetItemsByFamily(RuneFamily family, int index, int count, string? orderingPropertyName = null, bool descending = false)
@@ -45,6 +48,11 @@ namespace StubLib
                     index, count, orderingPropertyName, descending);
 
             public Task<IEnumerable<Rune?>> GetItemsByName(string substring, int index, int count, string? orderingPropertyName = null, bool descending = false)
+                => parent.runes.GetItemsWithFilterAndOrdering(
+                    rune => filterByNameContains(rune, substring),
+                    index, count, orderingPropertyName, descending);
+
+            public Task<IEnumerable<Rune?>> GetItemByName(string substring, int index, int count, string? orderingPropertyName = null, bool descending = false)
                 => parent.runes.GetItemsWithFilterAndOrdering(
                     rune => filterByName(rune, substring),
                     index, count, orderingPropertyName, descending);

src/EntityFramework_LoL/Sources/StubLib/StubData.Skins.cs

@@ -48,7 +48,9 @@ namespace StubLib
 
             private static Func<Skin, Champion?, bool> filterByChampion = (skin, champion) => champion != null && skin.Champion.Equals(champion!);
 
-            private static Func<Skin, string, bool> filterByName = (skin, substring) => skin.Name.Contains(substring, StringComparison.InvariantCultureIgnoreCase);
+            private static Func<Skin, string, bool> filterByName = (skin, substring) => skin.Name.Equals(substring, StringComparison.InvariantCultureIgnoreCase);
+
+            private static Func<Skin, string, bool> filterByNameContains = (skin, substring) => skin.Name.Contains(substring, StringComparison.InvariantCultureIgnoreCase);
 
             public Task<IEnumerable<Skin?>> GetItemsByChampion(Champion? champion, int index, int count, string? orderingPropertyName = null, bool descending = false)
                 => parent.skins.GetItemsWithFilterAndOrdering(
@@ -56,6 +58,11 @@ namespace StubLib
                     index, count, orderingPropertyName, descending);
 
             public Task<IEnumerable<Skin?>> GetItemsByName(string substring, int index, int count, string? orderingPropertyName = null, bool descending = false)
+                => parent.skins.GetItemsWithFilterAndOrdering(
+                    skin => filterByNameContains(skin, substring),
+                    index, count, orderingPropertyName, descending);
+
+            public Task<IEnumerable<Skin?>> GetItemByName(string substring, int index, int count, string? orderingPropertyName = null, bool descending = false)
                 => parent.skins.GetItemsWithFilterAndOrdering(
                     skin => filterByName(skin, substring),
                     index, count, orderingPropertyName, descending);