Addition of modifications of Mr Chevaldonne and rehabilitation of unit tests 🐛

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

@@ -114,9 +114,26 @@ namespace ApiLol.Controllers
         }
 
         // DELETE api/<RunePagesController>/5
-        [HttpDelete("{id}")]
-        public void Delete(int id)
+        [HttpDelete("{name}")]
+        public async Task<IActionResult> Delete(string name)
         {
+            _logger.LogInformation("method {Action} - RUNE call with {name}", nameof(Delete), name);
+            try
+            {
+                var dtos = (await _manager.RunePagesMgr.GetItemByName(name, 0, await _manager.RunesMgr.GetNbItems()));
+                if (dtos.IsNullOrEmpty())
+                {
+                    _logger.LogWarning("{name} was not found", name);
+                    return NotFound($"{name} was not found");
+                }
+                await _manager.RunePagesMgr.DeleteItem(dtos.First());
+                return NoContent();
+            }
+            catch (Exception error)
+            {
+                _logger.LogError(error.Message);
+                return BadRequest(error.Message);
+            }
         }
     }
 }

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

@@ -148,9 +148,10 @@ namespace ApiLol.Controllers
                 if (dtos.IsNullOrEmpty())
                 {
                     _logger.LogWarning("{name} was not found", name);
-                    return BadRequest();
+                    return NotFound($"{name} was not found");
                 }
-                return Ok(await _manager.RunesMgr.DeleteItem(dtos.First()));
+                await _manager.RunesMgr.DeleteItem(dtos.First());
+                return NoContent();
             }
             catch (Exception error)
             {

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

@@ -208,9 +208,10 @@ namespace ApiLol.Controllers
                 if (dtos.IsNullOrEmpty())
                 {
                     _logger.LogWarning("{name} was not found", name);
-                    return BadRequest();
+                    return NotFound($"{name} was not found");
                 }
-                return Ok(await _manager.SkinsMgr.DeleteItem(dtos.First()));
+                await _manager.SkinsMgr.DeleteItem(dtos.First());
+                return NoContent();
             }
             catch (Exception error)
             {

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

@@ -89,7 +89,8 @@ namespace ApiLol.Controllers.v1
             _logger.LogInformation("method {Action} - CHAMPION - V1.0 call with {name}", nameof(Delete), name);
             var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems()));
 
-            return Ok(await _manager.ChampionsMgr.DeleteItem(dtos.First()));
+            await _manager.ChampionsMgr.DeleteItem(dtos.First());
+            return NoContent();
 
         }
     }

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

@@ -229,9 +229,10 @@ namespace ApiLol.Controllers.v2
                 if (dtos.IsNullOrEmpty())
                 {
                     _logger.LogWarning("{name} was not found", name);
-                    return BadRequest();
+                    return NotFound($"{name} was not found");
                 }
-                return Ok(await _manager.ChampionsMgr.DeleteItem(dtos.First()));
+                await _manager.ChampionsMgr.DeleteItem(dtos.First());
+                return NoContent();
             }
             catch (Exception error)
             {

src/EntityFramework_LoL/Sources/Model/RunePage.cs

@@ -43,6 +43,7 @@ namespace Model
                 if (value == null)
                 {
                     runes.Remove(category);
+                    return;
                 }
                 runes[category] = value!;
                 CheckRunes(category);
@@ -83,11 +84,11 @@ namespace Model
             return rune1.Family == rune2.Family;
         }
 
-		private void UpdateMajorFamily(Category minor, bool expectedValue)
+        private void UpdateMajorFamily(Category cat, bool expectedValue)
         {
-			if(CheckFamilies(Category.Major, minor).GetValueOrDefault(expectedValue) == expectedValue)
+            if (CheckFamilies(Category.Major, cat).GetValueOrDefault(expectedValue) != expectedValue)
             {
-				runes.Remove(minor);
+                runes.Remove(cat);
             }
         }
     }

src/EntityFramework_LoL/Sources/Tests/ApiTests/ChampionsControllerTestV1.cs

@@ -188,13 +188,12 @@ namespace ApiTests
 
             //Act
             var total = await stub.ChampionsMgr.GetNbItems();
-            var championsResult = await champs.Delete("Akali");
+            var championsResult = await champs.Delete("Renekton");
 
             //Assert
-            var objectResult = championsResult as OkObjectResult;
+            var objectResult = championsResult as NoContentResult;
             Assert.IsNotNull(objectResult);
 
