From 91c36e266c5f7758f35b31c53215e35e9a913e5a Mon Sep 17 00:00:00 2001
From: Emre <Emre.kartal@etu.uca.fr>
Date: Sun, 26 Mar 2023 14:36:32 +0200
Subject: [PATCH] correct some errors :bug:

---
 .vs/LolProject2/v17/.wsuo                     | Bin 0 -> 11776 bytes
 .../Sources/ApiLol/Program.cs                 |   7 ++++-
 .../{Client.csproj => ApiManager.csproj}      |   0
 .../Sources/Client/ChampionHttpClient.cs      |  27 +++++++++---------
 .../Sources/Client/Program.cs                 |   4 ++-
 .../Sources/DbManager/DbManager.Runes.cs      |   9 +++---
 .../Sources/DbManager/Mapper/RuneMapper.cs    |   2 +-
 .../Sources/LeagueOfLegends.sln               |   2 +-
 8 files changed, 30 insertions(+), 21 deletions(-)
 create mode 100644 .vs/LolProject2/v17/.wsuo
 rename src/EntityFramework_LoL/Sources/Client/{Client.csproj => ApiManager.csproj} (100%)

diff --git a/.vs/LolProject2/v17/.wsuo b/.vs/LolProject2/v17/.wsuo
new file mode 100644
index 0000000000000000000000000000000000000000..a3c6a23b9c918ddb4773fdccbeab0281ee2123ba
GIT binary patch
literal 11776
zcmeHNUvC>l5MQShDE~_!K!FlMgert1JF$~Eh$<v)0jX|6oisc|s{HQ~lf<@chqgjU
zmEe^R0pg7p_y9;e@xntZ@x%jFEAcgG`2F^7?e+QYvUhHxhI*{c?e5L)?99&0&d%lb
zt&?}Z|K-#@;exZ`n7F@pLOibZ$F#b5L5SzkX5an2y*<8S9n}FGAqiX-HT+s)RGb%8
zJR9N$x6&9!#PRl?AKz!x-JkwgymR%h*we&2VIwbtVoiJ@J_U6Pwe#ZoKC^Vc9uY%r
z`V@QjTkqC8=!W`AQ1nT+F1E3PhA5-tAd5Uo*}?OBjEkX|zTJL!dOz*vXQyLH?1IX+
zsDOW#4UO_S^fdH=9(B@x4E;kWru@GJTxHjk!@oKMsK4mU#qN`+Kk2le!Sh*^=TKfo
zq1|)O`5eZRTgowP58!A>;4tm~_O~7T|BXroQ1*A2_CE%?1N)caZ~IRA1Ns5l?n|iC
zu4&I~bF28&?f)tCp{oa;@agYC9CSPs65zi26}9jBd-{LXrVa6YP;EYWE{veOg7PZL
zYbd8sUPpNYMaOm59}0myVvEQj;@OrlNCma3Sd@P)L>?RHZO9nNeuK^PfcFu9PzRLQ
zJWzVN7%L>4-X&2$^p^#-hC`b%7bDT8xFTkI#=1MkK%eoX@<;CXUTwxVjF$+D;64vp
zq*ejtYdx#5@%;WG{%Z418TjGp{nUHaJ_niwNO}W5#+_?Y;zhBER#PDbJVztYXZ%JV
zPguZy*Tk0C0o?|krg5)5nl?QY<GoMCeyTs{c^WUzI0!3J`di{6q~FA@=fF8*@Rle_
zt=vxrjDL?|E_Ln%(N*u>M8yd|<b8u0*MQFDp$iwVj%_J>6`7Q=l9sPl%terY_x{%;
zr#qlYtzQHEswhDQ*AN@kAd?DuZ4300MFRZuT;_h7>K}36a}2<(f8?L^bGQfYKr`tb
zg5cf0`R~^MEab2wHQ+{<EWCK<y5N68+aGmh#bL_L{{l3j3{BX=ZLlU~K~JRbiZjr8
zq#%Eub(B4!`>l72v6j+5H+`EDEy2EteuQ<@;UDRnsR``WVH)&Fm*=i2ea3dYGZJ*p
zvf!ImV0)qo==`p<$r^U#W6-UkT^E;tL2b2n<Sgj(jOUqeN}v9MI!iF6zXIyiMcP8$
zq0RBIzZm7o7{io4$0_<bSYOe(g?x#*OW>>_CZPY_=i&rBR1KV$q$k*goLZblfdBU1
zo6;Y}IJN&_=<}Rv!DI7Ou42`jm}fo${kJhr-T!k^+Z%E=Y8fe9Mqd$yJbs2fr$l%*
zHrrkr6F4vn`aDk<>zVSe`@f+5Uk24Geq~7gg5<iRcZxprKeYU*`)dD#=wFeXx8N)C
z@Pz7w;)oI?vnjO@@{cjLCGP~auAnE+EBatU5dAe71yscnG@iRbIk;gm0{?XV>i(<d
z`|;+l_p;yp@TY2<K6moXR=M%})u`i#|GD_h-#4R=H(lod&szet1N!5r(C>KaVL$X~
zM;zaoqdt$OG4#8BV?sWNopt*l7<8+<jE>q*pFYn)*JIkwMWLnQm?&d8hVoxVSwtkU
zE>_{wdD=BmXY9lJx{L*Q7v`C`E>B0shQwh^u-(pK+Bbzs^qWJ!`_Ft#+lDTo!3kMT
zd#`N*_lhRY69bf0XQodQxUK8Ic)Jx`)5oxW5Ww6+7JFq!hB=(eyvMd=q^fRkLVSp?
znLKqr=ve~qLG&Tx$*EZ@U9i&eVzE$)r&8r&yfB+7##5!~f|Z(1WlBj)N>*NXIZtJt
zX@`Z0+{)bK<XmFzD=S~HGE>P+JT+4;#8a7>GN!Pm<E4x>Gi4R>X)B%n+Qv_W#7~;z
z$FZKNaOml9=(FbN6izZEv&j(5%K4{5u4l#=pQi)$#veYv#mrN581KozG{q=#QM8vN
z?jige1hnIRz@3BD+q|RbZPpJm|I7IYaJUi}<o~YYwBR}aXy*U2h-X&eaoqWiQ7sc1
z<X@uX|Hd#OJ?n!4-C`cpoMGlU%Jkj&NALWnzckJu|H1!f;aNdB_+xh7aPL)&?55BE
z!(p6VhgJG#y*qP3|3d%&4Zjzu{F@hj`wJ8^fhGBUAZR_zzw&$1Fp4Svj2Qgrck=Jd
zw%T_Np!)*tPu&4b>GNBS%0IdJ@6b2S|4aGv+pZ~np7V+!H~m5WpE=LN%m2IOe+2En
poqILazyF#2$NI5<WrtDoxBcdSc^2^epht+3e;(wI)ec5`{s(n^Cwl+@

literal 0
HcmV?d00001

diff --git a/src/EntityFramework_LoL/Sources/ApiLol/Program.cs b/src/EntityFramework_LoL/Sources/ApiLol/Program.cs
index 591bbb2..3f60ffd 100644
--- a/src/EntityFramework_LoL/Sources/ApiLol/Program.cs
+++ b/src/EntityFramework_LoL/Sources/ApiLol/Program.cs
@@ -1,5 +1,6 @@
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Versioning;
+using Microsoft.OpenApi.Models;
 using Model;
 
 var builder = WebApplication.CreateBuilder(args);
@@ -9,7 +10,11 @@ var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddControllers();
 // Learn more about configuring Swagger/OpenAPI at https://aka.ms/aspnetcore/swashbuckle
 builder.Services.AddEndpointsApiExplorer();
-builder.Services.AddSwaggerGen();
+builder.Services.AddSwaggerGen(options =>
+{
+    options.SwaggerDoc("v1", new OpenApiInfo { Title = "My API v1", Version = "v1" });
+    options.SwaggerDoc("v2", new OpenApiInfo { Title = "My API v2", Version = "v2" });
+});
 
 
 builder.Services.AddApiVersioning(opt =>
diff --git a/src/EntityFramework_LoL/Sources/Client/Client.csproj b/src/EntityFramework_LoL/Sources/Client/ApiManager.csproj
similarity index 100%
rename from src/EntityFramework_LoL/Sources/Client/Client.csproj
rename to src/EntityFramework_LoL/Sources/Client/ApiManager.csproj
diff --git a/src/EntityFramework_LoL/Sources/Client/ChampionHttpClient.cs b/src/EntityFramework_LoL/Sources/Client/ChampionHttpClient.cs
index 0ea6c35..c1e2f46 100644
--- a/src/EntityFramework_LoL/Sources/Client/ChampionHttpClient.cs
+++ b/src/EntityFramework_LoL/Sources/Client/ChampionHttpClient.cs
@@ -21,22 +21,23 @@ namespace Client
         public async Task<IEnumerable<ChampionDto>> GetChampion(int index, int count)
         {
             var url = $"{UrlApiChampions}?index={index}&count={count}";
-            return await _httpClient.GetFromJsonAsync<IEnumerable<ChampionDto>>(url);
+            var Response = await _httpClient.GetFromJsonAsync<PageResponse<ChampionDto>>(url);
+            return Response.Data;
         }
-/*        public async void Add(ChampionDto champion)
-        {
-            await _httpClient.PostAsJsonAsync<ChampionDto>(ApiChampions, champion);
-        }*/
+        /*        public async void Add(ChampionDto champion)
+                {
+                    await _httpClient.PostAsJsonAsync<ChampionDto>(ApiChampions, champion);
+                }*/
 
-/*        public async void Delete(ChampionDto champion)
-        {
-            await _httpClient.DeleteAsync(champion.Name);
-        }
+        /*        public async void Delete(ChampionDto champion)
+                {
+                    await _httpClient.DeleteAsync(champion.Name);
+                }
 
-        public async void Update(ChampionDto champion)
-        {
-            await _httpClient.PutAsJsonAsync<ChampionDto>(ApiChampions, champion);
-        }*/
+                public async void Update(ChampionDto champion)
+                {
+                    await _httpClient.PutAsJsonAsync<ChampionDto>(ApiChampions, champion);
+                }*/
 
     }
 }
diff --git a/src/EntityFramework_LoL/Sources/Client/Program.cs b/src/EntityFramework_LoL/Sources/Client/Program.cs
index e0dab23..70ce525 100644
--- a/src/EntityFramework_LoL/Sources/Client/Program.cs
+++ b/src/EntityFramework_LoL/Sources/Client/Program.cs
@@ -34,4 +34,6 @@ if (championToUpdate != null)
     Console.WriteLine($"{championToUpdate.Name} updated.");
 }
 
-*/
\ No newline at end of file
+*/
+
+Console.ReadLine();
\ No newline at end of file
diff --git a/src/EntityFramework_LoL/Sources/DbManager/DbManager.Runes.cs b/src/EntityFramework_LoL/Sources/DbManager/DbManager.Runes.cs
index a40a901..b8f6a1f 100644
--- a/src/EntityFramework_LoL/Sources/DbManager/DbManager.Runes.cs
+++ b/src/EntityFramework_LoL/Sources/DbManager/DbManager.Runes.cs
@@ -1,4 +1,5 @@
 using DbManager.Mapper;
+using Microsoft.EntityFrameworkCore;
 using Model;
 
 namespace DbLib
@@ -40,22 +41,22 @@ namespace DbLib
                 = (rune, substring) => rune.Name.Contains(substring, StringComparison.InvariantCultureIgnoreCase);
 
             public async Task<IEnumerable<Rune?>> GetItemByName(string substring, int index, int count, string? orderingPropertyName = null, bool descending = false)
-                => parent.DbContext.Runes.GetItemsWithFilterAndOrdering(
+                => parent.DbContext.Runes.Include(r => r.Image).GetItemsWithFilterAndOrdering(
                     rune => filterByName(rune.ToModel(), substring),
                     index, count, orderingPropertyName, descending).Select(c => c.ToModel());
 
             public async Task<IEnumerable<Rune?>> GetItems(int index, int count, string? orderingPropertyName = null, bool descending = false)
-                => parent.DbContext.Runes.GetItemsWithFilterAndOrdering(
+                => parent.DbContext.Runes.Include(r => r.Image).GetItemsWithFilterAndOrdering(
                     r => true,
                     index, count, orderingPropertyName, descending).Select(c => c.ToModel());
 
             public async Task<IEnumerable<Rune?>> GetItemsByFamily(RuneFamily family, int index, int count, string? orderingPropertyName = null, bool descending = false)
-                => parent.DbContext.Runes.GetItemsWithFilterAndOrdering(
+                => parent.DbContext.Runes.Include(r => r.Image).GetItemsWithFilterAndOrdering(
                     rune => filterByRuneFamily(rune.ToModel(), family),
                     index, count, orderingPropertyName, descending).Select(c => c.ToModel());
 
             public async Task<IEnumerable<Rune?>> GetItemsByName(string substring, int index, int count, string? orderingPropertyName = null, bool descending = false)
-                => parent.DbContext.Runes.GetItemsWithFilterAndOrdering(
+                => parent.DbContext.Runes.Include(r => r.Image).GetItemsWithFilterAndOrdering(
                     rune => filterByNameContains(rune.ToModel(), substring),
                     index, count, orderingPropertyName, descending).Select(c => c.ToModel());
 
diff --git a/src/EntityFramework_LoL/Sources/DbManager/Mapper/RuneMapper.cs b/src/EntityFramework_LoL/Sources/DbManager/Mapper/RuneMapper.cs
index 744c73f..788ce1e 100644
--- a/src/EntityFramework_LoL/Sources/DbManager/Mapper/RuneMapper.cs
+++ b/src/EntityFramework_LoL/Sources/DbManager/Mapper/RuneMapper.cs
@@ -6,7 +6,7 @@ namespace DbManager.Mapper
 {
     public static class RuneMapper
     {
-        public static Rune ToModel(this RuneEntity rune) => new(rune.Name, rune.Family.ToModel(), rune.Icon, "", rune.Description);
+        public static Rune ToModel(this RuneEntity rune) => new(rune.Name, rune.Family.ToModel(), rune.Icon, rune.Image.Base64, rune.Description);
         public static RuneEntity ToEntity(this Rune rune)
             => new()
             {
diff --git a/src/EntityFramework_LoL/Sources/LeagueOfLegends.sln b/src/EntityFramework_LoL/Sources/LeagueOfLegends.sln
index 4256fc6..339d0ce 100644
--- a/src/EntityFramework_LoL/Sources/LeagueOfLegends.sln
+++ b/src/EntityFramework_LoL/Sources/LeagueOfLegends.sln
@@ -21,7 +21,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DTO", "DTO\DTO.csproj", "{3
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiTests", "Tests\ApiTests\ApiTests.csproj", "{1779D8A4-2E12-47F3-BDA2-2E7F04B758EB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csproj", "{464DAB04-BE65-429D-9A39-3E1BB43C521A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ApiManager", "Client\ApiManager.csproj", "{464DAB04-BE65-429D-9A39-3E1BB43C521A}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MyFlib", "MyFlib\MyFlib.csproj", "{2142AB69-B483-4B0A-96DC-CFA87DEB11A5}"
 EndProject