diff --git a/Sources/APILOL/APILOL.csproj b/Sources/APILOL/APILOL.csproj
index 4c081e5..2c28297 100644
--- a/Sources/APILOL/APILOL.csproj
+++ b/Sources/APILOL/APILOL.csproj
@@ -18,6 +18,7 @@
+
diff --git a/Sources/APILOL/Controllers/v2/ChampionsController.cs b/Sources/APILOL/Controllers/v2/ChampionsController.cs
index 6e805d9..6e48806 100644
--- a/Sources/APILOL/Controllers/v2/ChampionsController.cs
+++ b/Sources/APILOL/Controllers/v2/ChampionsController.cs
@@ -12,7 +12,7 @@ namespace APILOL.Controllers.v2
{
[ApiController]
[Route("api/v{version:apiVersion}/[controller]")]
- [ApiVersion("2.0")]
+ [ApiVersion("2")]
public class ChampionsController : ControllerBase
{
@@ -30,7 +30,7 @@ namespace APILOL.Controllers.v2
// GET: api/
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpGet]
public async Task Get([FromQuery] PageRequest request)
@@ -57,7 +57,7 @@ namespace APILOL.Controllers.v2
}
// GET api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpGet("{name}")]
public async Task Get([FromQuery] PageRequest request,string name)
{
@@ -85,7 +85,7 @@ namespace APILOL.Controllers.v2
}
// POST api/
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpPost]
public async Task Post([FromBody] ChampionDTO championDTO)
{
@@ -109,7 +109,7 @@ namespace APILOL.Controllers.v2
}
// PUT api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpPut("{name}")]
public async Task PutAsync(string name, [FromBody] ChampionDTO championDTO)
{
@@ -150,7 +150,7 @@ namespace APILOL.Controllers.v2
}
// DELETE api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpDelete("{name}")]
public async Task Delete(string name)
{
diff --git a/Sources/APILOL/Controllers/v2/RuneController.cs b/Sources/APILOL/Controllers/v2/RuneController.cs
index cdbde5c..f76b628 100644
--- a/Sources/APILOL/Controllers/v2/RuneController.cs
+++ b/Sources/APILOL/Controllers/v2/RuneController.cs
@@ -11,7 +11,7 @@ namespace APILOL.Controllers.v2
{
[ApiController]
[Route("api/v{version:apiVersion}/[controller]")]
- [ApiVersion("2.0")]
+ [ApiVersion("2")]
public class RuneController : ControllerBase
{
IRunesManager dataManager;
@@ -28,7 +28,7 @@ namespace APILOL.Controllers.v2
// GET: api/
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpGet]
public async Task Get([FromQuery] PageRequest request)
{
@@ -54,7 +54,7 @@ namespace APILOL.Controllers.v2
}
// GET api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpGet("{name}")]
public async Task Get([FromQuery] PageRequest request, string name)
{
@@ -82,7 +82,7 @@ namespace APILOL.Controllers.v2
}
// POST api/
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpPost]
public async Task Post([FromBody] RuneDTO runeDTO)
{
@@ -106,7 +106,7 @@ namespace APILOL.Controllers.v2
}
// PUT api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpPut("{name}")]
public async Task PutAsync(string name, [FromBody] RuneDTO runeDTO)
{
@@ -147,7 +147,7 @@ namespace APILOL.Controllers.v2
}
// DELETE api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpDelete("{name}")]
public async Task Delete(string name)
{
diff --git a/Sources/APILOL/Controllers/v2/RunePageController.cs b/Sources/APILOL/Controllers/v2/RunePageController.cs
index 64ae8dd..2c1e278 100644
--- a/Sources/APILOL/Controllers/v2/RunePageController.cs
+++ b/Sources/APILOL/Controllers/v2/RunePageController.cs
@@ -11,7 +11,7 @@ namespace APILOL.Controllers.v2
{
[ApiController]
[Route("api/v{version:apiVersion}/[controller]")]
- [ApiVersion("2.0")]
+ [ApiVersion("2")]
public class RunePageController : ControllerBase
{
IRunePagesManager dataManager;
@@ -28,7 +28,7 @@ namespace APILOL.Controllers.v2
// GET: api/
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpGet]
public async Task Get([FromQuery] PageRequest request)
{
@@ -54,11 +54,11 @@ namespace APILOL.Controllers.v2
}
// GET api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpGet("{name}")]
public async Task Get([FromQuery] PageRequest request, string name)
{
- _logger.LogInformation("API call - [GET / NAME] - RUNEPAGE");
+ _logger.LogInformation("API call - [GET / NAME] - RUNEPAGE {name}",name);
try
{
if (dataManager.GetNbItemsByName(name) != null)
@@ -82,7 +82,7 @@ namespace APILOL.Controllers.v2
}
// POST api/
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpPost]
public async Task Post([FromBody] RunePageDTO runePageDTO)
{
@@ -106,11 +106,11 @@ namespace APILOL.Controllers.v2
}
// PUT api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpPut("{name}")]
public async Task PutAsync(string name, [FromBody] RunePageDTO runePageDTO)
{
- _logger.LogInformation("API call - [PUT / NAME] - RUNEPAGE");
+ _logger.LogInformation("API call - [PUT / NAME] - RUNEPAGE {name}", name);
try
{
var runePage = await dataManager
@@ -147,11 +147,11 @@ namespace APILOL.Controllers.v2
}
// DELETE api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpDelete("{name}")]
public async Task Delete(string name)
{
- _logger.LogInformation("API call - [DELETE / NAME] - RUNEPAGE");
+ _logger.LogInformation("API call - [DELETE / NAME] - RUNEPAGE {name}", name);
try
{
var runePage = await (dataManager.GetItemsByName(name, 0, await dataManager.GetNbItems()));
diff --git a/Sources/APILOL/Controllers/v2/SkinController.cs b/Sources/APILOL/Controllers/v2/SkinController.cs
index 4199383..9ac47c0 100644
--- a/Sources/APILOL/Controllers/v2/SkinController.cs
+++ b/Sources/APILOL/Controllers/v2/SkinController.cs
@@ -8,7 +8,7 @@ namespace APILOL.Controllers.v2
{
[ApiController]
[Route("api/v{version:apiVersion}/[controller]")]
- [ApiVersion("2.0")]
+ [ApiVersion("2")]
public class SkinController : ControllerBase
{
@@ -26,7 +26,7 @@ namespace APILOL.Controllers.v2
// GET: api/
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpGet]
public async Task Get([FromQuery] PageRequest request)
{
@@ -52,11 +52,11 @@ namespace APILOL.Controllers.v2
}
// GET api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpGet("{name}")]
public async Task Get([FromQuery] PageRequest request, string name)
{
- _logger.LogInformation("API call - [GET / NAME] - SKIN");
+ _logger.LogInformation("API call - [GET / NAME] - SKIN {name}", name);
try
{
if (dataManager.GetNbItemsByName(name) != null)
@@ -80,11 +80,11 @@ namespace APILOL.Controllers.v2
}
// POST api/
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpPost]
public async Task Post([FromBody] SkinDTO skinDTO)
{
- _logger.LogInformation("API call - [POST] - SKIN");
+ _logger.LogInformation("API call - [POST] - SKIN ");
try
{
@@ -104,7 +104,7 @@ namespace APILOL.Controllers.v2
}
// PUT api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpPut("{name}")]
public async Task PutAsync(string name, [FromBody] SkinDTO skinDTO)
{
@@ -145,7 +145,7 @@ namespace APILOL.Controllers.v2
}
// DELETE api//5
- [MapToApiVersion("2.0")]
+ [MapToApiVersion("2")]
[HttpDelete("{name}")]
public async Task Delete(string name)
{
diff --git a/Sources/APILOL/Program.cs b/Sources/APILOL/Program.cs
index 63b95a4..d5648a3 100644
--- a/Sources/APILOL/Program.cs
+++ b/Sources/APILOL/Program.cs
@@ -1,37 +1,37 @@
+using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.ApiExplorer;
using Microsoft.AspNetCore.Mvc.Versioning;
using Model;
using StubLib;
+using Swashbuckle.Swagger;
var builder = WebApplication.CreateBuilder(args);
builder.Services.AddSingleton();
-builder.Services.AddControllers();
+
+// Add services to the container.
+builder.Services.AddControllers();
builder.Services.AddEndpointsApiExplorer();
builder.Services.AddSwaggerGen();
+
builder.Services.AddApiVersioning(opt =>
{
- opt.DefaultApiVersion = new Microsoft.AspNetCore.Mvc.ApiVersion(1, 0);
- opt.AssumeDefaultVersionWhenUnspecified = true;
- opt.ReportApiVersions = true;
- opt.ApiVersionReader = ApiVersionReader.Combine(new UrlSegmentApiVersionReader(),
- new HeaderApiVersionReader("x-api-version"),
- new MediaTypeApiVersionReader("x-api-version"));
+ opt.DefaultApiVersion = new ApiVersion(1, 0);
+ opt.ApiVersionReader = new UrlSegmentApiVersionReader();
});
+// Add ApiExplorer to discover versions
builder.Services.AddVersionedApiExplorer(setup =>
{
setup.GroupNameFormat = "'v'VVV";
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();
// Configure the HTTP request pipeline.
@@ -48,6 +48,8 @@ if (app.Environment.IsDevelopment())
});
}
+
+
app.UseStaticFiles();
app.UseHttpsRedirection();
@@ -56,4 +58,4 @@ app.UseAuthorization();
app.MapControllers();
-app.Run();
+app.Run();
\ No newline at end of file
diff --git a/Sources/TestUnitaire/UnitTestChampion.cs b/Sources/TestUnitaire/UnitTestChampion.cs
index ca55a25..f6c318b 100644
--- a/Sources/TestUnitaire/UnitTestChampion.cs
+++ b/Sources/TestUnitaire/UnitTestChampion.cs
@@ -28,7 +28,7 @@ namespace TestUnitaire
public async Task TestGet()
{
//Act
- var champions = await controller.Get(new PageResponse());
+ var champions = await controller.Get(new PageRequest());
//Assert
var resultObject = champions as OkObjectResult;