-            Assert.AreEqual(objectResult.Value, true);
             Assert.AreNotEqual(await stub.ChampionsMgr.GetNbItems(), total);
 
         }

src/EntityFramework_LoL/Sources/Tests/ApiTests/ChampionsControllerTestV2.cs

@@ -208,13 +208,12 @@ namespace ApiTests
 
             //Act
             var total = await stub.ChampionsMgr.GetNbItems();
-            var championsResult = await champs.Delete("Akali");
+            var championsResult = await champs.Delete("Renekton");
 
             //Assert
-            var objectResult = championsResult as OkObjectResult;
+            var objectResult = championsResult as NoContentResult;
             Assert.IsNotNull(objectResult);
 
-            Assert.AreEqual(objectResult.Value, true);
             Assert.AreNotEqual(await stub.ChampionsMgr.GetNbItems(), total);
 
         }

src/EntityFramework_LoL/Sources/Tests/ApiTests/RunesControllerTest.cs

@@ -76,7 +76,7 @@ namespace ApiTests
         }
 
         [TestMethod]
-        public async Task TestCountChampion()
+        public async Task TestCountRunes()
         {
             //Arange
             var runeDto = new RuneDto
@@ -116,7 +116,7 @@ namespace ApiTests
         }
 
         [TestMethod]
-        public async Task TestPutSkin()
+        public async Task TestPutRune()
         {
             //Arange
             var runeDto = new RuneDto
@@ -157,20 +157,19 @@ namespace ApiTests
         }
 
         [TestMethod]
-        public async Task TestDeleteChampion()
+        public async Task TestDeleteRune()
         {
             //Arange
 
 
             //Act
             var total = await stub.RunesMgr.GetNbItems();
-            var runesResult = await runes.Delete("Conqueror");
+            var result = await runes.Delete("Conqueror");
 
             //Assert
-            var objectResult = runesResult as OkObjectResult;
+            var objectResult = result as NoContentResult;
             Assert.IsNotNull(objectResult);
 
-            Assert.AreEqual(objectResult.Value, true);
             Assert.AreNotEqual(await stub.RunesMgr.GetNbItems(), total);
 
         }

src/EntityFramework_LoL/Sources/Tests/ApiTests/SkinsControllerTest.cs

@@ -52,12 +52,12 @@ namespace ApiTests
             //Arange
             var SkinDto = new SkinDtoC
             {
-                Name = "Project",
+                Name = "Project Pyke",
                 Description = "Test",
                 Icon = "",
                 Image = new LargeImageDto(),
                 Price = 900,
-                ChampionName = "aatrox"
+                ChampionName = "Volibear"
             };
 
             //Act
@@ -76,17 +76,17 @@ namespace ApiTests
         }
 
         [TestMethod]
-        public async Task TestCountChampion()
+        public async Task TestCountSkins()
         {
             //Arange
             var SkinDto = new SkinDtoC
             {
-                Name = "Project",
+                Name = "Project Pyke",
                 Description = "Test",
                 Icon = "",
                 Image = new LargeImageDto(),
                 Price = 900,
-                ChampionName = "aatrox"
+                ChampionName = "Volibear"
             };
 
             //Act
@@ -127,7 +127,7 @@ namespace ApiTests
                 Icon = "",
                 Image = new LargeImageDto(),
                 Price = 900,
-                ChampionName = "aatrox"
+                ChampionName = "Volibear"
             };
             var SkinDtoPut = new SkinDtoC
             {
@@ -136,7 +136,7 @@ namespace ApiTests
                 Icon = "",
                 Image = new LargeImageDto(),
                 Price = 850,
-                ChampionName = "aatrox"
+                ChampionName = "Volibear"
             };
 
             //Act
@@ -161,20 +161,19 @@ namespace ApiTests
         }
 
         [TestMethod]
-        public async Task TestDeleteChampion()
+        public async Task TestDeleteSkin()
         {
             //Arange
 
 
             //Act
             var total = await stub.SkinsMgr.GetNbItems();
-            var skinsResult = await skins.Delete("Stinger");
+            var skinsResult = await skins.Delete("Project");
 
             //Assert
-            var objectResult = skinsResult as OkObjectResult;
+            var objectResult = skinsResult as NoContentResult;
             Assert.IsNotNull(objectResult);
 
-            Assert.AreEqual(objectResult.Value, true);
             Assert.AreNotEqual(await stub.SkinsMgr.GetNbItems(), total);
 
         }