diff --git a/Sources/APILOL/APILOL.csproj b/Sources/APILOL/APILOL.csproj index 3b42408..2ac89b4 100644 --- a/Sources/APILOL/APILOL.csproj +++ b/Sources/APILOL/APILOL.csproj @@ -7,6 +7,13 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + diff --git a/Sources/APILOL/Controllers/ChampionsController.cs b/Sources/APILOL/Controllers/ChampionsController.cs index 08f558b..d5579a0 100644 --- a/Sources/APILOL/Controllers/ChampionsController.cs +++ b/Sources/APILOL/Controllers/ChampionsController.cs @@ -3,8 +3,6 @@ using DTO; using Microsoft.AspNetCore.Mvc; using Model; using StubLib; -using System; -using System.Xml.Linq; // For more information on enabling Web API for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 @@ -14,60 +12,51 @@ namespace APILOL.Controllers [ApiController] public class ChampionsController : ControllerBase { - - IChampionsManager managerChampions; - - public ChampionsController(IDataManager manager) - { - managerChampions = manager.ChampionsMgr; - } - + IChampionsManager dataManager = new StubData().ChampionsMgr; // GET: api/ [HttpGet] - public async Task Get() { - IEnumerable championDTOs = (await managerChampions.GetItems(0, await managerChampions.GetNbItems())).Select(x => x.ToDTO()); - - if (championDTOs != null) - { - return Ok(championDTOs); - } - return NotFound(); + var champions = await dataManager.GetItems(0, await dataManager.GetNbItems()); + IEnumerable items = champions.Select(c => c.ToDto()); + return Ok(items); } // GET api//5 [HttpGet("{name}")] - public async Task GetAsync(String name) + public async Task Get(string name) { - IEnumerable champ = await managerChampions.GetItemsByName(name, 0, await managerChampions.GetNbItems()); - if (champ.Count() != 0) + if (dataManager.GetNbItemsByName(name) != null) { - return Ok(champ.First().ToDTO()); + return Ok(dataManager.GetItemsByName(name, 0, await dataManager.GetNbItems())); } return NotFound(); } // POST api/ [HttpPost] - public async Task Post([FromBody] ChampionDTO champion) + public async Task Post([FromBody] ChampionDTO championDTO) { - return CreatedAtAction(nameof(Get), await managerChampions.AddItem(champion.ToModel())); + return CreatedAtAction(nameof(Get),(await dataManager.AddItem(championDTO.ToModel())).ToDto); } // PUT api//5 [HttpPut("{name}")] - public async void Put(String name, [FromBody] ChampionDTO champion) + public void Put(string name, [FromBody] ChampionDTO championDTO) { - } // DELETE api//5 - [HttpDelete("{id}")] - public async void Delete(int id) + [HttpDelete("{name}")] + public void Delete(string name) { } } } + +/* +var champion = new Champion(""); +var dto = ChampionMapper.ToDto(champion); +*/ \ No newline at end of file diff --git a/Sources/APILOL/Mapper/ChampionMapper.cs b/Sources/APILOL/Mapper/ChampionMapper.cs index 561a96c..883052c 100644 --- a/Sources/APILOL/Mapper/ChampionMapper.cs +++ b/Sources/APILOL/Mapper/ChampionMapper.cs @@ -1,20 +1,22 @@ using DTO; using Model; -using System.Buffers.Text; -using System.Xml.Linq; namespace APILOL.Mapper { public static class ChampionMapper { - public static ChampionDTO ToDTO(this Champion champ) + public static ChampionDTO ToDto(this Champion champion) { - return new ChampionDTO() { Name = champ.Name, Bio = champ.Bio, Icon = champ.Icon, Image = champ.Image.Base64 }; + return new ChampionDTO() + { + Name = champion.Name, + Bio = champion.Bio, + }; } - public static Champion ToModel(this ChampionDTO champ) + public static Champion ToModel(this ChampionDTO champion) { - return new Champion(champ.Name,icon: champ.Icon, image: champ.Icon, bio: champ.Bio); + return new Champion(champion.Name); } } } diff --git a/Sources/DTO/ChampionDTO.cs b/Sources/DTO/ChampionDTO.cs index a66c8cc..2a8f880 100644 --- a/Sources/DTO/ChampionDTO.cs +++ b/Sources/DTO/ChampionDTO.cs @@ -4,13 +4,5 @@ { public string Name { get; set; } public string Bio { get; set; } - public string Icon { get; set; } - - public string Image { get; set; } - - - - - } } \ No newline at end of file diff --git a/Sources/DTO/DTO.csproj b/Sources/DTO/DTO.csproj index 132c02c..94a926e 100644 --- a/Sources/DTO/DTO.csproj +++ b/Sources/DTO/DTO.csproj @@ -6,4 +6,14 @@ enable + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + diff --git a/Sources/EntityFrameworkLOL/ChampionContext.cs b/Sources/EntityFrameworkLOL/ChampionContext.cs new file mode 100644 index 0000000..719926b --- /dev/null +++ b/Sources/EntityFrameworkLOL/ChampionContext.cs @@ -0,0 +1,12 @@ +using Microsoft.EntityFrameworkCore; + +namespace EntityFrameworkLOL +{ + class ChampionContext : DbContext + { + public DbSet Champions { get; set; } + + protected override void OnConfiguring(DbContextOptionsBuilder options) + => options.UseSqlite($"Data Source=DBLOL.db"); + } +} \ No newline at end of file diff --git a/Sources/EntityFrameworkLOL/ChampionEntity.cs b/Sources/EntityFrameworkLOL/ChampionEntity.cs new file mode 100644 index 0000000..f693c37 --- /dev/null +++ b/Sources/EntityFrameworkLOL/ChampionEntity.cs @@ -0,0 +1,20 @@ +using Microsoft.EntityFrameworkCore; +using System; +using System.Linq; +using System.Threading.Tasks; +using System.Collections.Generic; +using System.Text; +using System.ComponentModel.DataAnnotations; + +namespace EntityFrameworkLOL +{ + class ChampionEntity + { + [Key] + public string Name { get; set; } + + public string Bio { get; set; } + + public string Icon { get; set; } + } +} \ No newline at end of file diff --git a/Sources/EntityFrameworkLOL/DBLOL.db b/Sources/EntityFrameworkLOL/DBLOL.db new file mode 100644 index 0000000..6e8e7c5 Binary files /dev/null and b/Sources/EntityFrameworkLOL/DBLOL.db differ diff --git a/Sources/EntityFrameworkLOL/EntityFrameworkLOL.DBLOL.db b/Sources/EntityFrameworkLOL/EntityFrameworkLOL.DBLOL.db new file mode 100644 index 0000000..e40710c Binary files /dev/null and b/Sources/EntityFrameworkLOL/EntityFrameworkLOL.DBLOL.db differ diff --git a/Sources/EntityFrameworkLOL/EntityFrameworkLOL.csproj b/Sources/EntityFrameworkLOL/EntityFrameworkLOL.csproj new file mode 100644 index 0000000..d683ca4 --- /dev/null +++ b/Sources/EntityFrameworkLOL/EntityFrameworkLOL.csproj @@ -0,0 +1,23 @@ + + + + Exe + net6.0 + enable + enable + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + \ No newline at end of file diff --git a/Sources/EntityFrameworkLOL/Migrations/20230201163336_MigrationWallah.Designer.cs b/Sources/EntityFrameworkLOL/Migrations/20230201163336_MigrationWallah.Designer.cs new file mode 100644 index 0000000..e24c7dc --- /dev/null +++ b/Sources/EntityFrameworkLOL/Migrations/20230201163336_MigrationWallah.Designer.cs @@ -0,0 +1,42 @@ +// +using EntityFrameworkLOL; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Migrations; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace EntityFrameworkLOL.Migrations +{ + [DbContext(typeof(ChampionContext))] + [Migration("20230201163336_MigrationWallah")] + partial class MigrationWallah + { + /// + protected override void BuildTargetModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "7.0.2"); + + modelBuilder.Entity("EntityFrameworkLOL.ChampionEntity", b => + { + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Bio") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Icon") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Name"); + + b.ToTable("Champions"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Sources/EntityFrameworkLOL/Migrations/20230201163336_MigrationWallah.cs b/Sources/EntityFrameworkLOL/Migrations/20230201163336_MigrationWallah.cs new file mode 100644 index 0000000..eb2dfc8 --- /dev/null +++ b/Sources/EntityFrameworkLOL/Migrations/20230201163336_MigrationWallah.cs @@ -0,0 +1,34 @@ +using Microsoft.EntityFrameworkCore.Migrations; + +#nullable disable + +namespace EntityFrameworkLOL.Migrations +{ + /// + public partial class MigrationWallah : Migration + { + /// + protected override void Up(MigrationBuilder migrationBuilder) + { + migrationBuilder.CreateTable( + name: "Champions", + columns: table => new + { + Name = table.Column(type: "TEXT", nullable: false), + Bio = table.Column(type: "TEXT", nullable: false), + Icon = table.Column(type: "TEXT", nullable: false) + }, + constraints: table => + { + table.PrimaryKey("PK_Champions", x => x.Name); + }); + } + + /// + protected override void Down(MigrationBuilder migrationBuilder) + { + migrationBuilder.DropTable( + name: "Champions"); + } + } +} diff --git a/Sources/EntityFrameworkLOL/Migrations/ChampionContextModelSnapshot.cs b/Sources/EntityFrameworkLOL/Migrations/ChampionContextModelSnapshot.cs new file mode 100644 index 0000000..351bf79 --- /dev/null +++ b/Sources/EntityFrameworkLOL/Migrations/ChampionContextModelSnapshot.cs @@ -0,0 +1,39 @@ +// +using EntityFrameworkLOL; +using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore.Infrastructure; +using Microsoft.EntityFrameworkCore.Storage.ValueConversion; + +#nullable disable + +namespace EntityFrameworkLOL.Migrations +{ + [DbContext(typeof(ChampionContext))] + partial class ChampionContextModelSnapshot : ModelSnapshot + { + protected override void BuildModel(ModelBuilder modelBuilder) + { +#pragma warning disable 612, 618 + modelBuilder.HasAnnotation("ProductVersion", "7.0.2"); + + modelBuilder.Entity("EntityFrameworkLOL.ChampionEntity", b => + { + b.Property("Name") + .HasColumnType("TEXT"); + + b.Property("Bio") + .IsRequired() + .HasColumnType("TEXT"); + + b.Property("Icon") + .IsRequired() + .HasColumnType("TEXT"); + + b.HasKey("Name"); + + b.ToTable("Champions"); + }); +#pragma warning restore 612, 618 + } + } +} diff --git a/Sources/EntityFrameworkLOL/Program.cs b/Sources/EntityFrameworkLOL/Program.cs new file mode 100644 index 0000000..3751555 --- /dev/null +++ b/Sources/EntityFrameworkLOL/Program.cs @@ -0,0 +1,2 @@ +// See https://aka.ms/new-console-template for more information +Console.WriteLine("Hello, World!"); diff --git a/Sources/LeagueOfLegends.sln b/Sources/LeagueOfLegends.sln index 1a7e6bf..67afe5a 100644 --- a/Sources/LeagueOfLegends.sln +++ b/Sources/LeagueOfLegends.sln @@ -17,7 +17,11 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StubLib", "StubLib\StubLib. EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "APILOL", "APILOL\APILOL.csproj", "{88538F30-9D26-4A70-88FD-12BA05576E39}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DTO", "DTO\DTO.csproj", "{2124E1DB-1E6D-4FCE-9F34-53457C374394}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DTO", "DTO\DTO.csproj", "{1434DEF6-0575-4C3D-BF14-AF29A444BC74}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EntityFrameworkLOL", "EntityFrameworkLOL\EntityFrameworkLOL.csproj", "{61D807B0-FA1A-439D-9810-9F31A0C47034}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUnitaire", "TestUnitaire\TestUnitaire.csproj", "{D24FBC48-F9C3-45CA-8D51-A851559C307F}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -45,10 +49,18 @@ Global {88538F30-9D26-4A70-88FD-12BA05576E39}.Debug|Any CPU.Build.0 = Debug|Any CPU {88538F30-9D26-4A70-88FD-12BA05576E39}.Release|Any CPU.ActiveCfg = Release|Any CPU {88538F30-9D26-4A70-88FD-12BA05576E39}.Release|Any CPU.Build.0 = Release|Any CPU - {2124E1DB-1E6D-4FCE-9F34-53457C374394}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2124E1DB-1E6D-4FCE-9F34-53457C374394}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2124E1DB-1E6D-4FCE-9F34-53457C374394}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2124E1DB-1E6D-4FCE-9F34-53457C374394}.Release|Any CPU.Build.0 = Release|Any CPU + {1434DEF6-0575-4C3D-BF14-AF29A444BC74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1434DEF6-0575-4C3D-BF14-AF29A444BC74}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1434DEF6-0575-4C3D-BF14-AF29A444BC74}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1434DEF6-0575-4C3D-BF14-AF29A444BC74}.Release|Any CPU.Build.0 = Release|Any CPU + {61D807B0-FA1A-439D-9810-9F31A0C47034}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {61D807B0-FA1A-439D-9810-9F31A0C47034}.Debug|Any CPU.Build.0 = Debug|Any CPU + {61D807B0-FA1A-439D-9810-9F31A0C47034}.Release|Any CPU.ActiveCfg = Release|Any CPU + {61D807B0-FA1A-439D-9810-9F31A0C47034}.Release|Any CPU.Build.0 = Release|Any CPU + {D24FBC48-F9C3-45CA-8D51-A851559C307F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D24FBC48-F9C3-45CA-8D51-A851559C307F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D24FBC48-F9C3-45CA-8D51-A851559C307F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D24FBC48-F9C3-45CA-8D51-A851559C307F}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -56,6 +68,7 @@ Global GlobalSection(NestedProjects) = preSolution {1889FA6E-B7C6-416E-8628-9449FB9070B9} = {C76D0C23-1FFA-4963-93CD-E12BD643F030} {B01D7EF2-2D64-409A-A29A-61FB7BB7A9DB} = {2C607793-B163-4731-A4D1-AFE8A7C4C170} + {D24FBC48-F9C3-45CA-8D51-A851559C307F} = {C76D0C23-1FFA-4963-93CD-E12BD643F030} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {92F3083D-793F-4552-8A9A-0AD6534159C9} diff --git a/Sources/Model/Model.csproj b/Sources/Model/Model.csproj index 89f6363..4eb62df 100644 --- a/Sources/Model/Model.csproj +++ b/Sources/Model/Model.csproj @@ -12,6 +12,15 @@ + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + diff --git a/Sources/Shared/IGenericDataManager.cs b/Sources/Shared/IGenericDataManager.cs index 7dfbe88..a1a66f9 100644 --- a/Sources/Shared/IGenericDataManager.cs +++ b/Sources/Shared/IGenericDataManager.cs @@ -2,7 +2,8 @@ public interface IGenericDataManager { Task GetNbItems(); - Task> GetItems(int index, int count, string? orderingPropertyName = null, bool descending = false); + + Task> GetItems(int index, int count, string? orderingPropertyName = null, bool descending = false); Task GetNbItemsByName(string substring); Task> GetItemsByName(string substring, int index, int count, string? orderingPropertyName = null, bool descending = false); Task UpdateItem(T oldItem, T newItem); diff --git a/Sources/Shared/Shared.csproj b/Sources/Shared/Shared.csproj index 132c02c..94a926e 100644 --- a/Sources/Shared/Shared.csproj +++ b/Sources/Shared/Shared.csproj @@ -6,4 +6,14 @@ enable + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + diff --git a/Sources/StubLib/Extensions.cs b/Sources/StubLib/Extensions.cs index ef2e82b..1b447a2 100644 --- a/Sources/StubLib/Extensions.cs +++ b/Sources/StubLib/Extensions.cs @@ -60,6 +60,7 @@ namespace StubLib collection.Add(newItem!); return Task.FromResult(newItem); } + } } diff --git a/Sources/StubLib/StubData.Champions.cs b/Sources/StubLib/StubData.Champions.cs index ad19275..c7e93f3 100644 --- a/Sources/StubLib/StubData.Champions.cs +++ b/Sources/StubLib/StubData.Champions.cs @@ -25,12 +25,18 @@ namespace StubLib public Task AddItem(Champion? item) => parent.champions.AddItem(item); + + public Task DeleteItem(Champion? item) => parent.champions.DeleteItem(item); public Task GetNbItems() => Task.FromResult(parent.champions.Count); + public Champion GetLast() + => parent.champions.Last(); + + public Task> GetItems(int index, int count, string? orderingPropertyName = null, bool descending = false) => parent.champions.GetItemsWithFilterAndOrdering( c => true, diff --git a/Sources/StubLib/StubLib.csproj b/Sources/StubLib/StubLib.csproj index 1b714b9..a3c6686 100644 --- a/Sources/StubLib/StubLib.csproj +++ b/Sources/StubLib/StubLib.csproj @@ -6,6 +6,16 @@ enable + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + + + diff --git a/Sources/TestUnitaire/TestUnitaire.csproj b/Sources/TestUnitaire/TestUnitaire.csproj new file mode 100644 index 0000000..a4ba0cb --- /dev/null +++ b/Sources/TestUnitaire/TestUnitaire.csproj @@ -0,0 +1,23 @@ + + + + net6.0 + enable + enable + + false + + + + + + + + + + + + + + + diff --git a/Sources/TestUnitaire/UnitTestChampion.cs b/Sources/TestUnitaire/UnitTestChampion.cs new file mode 100644 index 0000000..3714acf --- /dev/null +++ b/Sources/TestUnitaire/UnitTestChampion.cs @@ -0,0 +1,62 @@ +using APILOL.Controllers; +using APILOL.Mapper; +using DTO; +using Microsoft.AspNetCore.Mvc; +using StubLib; + +namespace TestUnitaire +{ + [TestClass] + public class UnitTestChampion + { + private readonly ChampionsController controller; + private readonly StubData stub; + public UnitTestChampion() + { + stub = new StubData(); + controller = new ChampionsController(); + } + + [TestMethod] + public async Task TestGet() + { + var champions = await controller.Get(); + + var resultObject = champions as OkObjectResult; + Assert.IsNotNull(resultObject); + + var resultType = resultObject?.Value as IEnumerable; + Assert.IsNotNull(resultType); + + Assert.AreEqual(resultType.Count(), await stub.ChampionsMgr.GetNbItems()); + } + + [TestMethod] + public async Task TestPost() + { + var ChampionDtoToTest = new ChampionDTO { Bio= "This champion is a legendary Fox", Name="Foxane"}; + + var champions = await controller.Post(ChampionDtoToTest); + var resultObject = champions as OkObjectResult; + Assert.IsNotNull(resultObject); + + var resultType = resultObject?.Value as IEnumerable; + Assert.IsNotNull(resultType); + + Assert.AreEqual(resultType.Last(), stub.ChampionsMgr.GetItems(-1, await stub.ChampionsMgr.GetNbItems())); + } + + + [TestMethod] + public void TestPut() + { + } + + [TestMethod] + public void TestDelete() + { + } + + + } +} \ No newline at end of file diff --git a/Sources/TestUnitaire/Usings.cs b/Sources/TestUnitaire/Usings.cs new file mode 100644 index 0000000..ab67c7e --- /dev/null +++ b/Sources/TestUnitaire/Usings.cs @@ -0,0 +1 @@ +global using Microsoft.VisualStudio.TestTools.UnitTesting; \ No newline at end of file diff --git a/Sources/Tests/ConsoleTests/ConsoleTests.csproj b/Sources/Tests/ConsoleTests/ConsoleTests.csproj index c52655b..c805564 100644 --- a/Sources/Tests/ConsoleTests/ConsoleTests.csproj +++ b/Sources/Tests/ConsoleTests/ConsoleTests.csproj @@ -15,6 +15,13 @@ + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + +