From fee25f5dff9e89536a487de1e99ee283ef5976f0 Mon Sep 17 00:00:00 2001 From: Corentin R <76619184+Koroh63@users.noreply.github.com> Date: Sun, 26 Mar 2023 18:13:52 +0200 Subject: [PATCH] adding client console --- Sources/API_LoL/champion.db | Bin 45056 -> 45056 bytes Sources/API_LoL/champion.db-shm | Bin 32768 -> 32768 bytes Sources/API_LoL/champion.db-wal | Bin 16512 -> 0 bytes .../HttpClient/HttpClientManager.Champion.cs | 14 +++++++++----- Sources/HttpClient/HttpClientManager.cs | 2 -- Sources/LeagueOfLegends.sln | 11 ++++++++++- 6 files changed, 19 insertions(+), 8 deletions(-) diff --git a/Sources/API_LoL/champion.db b/Sources/API_LoL/champion.db index cfdeed20a24e3204770fcb3599b2dbddcd974542..b651b93840b411a8121f5aa5d734d084b8f3456f 100644 GIT binary patch delta 803 zcmXw%v1=7U5XNIfLLjm)RZ7R|HOXBb7*Pu)V5>y5v68*JxtEE1yO*8a%S-iQVPoq* zAlUd)36Vfby*6NLVG&|uVH6y(HVtm~fiFqxQH$Xy1Vu zx+?S1E%lYNL65Ec6%nimb&ZeRB=S12?uL;}?g=2*EFiQWF@dMff-Xz4Bp_gQh#rkW z&<*AwXNeIQrQcF1?RpAD`++;j+LK`PX7V0K3^dpiGvK5)j>%buc2>C{f40+QpsLHI zAtuR5;HusY6U@ifA{)T#nu>Xf;xiX-zWrp-Lp~J=iPh-93G8TJk>D}xVVppz8|O(h z=TaRW*~W=a4=g@2Lc5`<5~D5(C|an|#C%s)^o+7h;3X^<8H|R~dFd~PQHs0^m~{1?*yhrl`p>O!8k3cd_$j{}3t zIF|(oMz>xK9tF47$;)`FGFSmd;SjxRQoy?Xp$bbEAnYwOO|=+@iQ8#{xu1@%Y$Qa{u;b*|1-d$PLu SUM(+QUAxjZoqS2}AN>W6L@+A= delta 100 zcmZp8z|`=7X#=Z(Apcwj{?Gg``0wza=Re55jeqWDMTK^LNpW^oNl8hD;*z4wymVx8 s@;3PZfgKF|-}vA1Kjy!|e}?}s|BlUq28;N)xR@mwAxbwN(zj~>0QNK^y#N3J diff --git a/Sources/API_LoL/champion.db-shm b/Sources/API_LoL/champion.db-shm index 39d4916c878b6cc02f09651befbe37e6e088f260..fe9ac2845eca6fe6da8a63cd096d9cf9e24ece10 100644 GIT binary patch delta 80 zcmZo@U}|V!;+1%$%K!t66BkO0TChv7nNGgVi7p`mlYpuI4+Il)WHxT_aoxB<#|i+R CITQr| delta 171 zcmZo@U}|V!s+V}A%K!pQK+MR%Aix5oxq*14MH3H0*^YpOe#`!I{f`?h>-g&LdwkeP vs(PSNU;r}rKN5fnPps$U1zF7u#9(@3W4bFdBLnls#@|fLObjd=8=1`k3!pBk diff --git a/Sources/API_LoL/champion.db-wal b/Sources/API_LoL/champion.db-wal index 932d20caf04e247bef2ba22ec0730725e621b6c9..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/Sources/HttpClient/HttpClientManager.Champion.cs b/Sources/HttpClient/HttpClientManager.Champion.cs index 9ffc79b..fa2eed6 100644 --- a/Sources/HttpClient/HttpClientManager.Champion.cs +++ b/Sources/HttpClient/HttpClientManager.Champion.cs @@ -1,4 +1,6 @@ -using Model; +using DTO; +using DTO.Mapper; +using Model; using System; using System.Collections.Generic; using System.Linq; @@ -34,20 +36,22 @@ namespace HttpClient public async Task AddItem(Champion? item) //return le champion ajouté, null sinon ? { if(item==null) throw new ArgumentNullException("item is null"); - var response = await httpc.PostAsJsonAsync("/Champion?Name = " + item.Name, item); + var response = await httpc.PostAsJsonAsync("v1/Champions?Name = " + item.Name, item); return response.IsSuccessStatusCode ? item : null; } public async Task DeleteItem(Champion? item) { - HttpResponseMessage response = await httpc.DeleteAsync("/Champion?Name=" + item.Name); + HttpResponseMessage response = await httpc.DeleteAsync("v1/Champions?Name=" + item.Name); return response.IsSuccessStatusCode; } - public Task> GetItems(int index, int count, string? orderingPropertyName = null, bool descending = false) + public async Task> GetItems(int index, int count, string? orderingPropertyName = null, bool descending = false) { - return httpc.GetFromJsonAsync>("/Champion?index="+index+"&size="+count); + + IEnumerable champdto = await httpc.GetFromJsonAsync>("v1/Champions?index="+index+"&size="+count); + return champdto.Select(c => c.ToChampion()); } diff --git a/Sources/HttpClient/HttpClientManager.cs b/Sources/HttpClient/HttpClientManager.cs index 49ddb70..f6947da 100644 --- a/Sources/HttpClient/HttpClientManager.cs +++ b/Sources/HttpClient/HttpClientManager.cs @@ -8,8 +8,6 @@ namespace HttpClient public System.Net.Http.HttpClient httpC { get; set; } = new System.Net.Http.HttpClient(); - public string BaseAddress; - public HttpClientManager() { ChampionsMgr = new ChampionManager(this, httpC); diff --git a/Sources/LeagueOfLegends.sln b/Sources/LeagueOfLegends.sln index 007e972..4ce78a2 100644 --- a/Sources/LeagueOfLegends.sln +++ b/Sources/LeagueOfLegends.sln @@ -26,7 +26,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api_UT", "Api_UT\Api_UT.csp EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EF_UT", "EF_UT\EF_UT.csproj", "{74F469C3-A94A-4507-9DC7-7DBADCD18173}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HttpClient", "HttpClient\HttpClient.csproj", "{DE2E40D5-1B4D-491C-B7E7-4E91B32DB93F}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HttpClient", "HttpClient\HttpClient.csproj", "{DE2E40D5-1B4D-491C-B7E7-4E91B32DB93F}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Client", "Client", "{6570AF99-3E74-4CAA-AEB0-EEFE4F79780F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApplication", "ConsoleApplication\ConsoleApplication.csproj", "{53A195F7-FB7C-44E8-AB82-4D775C7D9477}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -70,6 +74,10 @@ Global {DE2E40D5-1B4D-491C-B7E7-4E91B32DB93F}.Debug|Any CPU.Build.0 = Debug|Any CPU {DE2E40D5-1B4D-491C-B7E7-4E91B32DB93F}.Release|Any CPU.ActiveCfg = Release|Any CPU {DE2E40D5-1B4D-491C-B7E7-4E91B32DB93F}.Release|Any CPU.Build.0 = Release|Any CPU + {53A195F7-FB7C-44E8-AB82-4D775C7D9477}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {53A195F7-FB7C-44E8-AB82-4D775C7D9477}.Debug|Any CPU.Build.0 = Debug|Any CPU + {53A195F7-FB7C-44E8-AB82-4D775C7D9477}.Release|Any CPU.ActiveCfg = Release|Any CPU + {53A195F7-FB7C-44E8-AB82-4D775C7D9477}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -78,6 +86,7 @@ Global {B01D7EF2-2D64-409A-A29A-61FB7BB7A9DB} = {2C607793-B163-4731-A4D1-AFE8A7C4C170} {20A1A7DC-1E93-4506-BD32-8597A5DADD7B} = {C76D0C23-1FFA-4963-93CD-E12BD643F030} {74F469C3-A94A-4507-9DC7-7DBADCD18173} = {C76D0C23-1FFA-4963-93CD-E12BD643F030} + {53A195F7-FB7C-44E8-AB82-4D775C7D9477} = {6570AF99-3E74-4CAA-AEB0-EEFE4F79780F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {92F3083D-793F-4552-8A9A-0AD6534159C9}