From 6c48f7ec08a873458a4b35d34307eab27379bdd3 Mon Sep 17 00:00:00 2001 From: Corentin R <76619184+Koroh63@users.noreply.github.com> Date: Sat, 25 Mar 2023 18:38:42 +0100 Subject: [PATCH 1/5] commit adding test --- Sources/.editorconfig | 4 ++++ Sources/EF_UT/EFDataManagerChampionTest.cs | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) create mode 100644 Sources/.editorconfig diff --git a/Sources/.editorconfig b/Sources/.editorconfig new file mode 100644 index 0000000..73bb42e --- /dev/null +++ b/Sources/.editorconfig @@ -0,0 +1,4 @@ +[*.cs] + +# CS8604: Possible null reference argument. +dotnet_diagnostic.CS8604.severity = none diff --git a/Sources/EF_UT/EFDataManagerChampionTest.cs b/Sources/EF_UT/EFDataManagerChampionTest.cs index 07e3ca2..486a8be 100644 --- a/Sources/EF_UT/EFDataManagerChampionTest.cs +++ b/Sources/EF_UT/EFDataManagerChampionTest.cs @@ -47,7 +47,7 @@ namespace EF_UT var ak = (await championsManager.GetItemsByName("A", 0, 1)).First(); Assert.IsNotNull(ak); - //Assert.AreEqual("Akali", ak.Name); + Assert.AreEqual("Aatrox", ak.Name); } } } From ae3c163e456479ab839949700b7d0f48551a5b09 Mon Sep 17 00:00:00 2001 From: Corentin R <76619184+Koroh63@users.noreply.github.com> Date: Sun, 26 Mar 2023 10:57:01 +0200 Subject: [PATCH 2/5] Ajout de log --- Sources/API_LoL/API_LoL.csproj | 3 ++- .../Controllers/ChampionsController.cs | 21 +++++++++++++++++-- Sources/API_LoL/Program.cs | 1 + Sources/Api_UT/ChampionControllerTest.cs | 1 + 4 files changed, 23 insertions(+), 3 deletions(-) diff --git a/Sources/API_LoL/API_LoL.csproj b/Sources/API_LoL/API_LoL.csproj index db2c1c8..91c61d0 100644 --- a/Sources/API_LoL/API_LoL.csproj +++ b/Sources/API_LoL/API_LoL.csproj @@ -1,4 +1,4 @@ - + net6.0 @@ -11,6 +11,7 @@ + diff --git a/Sources/API_LoL/Controllers/ChampionsController.cs b/Sources/API_LoL/Controllers/ChampionsController.cs index 96adf52..46dbcaf 100644 --- a/Sources/API_LoL/Controllers/ChampionsController.cs +++ b/Sources/API_LoL/Controllers/ChampionsController.cs @@ -8,6 +8,8 @@ using System.Drawing; using System; using API_LoL.Mapper; using System.Xml.Linq; +using Microsoft.EntityFrameworkCore.Metadata.Internal; +using System.Reflection.PortableExecutable; // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 @@ -21,12 +23,17 @@ namespace API_LoL.Controllers { public ChampionsController(IDataManager Manager) { + this._logger = LoggerFactory.Create(builder => builder.AddConsole()).CreateLogger(); this.ChampionsManager = Manager.ChampionsMgr; this.SkinsManager = Manager.SkinsMgr; } + private IChampionsManager ChampionsManager; private ISkinsManager SkinsManager; + //private StubData stubData; + private ILogger logger; + private readonly ILogger _logger; // GET api//5 @@ -41,6 +48,7 @@ namespace API_LoL.Controllers { if (size - index > 10) { + _logger.LogError(message : "Oversized","Get","/Champion",400,"name : "+name,"skill : "+skill,"characteristics : "+characteristic,"index : "+index,"size : "+size,DateTime.Now); return BadRequest(); } if (!string.IsNullOrEmpty(name)) @@ -81,7 +89,11 @@ namespace API_LoL.Controllers [HttpGet("name")] public async Task GetByName(String name) { - if (string.IsNullOrEmpty(name)) return BadRequest(); + if (string.IsNullOrEmpty(name)) + { + _logger.LogError(message: "No paramater given", "Get", "/Champion/Name", 400, "name : " + name, DateTime.Now); + return BadRequest(); + } var list = await ChampionsManager.GetItemsByName(name, 0, 1); if (list.Count() == 1) { @@ -94,7 +106,11 @@ namespace API_LoL.Controllers [HttpGet("name/skins")] public async Task GetSkinsByName(String name) { - if (string.IsNullOrEmpty(name)) return BadRequest(); + if (string.IsNullOrEmpty(name)) + { + _logger.LogError(message: "No paramater given", "Get", "/Champion/Name/Skins", 400, "name : " + name, DateTime.Now); + return BadRequest(); + } var list = await ChampionsManager.GetItemsByName(name, 0, 1); if (list.Count() == 1) { @@ -134,6 +150,7 @@ namespace API_LoL.Controllers { if (champion == null) { + _logger.LogError(message: "Null paramater given", "Post", "/Champion", 422, "champion : " + champion.toString, DateTime.Now); return UnprocessableEntity(); } else diff --git a/Sources/API_LoL/Program.cs b/Sources/API_LoL/Program.cs index f1b44d0..78d467f 100644 --- a/Sources/API_LoL/Program.cs +++ b/Sources/API_LoL/Program.cs @@ -3,6 +3,7 @@ using EntityFramework; using EntityFramework.Manager; using Microsoft.AspNetCore.Mvc.ApiExplorer; using Microsoft.AspNetCore.Mvc.Versioning; +using Microsoft.Extensions.Logging; using Model; using StubLib; diff --git a/Sources/Api_UT/ChampionControllerTest.cs b/Sources/Api_UT/ChampionControllerTest.cs index 09c7875..0a93acf 100644 --- a/Sources/Api_UT/ChampionControllerTest.cs +++ b/Sources/Api_UT/ChampionControllerTest.cs @@ -3,6 +3,7 @@ using DTO; using FluentAssertions; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore.Query; +using Microsoft.Extensions.Logging; using Model; using StubLib; using System.Collections; From bc5186fa9d5cfe3f10a783928b701b89ef6c414e Mon Sep 17 00:00:00 2001 From: Corentin R <76619184+Koroh63@users.noreply.github.com> Date: Sun, 26 Mar 2023 11:36:14 +0200 Subject: [PATCH 3/5] ajout logErrors --- Sources/API_LoL/Controllers/ChampionsController.cs | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/Sources/API_LoL/Controllers/ChampionsController.cs b/Sources/API_LoL/Controllers/ChampionsController.cs index 46dbcaf..afd09fa 100644 --- a/Sources/API_LoL/Controllers/ChampionsController.cs +++ b/Sources/API_LoL/Controllers/ChampionsController.cs @@ -158,6 +158,7 @@ namespace API_LoL.Controllers var champ = await ChampionsManager.GetItemsByName(champion.Name, 0, 1); if(champ.Count() != 0 && champ.FirstOrDefault().Name == champion.Name) { + _logger.LogError(message: "Champion with this id already exists", "Post", "/Champion", 409, "champion : " + champion.toString, DateTime.Now); return Conflict(champion); } await ChampionsManager.AddItem(champion.ToChampion()); @@ -170,10 +171,16 @@ namespace API_LoL.Controllers [HttpPut("name")] public async Task Put(string name, ChampionDTO championDTO) { - if(string.IsNullOrEmpty(name)) + if (string.IsNullOrEmpty(name)) + { + _logger.LogError(message: "Null paramater given for Name", "Put", "/Champion/Name", 400,"name : "+name, "champion : " + championDTO.toString, DateTime.Now); return BadRequest(); + } if(championDTO == null) + { + _logger.LogError(message: "Null paramater given for Champion", "Put", "/Champion/Name", 422, "name : " + name, "champion : " + championDTO.toString, DateTime.Now); return UnprocessableEntity(); + } var list = await ChampionsManager.GetItemsByName(name, 0, 1); if (list.Count() == 1) { @@ -187,7 +194,10 @@ namespace API_LoL.Controllers public async Task Delete(string name) { if (string.IsNullOrEmpty(name)) - return BadRequest(); + { + _logger.LogError(message: "Null paramater given for Name", "Delete", "/Champion/Name", 400, "name : " + name, DateTime.Now); + return BadRequest(); + } var list = await ChampionsManager.GetItemsByName(name, 0, 1); if(list.Count() == 1){ return Ok(await ChampionsManager.DeleteItem(list.First())); From 5d7002c8e8228b9dd40af82d12711d2bbce125ca Mon Sep 17 00:00:00 2001 From: Corentin R <76619184+Koroh63@users.noreply.github.com> Date: Sun, 26 Mar 2023 14:59:33 +0200 Subject: [PATCH 4/5] add all logs --- .../Controllers/ChampionsController.cs | 63 +++++++++++++++---- 1 file changed, 50 insertions(+), 13 deletions(-) diff --git a/Sources/API_LoL/Controllers/ChampionsController.cs b/Sources/API_LoL/Controllers/ChampionsController.cs index afd09fa..2c35997 100644 --- a/Sources/API_LoL/Controllers/ChampionsController.cs +++ b/Sources/API_LoL/Controllers/ChampionsController.cs @@ -40,6 +40,7 @@ namespace API_LoL.Controllers [HttpGet("count")] public async Task GetCount() { + _logger.LogInformation(message: "count returned", "Get", "/Champion/Count", 200, DateTime.Now); return Ok(ChampionsManager.GetNbItems()); } @@ -56,33 +57,46 @@ namespace API_LoL.Controllers var list = await ChampionsManager.GetItemsByName(name, index, size); if (list.Count() != 0) { + _logger.LogInformation(message: "Champion returned by name", "Get", "/Champion", 200, "name : " + name, "skill : " + skill, "characteristic : " + characteristic, "index : " + index, "size : " + size, DateTime.Now); return Ok(list.Select(champion => champion?.ToDTO())); } - else { return NoContent(); } + else { + _logger.LogInformation(message: "No Champion found by name", "Get", "/Champion", 204, "name : " + name, "skill : " + skill, "characteristic : " + characteristic, "index : " + index, "size : " + size, DateTime.Now); + return NoContent(); } } else if(!string.IsNullOrEmpty(skill)) { var list = await ChampionsManager.GetItemsBySkill(skill, index, size); if (list.Count() != 0) { + _logger.LogInformation(message: "Champion returned by skill", "Get", "/Champion", 200, "name : " + name, "skill : " + skill, "characteristic : " + characteristic, "index : " + index, "size : " + size, DateTime.Now); return Ok(list.Select(champion => champion?.ToDTO())); } - else { return NoContent(); } + else { + _logger.LogInformation(message: "No Champion found by skill", "Get", "/Champion", 204, "name : " + name, "skill : " + skill, "characteristic : " + characteristic, "index : " + index, "size : " + size, DateTime.Now); + return NoContent(); } } else if(!string.IsNullOrEmpty (characteristic)) { var list = await ChampionsManager.GetItems(index, size); if (list.Count() != 0) { + _logger.LogInformation(message: "Champion returned by characteristic", "Get", "/Champion", 200, "name : " + name, "skill : " + skill, "characteristic : " + characteristic, "index : " + index, "size : " + size, DateTime.Now); return Ok(list.Select(champion => champion?.ToDTO())); } - else { return NoContent(); } + else { + _logger.LogInformation(message: "No Champion found by char", "Get", "/Champion", 204, "name : " + name, "skill : " + skill, "characteristic : " + characteristic, "index : " + index, "size : " + size, DateTime.Now); + return NoContent(); } } else { var list = await ChampionsManager.GetItems(index, size); if (list.Count() != 0) { + _logger.LogInformation(message: "Champion returned default", "Get", "/Champion", 200, "name : " + name, "skill : " + skill, "characteristic : " + characteristic, "index : " + index, "size : " + size, DateTime.Now); return Ok(list.Select(champion => champion?.ToDTO())); } - else { return NoContent(); } + else { + _logger.LogInformation(message: "No Champion found Default", "Get", "/Champion", 204, "name : " + name,"skill : " + skill,"characteristic : "+ characteristic,"index : "+index,"size : "+size, DateTime.Now); + return NoContent(); + } } } @@ -97,9 +111,13 @@ namespace API_LoL.Controllers var list = await ChampionsManager.GetItemsByName(name, 0, 1); if (list.Count() == 1) { + _logger.LogInformation(message: "Champion found", "Get", "/Champion/Name", 20, "name : " + name, DateTime.Now); return Ok(list.Select(champion => champion?.ToDTO()).First()); } - else { return NoContent(); } + else { + _logger.LogInformation(message: "No Champion found", "Get", "/Champion/Name", 204, "name : " + name, DateTime.Now); + return NoContent(); + } } @@ -120,9 +138,16 @@ namespace API_LoL.Controllers var skins = await SkinsManager.GetItemsByChampion(list.First(), 0, nb); return Ok(skins.Select(skin => skin?.ToDTO())); } - else { return NoContent(); } + else { + _logger.LogInformation(message: "No Skin found found", "Get", "/Champion/Name/Skins", 204, "name : " + name, DateTime.Now); + return NoContent(); } + } + else { + _logger.LogInformation(message: "No Champion found", "Get", "/Champion/Name/Skins", 204, "name : " + name, DateTime.Now); + + return NoContent(); } - else { return NoContent(); } + } //[HttpGet("name/skills")] @@ -155,13 +180,18 @@ namespace API_LoL.Controllers } else { - var champ = await ChampionsManager.GetItemsByName(champion.Name, 0, 1); - if(champ.Count() != 0 && champ.FirstOrDefault().Name == champion.Name) + var list = await ChampionsManager.GetItemsByName(champion.Name, 0, 1); + Champion champ = list.FirstOrDefault(); + if (champ != null) { - _logger.LogError(message: "Champion with this id already exists", "Post", "/Champion", 409, "champion : " + champion.toString, DateTime.Now); - return Conflict(champion); + if(champ.Name == champion.Name) + { + _logger.LogError(message: "Champion with this id already exists", "Post", "/Champion", 409, "champion : " + champion.toString, DateTime.Now); + return Conflict(champion); + } } await ChampionsManager.AddItem(champion.ToChampion()); + _logger.LogInformation(message: "Champion created", "Post", "Champion/Name", 201, "champion : " + champion.toString, DateTime.Now); return CreatedAtAction("Post",champion); } @@ -184,9 +214,13 @@ namespace API_LoL.Controllers var list = await ChampionsManager.GetItemsByName(name, 0, 1); if (list.Count() == 1) { + _logger.LogInformation(message: "Champion updated", "Put", "Champion/Name", 200, "name : " + name, "champion : " + championDTO.toString, DateTime.Now); return Ok(ChampionsManager.UpdateItem(list.First(), championDTO.ToChampion())); } - else { return NoContent(); } + else { + _logger.LogInformation(message: "No champion Found", "Put", "/Champion/Name", 204, "name : " + name, "champion : " + championDTO.toString, DateTime.Now); + return NoContent(); + } } // DELETE api//5 @@ -200,8 +234,11 @@ namespace API_LoL.Controllers } var list = await ChampionsManager.GetItemsByName(name, 0, 1); if(list.Count() == 1){ + _logger.LogInformation(message: "Champion Deleted", "Delete", "/Champion/Name", 200, "name : " + name, DateTime.Now); return Ok(await ChampionsManager.DeleteItem(list.First())); - }else { return NoContent(); } + }else { + _logger.LogInformation(message: "No champion Found", "Delete", "/Champion/Name", 204, "name : " + name, DateTime.Now); + return NoContent(); } } } } From 848075afc1f4897c53f82b4e411c9a1f04b4f431 Mon Sep 17 00:00:00 2001 From: Corentin R <76619184+Koroh63@users.noreply.github.com> Date: Sun, 26 Mar 2023 15:07:39 +0200 Subject: [PATCH 5/5] db changes --- Sources/API_LoL/champion.db-shm | Bin 0 -> 32768 bytes Sources/API_LoL/champion.db-wal | Bin 0 -> 16512 bytes 2 files changed, 0 insertions(+), 0 deletions(-) create mode 100644 Sources/API_LoL/champion.db-shm create mode 100644 Sources/API_LoL/champion.db-wal diff --git a/Sources/API_LoL/champion.db-shm b/Sources/API_LoL/champion.db-shm new file mode 100644 index 0000000000000000000000000000000000000000..39d4916c878b6cc02f09651befbe37e6e088f260 GIT binary patch literal 32768 zcmeI)u?@m75CA|Y(1B3OEJ05;pkxH5pd^9?JO?EmQ?LROEWid}M-b5=IuzYYueWUL zt-k?WU*{o5nX(9>8mBr*d06bHVRKroV-wHuwrjSt_OiSm>mTo@R$b)2kB@k5_a(nS zO8Kt+fdv5q1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1O_NjbU&^Pa4;hg_$p9_{3nqhK!5-N z0t5&UAV7cs0RjXF5FkK+009C72oNAZfB*pk1PBlyK!5-N0t5&UAV7cs0RjXF5FkK+ K009F3DDVWtnI(Y$ literal 0 HcmV?d00001 diff --git a/Sources/API_LoL/champion.db-wal b/Sources/API_LoL/champion.db-wal new file mode 100644 index 0000000000000000000000000000000000000000..932d20caf04e247bef2ba22ec0730725e621b6c9 GIT binary patch literal 16512 zcmeI&J&0UY6ae72JDC}0XP0La)*;PlWDv45E@X9MBP(eQ5e3V5=e;wtcXQvpZ|~1! zwvt3_v{7VIu>ErZ=^j=z}M=vUCo`(fkfCX591z3OuSbzmsfCX59 z1z6x20^P+7}?s(CRkMEIrvDXs$GRON-rsQ=P^-UDDn_Besk?1IwL8ud{Q! zFYr{oz-x!!e{%5Z(RZ<4puPI&sd@pr<%0!SfCX591z3OuSbzmsfCc`C0-wIuZm)l~ zc5OY`(OTjKp(kiDI6MndXVx5uk-`GChtgK_%w+VUZVBi-1dV`tEa-J1CJ4Fl)tpX! zoOvsZ&7~I7qJz?esgc$}j!+(0b4BWE?j#Q2-Rfq6P<;ieZ;Fwn&eXgx+KY*%t2}_F zabmxVW)|F8a3annY2rEn$b_Rf;*Dj7&T1ipVsbqCD6#f+Jcpc!ZRK`i89aQtec)HSYSO>C*DpTnsDN$@ios5&P zn6;!~Jy=o7d|^mwW|W$(zENl)qY=nd3GW7QN!UVCa1Qn`%wR00#!4D;F;a|9>ZzeD zEjY?@BvEe&Sx}lLP@JftL>01KTAvT(Xhg9Sl?e`%fU&XEKko->WR1tnW3Vw>B?=mW zCP$kGY9S~^)t6e+I%|R`(U#TRhdKya0@Z&)bo>!G5xk7Ti>?$s%~jp>4$R19q)$=A zwH08IVzcy%OG#;{{Sf1+S7tv**fW&cVAuQ7y)_&vqc$9UB!jCsQf4xkW1dk7dVzL&`((YqZ7Lt& mg9TWC1z3OuSbzmsfCX591z3OuSm3`PP*(xOjjn%JFYpfx#-R)V literal 0 HcmV?d00001