lucas.delanier
/
LOLProject
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

modif
continuous-integration/drone/push Build is failing Details

Browse Source
EFManagers
Lucas Delanier 2 years ago
parent 652d47c40e
commit fbbc8d036a
7 changed files with 45 additions and 42 deletions
Show Stats Download Patch File Download Diff File

1
Sources/APILOL/APILOL.csproj
Unescape View File

@ -18,6 +18,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.2" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.6" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.6" />
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" /> <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
<PackageReference Include="Swashbuckle.Core" Version="5.6.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

12
Sources/APILOL/Controllers/v2/ChampionsController.cs
Unescape View File

@ -12,7 +12,7 @@ namespace APILOL.Controllers.v2
{ {
[ApiController] [ApiController]
[Route("api/v{version:apiVersion}/[controller]")] [Route("api/v{version:apiVersion}/[controller]")]
[ApiVersion("2.0")] [ApiVersion("2")]
public class ChampionsController : ControllerBase public class ChampionsController : ControllerBase
{ {
@ -30,7 +30,7 @@ namespace APILOL.Controllers.v2
// GET: api/<ChampionController> // GET: api/<ChampionController>
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpGet] [HttpGet]
public async Task<IActionResult> Get([FromQuery] PageRequest request) public async Task<IActionResult> Get([FromQuery] PageRequest request)
@ -57,7 +57,7 @@ namespace APILOL.Controllers.v2
} }
// GET api/<ChampionController>/5 // GET api/<ChampionController>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpGet("{name}")] [HttpGet("{name}")]
public async Task<IActionResult> Get([FromQuery] PageRequest request,string name) public async Task<IActionResult> Get([FromQuery] PageRequest request,string name)
{ {
@ -85,7 +85,7 @@ namespace APILOL.Controllers.v2
} }
// POST api/<ChampionController> // POST api/<ChampionController>
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpPost] [HttpPost]
public async Task<IActionResult> Post([FromBody] ChampionDTO championDTO) public async Task<IActionResult> Post([FromBody] ChampionDTO championDTO)
{ {
@ -109,7 +109,7 @@ namespace APILOL.Controllers.v2
} }
// PUT api/<ChampionController>/5 // PUT api/<ChampionController>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpPut("{name}")] [HttpPut("{name}")]
public async Task<IActionResult> PutAsync(string name, [FromBody] ChampionDTO championDTO) public async Task<IActionResult> PutAsync(string name, [FromBody] ChampionDTO championDTO)
{ {
@ -150,7 +150,7 @@ namespace APILOL.Controllers.v2
} }
// DELETE api/<ChampionController>/5 // DELETE api/<ChampionController>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpDelete("{name}")] [HttpDelete("{name}")]
public async Task<IActionResult> Delete(string name) public async Task<IActionResult> Delete(string name)
{ {

12
Sources/APILOL/Controllers/v2/RuneController.cs
Unescape View File

@ -11,7 +11,7 @@ namespace APILOL.Controllers.v2
{ {
[ApiController] [ApiController]
[Route("api/v{version:apiVersion}/[controller]")] [Route("api/v{version:apiVersion}/[controller]")]
[ApiVersion("2.0")] [ApiVersion("2")]
public class RuneController : ControllerBase public class RuneController : ControllerBase
{ {
IRunesManager dataManager; IRunesManager dataManager;
@ -28,7 +28,7 @@ namespace APILOL.Controllers.v2
// GET: api/<RuneController> // GET: api/<RuneController>
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpGet] [HttpGet]
public async Task<IActionResult> Get([FromQuery] PageRequest request) public async Task<IActionResult> Get([FromQuery] PageRequest request)
{ {
@ -54,7 +54,7 @@ namespace APILOL.Controllers.v2
} }
// GET api/<RuneController>/5 // GET api/<RuneController>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpGet("{name}")] [HttpGet("{name}")]
public async Task<IActionResult> Get([FromQuery] PageRequest request, string name) public async Task<IActionResult> Get([FromQuery] PageRequest request, string name)
{ {
@ -82,7 +82,7 @@ namespace APILOL.Controllers.v2
} }
// POST api/<RuneController> // POST api/<RuneController>
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpPost] [HttpPost]
public async Task<IActionResult> Post([FromBody] RuneDTO runeDTO) public async Task<IActionResult> Post([FromBody] RuneDTO runeDTO)
{ {
@ -106,7 +106,7 @@ namespace APILOL.Controllers.v2
} }
// PUT api/<Rune>/5 // PUT api/<Rune>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpPut("{name}")] [HttpPut("{name}")]
public async Task<IActionResult> PutAsync(string name, [FromBody] RuneDTO runeDTO) public async Task<IActionResult> PutAsync(string name, [FromBody] RuneDTO runeDTO)
{ {
@ -147,7 +147,7 @@ namespace APILOL.Controllers.v2
} }
// DELETE api/<RuneController>/5 // DELETE api/<RuneController>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpDelete("{name}")] [HttpDelete("{name}")]
public async Task<IActionResult> Delete(string name) public async Task<IActionResult> Delete(string name)
{ {

18
Sources/APILOL/Controllers/v2/RunePageController.cs
Unescape View File

@ -11,7 +11,7 @@ namespace APILOL.Controllers.v2
{ {
[ApiController] [ApiController]
[Route("api/v{version:apiVersion}/[controller]")] [Route("api/v{version:apiVersion}/[controller]")]
[ApiVersion("2.0")] [ApiVersion("2")]
public class RunePageController : ControllerBase public class RunePageController : ControllerBase
{ {
IRunePagesManager dataManager; IRunePagesManager dataManager;
@ -28,7 +28,7 @@ namespace APILOL.Controllers.v2
// GET: api/<RunePageController> // GET: api/<RunePageController>
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpGet] [HttpGet]
public async Task<IActionResult> Get([FromQuery] PageRequest request) public async Task<IActionResult> Get([FromQuery] PageRequest request)
{ {
@ -54,11 +54,11 @@ namespace APILOL.Controllers.v2
} }
// GET api/<RunePageController>/5 // GET api/<RunePageController>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpGet("{name}")] [HttpGet("{name}")]
public async Task<IActionResult> Get([FromQuery] PageRequest request, string name) public async Task<IActionResult> Get([FromQuery] PageRequest request, string name)
{ {
_logger.LogInformation("API call - [GET / NAME] - RUNEPAGE"); _logger.LogInformation("API call - [GET / NAME] - RUNEPAGE {name}",name);
try try
{ {
if (dataManager.GetNbItemsByName(name) != null) if (dataManager.GetNbItemsByName(name) != null)
@ -82,7 +82,7 @@ namespace APILOL.Controllers.v2
} }
// POST api/<RunePageController> // POST api/<RunePageController>
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpPost] [HttpPost]
public async Task<IActionResult> Post([FromBody] RunePageDTO runePageDTO) public async Task<IActionResult> Post([FromBody] RunePageDTO runePageDTO)
{ {
@ -106,11 +106,11 @@ namespace APILOL.Controllers.v2
} }
// PUT api/<RunePage>/5 // PUT api/<RunePage>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpPut("{name}")] [HttpPut("{name}")]
public async Task<IActionResult> PutAsync(string name, [FromBody] RunePageDTO runePageDTO) public async Task<IActionResult> PutAsync(string name, [FromBody] RunePageDTO runePageDTO)
{ {
_logger.LogInformation("API call - [PUT / NAME] - RUNEPAGE"); _logger.LogInformation("API call - [PUT / NAME] - RUNEPAGE {name}", name);
try try
{ {
var runePage = await dataManager var runePage = await dataManager
@ -147,11 +147,11 @@ namespace APILOL.Controllers.v2
} }
// DELETE api/<RunePageController>/5 // DELETE api/<RunePageController>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpDelete("{name}")] [HttpDelete("{name}")]
public async Task<IActionResult> Delete(string name) public async Task<IActionResult> Delete(string name)
{ {
_logger.LogInformation("API call - [DELETE / NAME] - RUNEPAGE"); _logger.LogInformation("API call - [DELETE / NAME] - RUNEPAGE {name}", name);
try try
{ {
var runePage = await (dataManager.GetItemsByName(name, 0, await dataManager.GetNbItems())); var runePage = await (dataManager.GetItemsByName(name, 0, await dataManager.GetNbItems()));

14
Sources/APILOL/Controllers/v2/SkinController.cs
Unescape View File

@ -8,7 +8,7 @@ namespace APILOL.Controllers.v2
{ {
[ApiController] [ApiController]
[Route("api/v{version:apiVersion}/[controller]")] [Route("api/v{version:apiVersion}/[controller]")]
[ApiVersion("2.0")] [ApiVersion("2")]
public class SkinController : ControllerBase public class SkinController : ControllerBase
{ {
@ -26,7 +26,7 @@ namespace APILOL.Controllers.v2
// GET: api/<SkinController> // GET: api/<SkinController>
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpGet] [HttpGet]
public async Task<IActionResult> Get([FromQuery] PageRequest request) public async Task<IActionResult> Get([FromQuery] PageRequest request)
{ {
@ -52,11 +52,11 @@ namespace APILOL.Controllers.v2
} }
// GET api/<SkinController>/5 // GET api/<SkinController>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpGet("{name}")] [HttpGet("{name}")]
public async Task<IActionResult> Get([FromQuery] PageRequest request, string name) public async Task<IActionResult> Get([FromQuery] PageRequest request, string name)
{ {
_logger.LogInformation("API call - [GET / NAME] - SKIN"); _logger.LogInformation("API call - [GET / NAME] - SKIN {name}", name);
try try
{ {
if (dataManager.GetNbItemsByName(name) != null) if (dataManager.GetNbItemsByName(name) != null)
@ -80,7 +80,7 @@ namespace APILOL.Controllers.v2
} }
// POST api/<SkinController> // POST api/<SkinController>
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpPost] [HttpPost]
public async Task<IActionResult> Post([FromBody] SkinDTO skinDTO) public async Task<IActionResult> Post([FromBody] SkinDTO skinDTO)
{ {
@ -104,7 +104,7 @@ namespace APILOL.Controllers.v2
} }
// PUT api/<Skin>/5 // PUT api/<Skin>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpPut("{name}")] [HttpPut("{name}")]
public async Task<IActionResult> PutAsync(string name, [FromBody] SkinDTO skinDTO) public async Task<IActionResult> PutAsync(string name, [FromBody] SkinDTO skinDTO)
{ {
@ -145,7 +145,7 @@ namespace APILOL.Controllers.v2
} }
// DELETE api/<SkinController>/5 // DELETE api/<SkinController>/5
[MapToApiVersion("2.0")] [MapToApiVersion("2")]
[HttpDelete("{name}")] [HttpDelete("{name}")]
public async Task<IActionResult> Delete(string name) public async Task<IActionResult> Delete(string name)
{ {

24
Sources/APILOL/Program.cs
Unescape View File

@ -1,37 +1,37 @@
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ApiExplorer; using Microsoft.AspNetCore.Mvc.ApiExplorer;
using Microsoft.AspNetCore.Mvc.Versioning; using Microsoft.AspNetCore.Mvc.Versioning;
using Model; using Model;
using StubLib; using StubLib;
using Swashbuckle.Swagger;
var builder = WebApplication.CreateBuilder(args); var builder = WebApplication.CreateBuilder(args);
builder.Services.AddSingleton<IDataManager, StubData>(); builder.Services.AddSingleton<IDataManager, StubData>();
builder.Services.AddControllers();
// Add services to the container.
builder.Services.AddControllers();
builder.Services.AddEndpointsApiExplorer(); builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen(); builder.Services.AddSwaggerGen();
builder.Services.AddApiVersioning(opt => builder.Services.AddApiVersioning(opt =>
{ {
opt.DefaultApiVersion = new Microsoft.AspNetCore.Mvc.ApiVersion(1, 0); opt.DefaultApiVersion = new ApiVersion(1, 0);
opt.AssumeDefaultVersionWhenUnspecified = true; opt.ApiVersionReader = new UrlSegmentApiVersionReader();
opt.ReportApiVersions = true;
opt.ApiVersionReader = ApiVersionReader.Combine(new UrlSegmentApiVersionReader(),
new HeaderApiVersionReader("x-api-version"),
new MediaTypeApiVersionReader("x-api-version"));
}); });
// Add ApiExplorer to discover versions
builder.Services.AddVersionedApiExplorer(setup => builder.Services.AddVersionedApiExplorer(setup =>
{ {
setup.GroupNameFormat = "'v'VVV"; setup.GroupNameFormat = "'v'VVV";
setup.SubstituteApiVersionInUrl = true; setup.SubstituteApiVersionInUrl = true;
}); });
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();
var app = builder.Build();
// Configure the HTTP request pipeline.
var app = builder.Build();
var apiVersionDescriptionProvider = app.Services.GetRequiredService<IApiVersionDescriptionProvider>(); var apiVersionDescriptionProvider = app.Services.GetRequiredService<IApiVersionDescriptionProvider>();
// Configure the HTTP request pipeline. // Configure the HTTP request pipeline.
@ -48,6 +48,8 @@ if (app.Environment.IsDevelopment())
}); });
} }
app.UseStaticFiles(); app.UseStaticFiles();
app.UseHttpsRedirection(); app.UseHttpsRedirection();

2
Sources/TestUnitaire/UnitTestChampion.cs
Unescape View File

@ -28,7 +28,7 @@ namespace TestUnitaire
public async Task TestGet() public async Task TestGet()
{ {
//Act //Act
var champions = await controller.Get(new PageResponse()); var champions = await controller.Get(new PageRequest());
//Assert //Assert
var resultObject = champions as OkObjectResult; var resultObject = champions as OkObjectResult;

Write Preview
Loading…
Cancel
Save