diff --git a/API_SQLuedo/API/API.csproj b/API_SQLuedo/API/API.csproj index e9ccb98..effc567 100644 --- a/API_SQLuedo/API/API.csproj +++ b/API_SQLuedo/API/API.csproj @@ -8,8 +8,9 @@ + + - all diff --git a/API_SQLuedo/API/Controllers/UserController.cs b/API_SQLuedo/API/Controllers/UserController.cs index 9596304..5809f53 100644 --- a/API_SQLuedo/API/Controllers/UserController.cs +++ b/API_SQLuedo/API/Controllers/UserController.cs @@ -1,11 +1,12 @@ -using Dto; +using Dto; +using Asp.Versioning; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using Shared; namespace API.Controllers { - [Route("api/{version:apiVersion}/[controller]")] + [Route("api/v{version:apiVersion}/[controller]")] [Authorize] [ApiVersion("1.0")] [ApiController] @@ -14,7 +15,7 @@ namespace API.Controllers [HttpGet("users/{page}/{number}")] [ProducesResponseType(typeof(UserDTO), 200)] [ProducesResponseType(typeof(string), 204)] - public IActionResult GetUsers(int page, int number) + public IActionResult GetUsers(int page, int number) { var users = userService.GetUsers(page, number).ToList(); if (users.Count == 0) @@ -82,7 +83,7 @@ namespace API.Controllers [HttpPost] [ProducesResponseType(typeof(UserDTO), 201)] [ProducesResponseType(typeof(string), 400)] - public IActionResult CreateUser([FromBody]UserDTO dto) + public IActionResult CreateUser([FromBody] UserDTO dto) { if (dto.Username == null || dto.Password == null || dto.Email == null) { diff --git a/API_SQLuedo/API/Program.cs b/API_SQLuedo/API/Program.cs index 5f9663c..3c71775 100644 --- a/API_SQLuedo/API/Program.cs +++ b/API_SQLuedo/API/Program.cs @@ -1,12 +1,14 @@ using API; using API.Service; +using Asp.Versioning; using DbContextLib; using DbDataManager.Service; using Dto; using Entities; using Microsoft.AspNetCore.Identity; -using Microsoft.AspNetCore.Mvc.Versioning; +using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; +using Microsoft.Extensions.DependencyInjection; using Microsoft.OpenApi.Models; using Shared; @@ -26,7 +28,17 @@ builder.Services.AddDbContext(); builder.Services.AddDbContext(options => options.UseInMemoryDatabase("appDb")); builder.Services.AddIdentityApiEndpoints().AddEntityFrameworkStores(); builder.Services.AddAuthorization(); -builder.Services.AddApiVersioning(o => o.ApiVersionReader = new HeaderApiVersionReader("api-version")); +builder.Services.AddApiVersioning(o => +{ + o.AssumeDefaultVersionWhenUnspecified = true; + o.DefaultApiVersion = new ApiVersion(1); + o.ReportApiVersions = true; +}).AddApiExplorer( + options => + { + options.GroupNameFormat = "'v'VVV"; + options.SubstituteApiVersionInUrl = true; + }); //builder.Services.AddIdentityApiEndpoints() // .AddEntityFrameworkStores(); builder.Services.AddSwaggerGen(option => diff --git a/API_SQLuedo/DbContextLib/DbContextLib.csproj b/API_SQLuedo/DbContextLib/DbContextLib.csproj index f2f138b..9ba5522 100644 --- a/API_SQLuedo/DbContextLib/DbContextLib.csproj +++ b/API_SQLuedo/DbContextLib/DbContextLib.csproj @@ -7,6 +7,7 @@ + diff --git a/API_SQLuedo/DbDataManager/DbDataManager.csproj b/API_SQLuedo/DbDataManager/DbDataManager.csproj index 9220dbb..42ff6a0 100644 --- a/API_SQLuedo/DbDataManager/DbDataManager.csproj +++ b/API_SQLuedo/DbDataManager/DbDataManager.csproj @@ -8,6 +8,7 @@ + all diff --git a/API_SQLuedo/EntityFramework/Entities.csproj b/API_SQLuedo/EntityFramework/Entities.csproj index 0768618..0966a6d 100644 --- a/API_SQLuedo/EntityFramework/Entities.csproj +++ b/API_SQLuedo/EntityFramework/Entities.csproj @@ -7,6 +7,7 @@ + all diff --git a/API_SQLuedo/TestAPI/TestAPI.csproj b/API_SQLuedo/TestAPI/TestAPI.csproj index 9d1ad3b..f6cf968 100644 --- a/API_SQLuedo/TestAPI/TestAPI.csproj +++ b/API_SQLuedo/TestAPI/TestAPI.csproj @@ -10,6 +10,7 @@ + all diff --git a/API_SQLuedo/TestConsoleAPI/TestConsoleAPI.csproj b/API_SQLuedo/TestConsoleAPI/TestConsoleAPI.csproj index fa9db2a..683d41b 100644 --- a/API_SQLuedo/TestConsoleAPI/TestConsoleAPI.csproj +++ b/API_SQLuedo/TestConsoleAPI/TestConsoleAPI.csproj @@ -8,6 +8,7 @@ + diff --git a/API_SQLuedo/TestEF/TestEF.csproj b/API_SQLuedo/TestEF/TestEF.csproj index 9d1ad3b..f6cf968 100644 --- a/API_SQLuedo/TestEF/TestEF.csproj +++ b/API_SQLuedo/TestEF/TestEF.csproj @@ -10,6 +10,7 @@ + all