From a1dadd05d72ed47b5cce70c4b21cfe26dfc39343 Mon Sep 17 00:00:00 2001 From: Emre Date: Thu, 9 Mar 2023 21:09:03 +0100 Subject: [PATCH] just better code :white_check_mark: --- .vs/LolProject/v17/.suo | Bin 12800 -> 13824 bytes .../Controllers/v1/ChampionsController.cs | 10 +++---- .../Controllers/v2/ChampionsController.cs | 28 +++++++++--------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/.vs/LolProject/v17/.suo b/.vs/LolProject/v17/.suo index 25c051124196f9ca1e34268cca7c7a9a6f703eec..f873e9efcae00992fc212447b6f36886abe92f29 100644 GIT binary patch literal 13824 zcmeHN&u<$=6n<{`(T1NT&_XE?N`)$fL)^r_f~Z217AQ@VCTUWkNXU-YX<8>X-VLQx z+z}H001^`1xp3pk0dc8Rt{jly#Faau;rnKH?Deu{!ufIL~n*_p1*(wCzA*=2BLFE5pMPHyjGdzlSI?v}v@H~vj{y&7c5AiWXzGHY2 zdA~f%oBRnF3d(+Vi~Z}B$o+u(fVN-SzJ5o0=XTBK1713W z^eIHzKlgoIk23yzV*k|0?hTx)sK|K_zSrjh%efx({A;;`C_5ae_bi@|AU=oqJmL$8 zTHc@TUQOMdJ@e~6ET7E(-8t`iRHwjr>vB~#!FHQSO?fZOSA`?spS<^x53)_SH2U{N zygu%UECJUB?m2K>8%%gnE-Mc1$eLotc63uh{=FA6nuqofSFcC#OYX`*-cOd_1otk1 zho3<|YIwFq-wZ7D#F1(AiuWT+{kD5G8H4}R&Rlen8MMohZh9@Rs9Qh7_~Qd!MRRGXN8rFY$jC|Uik zbN}napGAK*fl5D=e=iK%``F&AG4Q!omb}gc$A1dQ7FOL=c!TO{FLtmp{XOw2ddURV zAAKnFX_@Mu^7{M<;=4#Z30+Uro9IVFX7NP-kX!0Ot0V_};&M+n#phk`KCh7=e)#x3 z;gIBb4E@uO^j;Typ2usLfkx!1*X~H1^~b%coBlN)pbc1vz4`e+O;i1A-x)^{ z)Ia%$YkzfEWmD;ba@_*=U+Rv^rO0k+Bua-;MYBu|c z5H@?u{UPO@V)< zv`^Ud{Gq*Qi=G3=yaEec$5|J=V=qe~9Mo5O6!_#a#Afil>YC+Q&F^Il)7Uxafv{y6 z4kI!67kwrA{P#24Szyx(!rNC< zMxlvq^nsjnQ{F-e8A(IVLxSE4w|6HoezrxQuj%-ydvY)aQ+$0(b8g02+T03~S9hDLzEoWPKca&@M*dp{ir#6}3LLl@|!j2*%%9d#3pG)oA|N4?fqa z1CLEp%@fy%$W#n`-c|JX-$jgLD0T#F&3FA#y&3&64d{&1w6W6!#_;u&Ul;dn22Zl6VLT0p6^e*(4TnGSe%OIL=G4(-QsO9emM3I53(&II7`Xd zGuTJ@8x=a)c$8%LyWy|C{NV7u^71cdKfQVAi$8u0mr6>zX&|xx#QwXj4U_W3{!O&B zdu5XEKZDPW=6M6TjVu{^}3fe}gVYinROPDW?4!{?f2Az7H!Oq|A@`Z|76K znTvy^zk^N7q^#mgxUKGdHuC%q$#2p0Ci6c-GAN^0K!254Rrh4-{}N){`uxgBv@mb` zs=W@4ZL&YPY^$=7<$$ zxfxrt=?eSSKM zr_eVFxiyo6eg!%uZIA9wx|X#)`s%|^v14>TTYo}SuB_49f9&{2^sLcUQ45P9ZFKF@ z_Fno$ibzMNhCX)9j%&0{P!vlL6CL1SQ|j%CP4Z|Xto{bJtqS-!you@MgKZntn4_2; zh2dTpA&%@YBf3Ad>@^9MoHBrFk{7ack3;=W0l2IQzBtcApHraas!2!)GpG@p?;W@V zVn<;y*JBw83={?K2V{5{2*W(*hu47xe5GMH;Z@+=3bOam8O!F=i(9!|HnEg$G!mI~ zJ(bwpT+AgDC7W;LbB!~p?3T$y*w1jw&eE~n)p$C(4p~D zj(1a^?(X%Q{p8$@rW@zhu*48%+z|y5Z{7* zQHLGh+97`og&2L3?}ALQp|F{Bg3$6;W!CLj9Y4{be;OQ~^!O${QB1X#=lxN{ZV{yL x_Rv6=1Y-;fCfNg@qqqN795qrrG7U^5sywu#cT`tN`c)~`CRjw1ZE{+$`~Yu>@sI!j diff --git a/src/EntityFramework_LoL/Sources/ApiLol/Controllers/v1/ChampionsController.cs b/src/EntityFramework_LoL/Sources/ApiLol/Controllers/v1/ChampionsController.cs index 53c9853..26fa7b5 100644 --- a/src/EntityFramework_LoL/Sources/ApiLol/Controllers/v1/ChampionsController.cs +++ b/src/EntityFramework_LoL/Sources/ApiLol/Controllers/v1/ChampionsController.cs @@ -25,7 +25,7 @@ namespace ApiLol.Controllers.v1 [HttpGet] public async Task Get([FromQuery] PageRequest pageRequest) { - _logger.LogInformation("Executing {Action} with parameters: {Parameters}", nameof(Get), pageRequest); + _logger.LogInformation("Executing {Action} - CHAMPION - V1.0 with parameters: {Parameters}", nameof(Get), pageRequest); IEnumerable dtos = (await _manager.ChampionsMgr.GetItems(pageRequest.index, pageRequest.count, pageRequest.orderingPropertyName, pageRequest.descending)) .Select(x => x.ToDto()); return Ok(dtos); @@ -36,7 +36,7 @@ namespace ApiLol.Controllers.v1 [HttpGet("{name}")] public async Task Get(string name) { - _logger.LogInformation("method {Action} call with {name}", nameof(Get), name); + _logger.LogInformation("method {Action} - CHAMPION - V1.0 call with {name}", nameof(Get), name); var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems())) .Select(x => x.ToDto()); @@ -49,7 +49,7 @@ namespace ApiLol.Controllers.v1 public async Task Post([FromBody] ChampionDto champion) { - _logger.LogInformation("method {Action} call with {item}", nameof(Post), champion); + _logger.LogInformation("method {Action} - CHAMPION - V1.0 call with {item}", nameof(Post), champion); return CreatedAtAction(nameof(Get), (await _manager.ChampionsMgr.AddItem(champion.ToModel())).ToDto()); @@ -60,7 +60,7 @@ namespace ApiLol.Controllers.v1 public async Task Put(string name, [FromBody] ChampionDto champion) { - _logger.LogInformation("method {Action} call with {name} and {item}", nameof(Put), name, champion); + _logger.LogInformation("method {Action} - CHAMPION - V1.0 call with {name} and {item}", nameof(Put), name, champion); var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems())); return Ok((await _manager.ChampionsMgr.UpdateItem(dtos.First(), champion.ToModel())).ToDto()); @@ -72,7 +72,7 @@ namespace ApiLol.Controllers.v1 public async Task Delete(string name) { - _logger.LogInformation("method {Action} call with {name}", nameof(Delete), name); + _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())); diff --git a/src/EntityFramework_LoL/Sources/ApiLol/Controllers/v2/ChampionsController.cs b/src/EntityFramework_LoL/Sources/ApiLol/Controllers/v2/ChampionsController.cs index 838fe00..04f68c3 100644 --- a/src/EntityFramework_LoL/Sources/ApiLol/Controllers/v2/ChampionsController.cs +++ b/src/EntityFramework_LoL/Sources/ApiLol/Controllers/v2/ChampionsController.cs @@ -27,6 +27,7 @@ namespace ApiLol.Controllers.v2 [HttpGet] public async Task Get([FromQuery] PageRequest pageRequest) { + _logger.LogInformation("Executing {Action} - CHAMPION - V2.0 with parameters: {Parameters}", nameof(Get), pageRequest.count); try { int nbTotal = await _manager.ChampionsMgr.GetNbItems(); @@ -40,7 +41,6 @@ namespace ApiLol.Controllers.v2 return BadRequest($"Champion limit exceed, max {nbTotal}"); } - _logger.LogInformation("Executing {Action} with parameters: {Parameters}", nameof(Get), pageRequest.count); IEnumerable dtos = (await _manager.ChampionsMgr.GetItems(pageRequest.index, pageRequest.count)) .Select(x => x.ToDto()); return Ok(dtos); @@ -55,6 +55,7 @@ namespace ApiLol.Controllers.v2 [HttpGet, MapToApiVersion("3.0")] public async Task GetV3([FromQuery] PageRequest pageRequest) { + _logger.LogInformation("Executing {Action} - CHAMPION - V3.0 with parameters: {Parameters}", nameof(Get), pageRequest); try { int nbTotal = await _manager.ChampionsMgr.GetNbItems(); @@ -68,7 +69,6 @@ namespace ApiLol.Controllers.v2 return BadRequest($"Champion limit exceed, max {nbTotal}"); } - _logger.LogInformation("Executing {Action} with parameters: {Parameters}", nameof(Get), pageRequest); IEnumerable dtos = (await _manager.ChampionsMgr.GetItems(pageRequest.index, pageRequest.count, pageRequest.orderingPropertyName, pageRequest.descending)) .Select(x => x.ToDto()); return Ok(new { Data = dtos, index = pageRequest.index, count = pageRequest.count, total = nbTotal}); @@ -83,15 +83,15 @@ namespace ApiLol.Controllers.v2 [HttpGet("{name}")] public async Task Get(string name) { + _logger.LogInformation("method {Action} - CHAMPION - V2.0 call with {name}", nameof(Get), name); try { - _logger.LogInformation("method {Action} call with {name}", nameof(Get), name); var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems())) .Select(x => x.ToDto()); if (dtos.IsNullOrEmpty()) { _logger.LogWarning($"{name} was not found"); - return NotFound(); + return NotFound($"{name} was not found"); } return Ok(dtos.First()); } @@ -105,16 +105,16 @@ namespace ApiLol.Controllers.v2 [HttpPost] public async Task Post([FromBody] ChampionDto champion) { + _logger.LogInformation("method {Action} - CHAMPION - V2.0 call with {item}", nameof(Post), champion); try { - _logger.LogInformation("method {Action} call with {item}", nameof(Post), champion); - var dtos = (await _manager.ChampionsMgr.GetItemByName(champion.Name, 0, await _manager.ChampionsMgr.GetNbItems())); - if (!dtos.IsNullOrEmpty()) + if (await _manager.ChampionsMgr.GetNbItemsByName(champion.Name) == 0) { - return BadRequest("Name is already exist"); - } - return CreatedAtAction(nameof(Get), + return CreatedAtAction(nameof(Get), (await _manager.ChampionsMgr.AddItem(champion.ToModel())).ToDto()); + } + _logger.LogWarning($"Name : {champion.Name} is already exist"); + return BadRequest($"Name : {champion.Name} is already exist"); } catch (Exception error) { @@ -126,9 +126,9 @@ namespace ApiLol.Controllers.v2 [HttpPut("{name}")] public async Task Put(string name, [FromBody] ChampionDto champion) { + _logger.LogInformation("method {Action} - CHAMPION - V2.0 call with {name} and {item}", nameof(Put), name, champion); try { - _logger.LogInformation("method {Action} call with {name} and {item}", nameof(Put), name, champion); var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems())); if (dtos.IsNullOrEmpty()) { @@ -154,9 +154,9 @@ namespace ApiLol.Controllers.v2 [HttpGet("/{name}/skins")] public async Task> GetChampionsSkins(string name) { + _logger.LogInformation("method {Action} - CHAMPION - V2.0 call with {name}", nameof(GetChampionsSkins), name); try { - _logger.LogInformation("method {Action} call with {name}", nameof(GetChampionsSkins), name); var champions = await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems()); //skinsDTO IEnumerable res = champions.First().Skins.Select(e => e.ToDto()); @@ -174,7 +174,7 @@ namespace ApiLol.Controllers.v2 { try { - _logger.LogInformation("method {Action} call with {name}", nameof(GetChampionsSkills), name); + _logger.LogInformation("method {Action} - CHAMPION - V2.0 call with {name}", nameof(GetChampionsSkills), name); var champions = await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems()); //SkillDTO IEnumerable res = champions.First().Skills.Select(e => e.ToDto()); @@ -191,9 +191,9 @@ namespace ApiLol.Controllers.v2 [HttpDelete("{name}")] public async Task Delete(string name) { + _logger.LogInformation("method {Action} - CHAMPION - V2.0 call with {name}", nameof(Delete), name); try { - _logger.LogInformation("method {Action} call with {name}", nameof(Delete), name); var dtos = (await _manager.ChampionsMgr.GetItemByName(name, 0, await _manager.ChampionsMgr.GetNbItems())); if (dtos.IsNullOrEmpty()) {