From 98e17766b203734a1817eed94338e2d25f4395f7 Mon Sep 17 00:00:00 2001 From: transtrike Date: Sat, 13 Feb 2021 16:20:18 +0200 Subject: Project Restructure P.1 --- .../Configurations/Extensions/ConfigureSwagger.cs | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) create mode 100644 src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs (limited to 'src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs') diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs new file mode 100644 index 0000000..a0641ab --- /dev/null +++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs @@ -0,0 +1,23 @@ +using Microsoft.AspNetCore.Builder; +using Microsoft.Extensions.DependencyInjection; +using Microsoft.OpenApi.Models; + +namespace DevHive.Web.Configurations.Extensions +{ + public static class SwaggerExtensions + { + public static void SwaggerConfiguration(this IServiceCollection services) + { + services.AddSwaggerGen(c => + { + c.SwaggerDoc("v1", new OpenApiInfo { Title = "API", Version = "v1" }); + }); + } + + public static void UseSwaggerConfiguration(this IApplicationBuilder app) + { + app.UseSwagger(); + app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "API v1")); + } + } +} \ No newline at end of file -- cgit v1.2.3 From d841eada42e0f1f08f488a24752d2f2ae090cb53 Mon Sep 17 00:00:00 2001 From: transtrike Date: Thu, 25 Feb 2021 18:51:29 +0200 Subject: Initial Swagger configuration setup --- .../Configurations/Extensions/ConfigureSwagger.cs | 36 ++++++++++++++++++++-- src/Web/DevHive.Web/DevHive.Web.csproj | 3 +- 2 files changed, 35 insertions(+), 4 deletions(-) (limited to 'src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs') diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs index a0641ab..bfa44b0 100644 --- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs +++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs @@ -1,23 +1,53 @@ +using System; +using System.IO; +using System.Linq; +using System.Reflection; using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.OpenApi.Models; +using Swashbuckle.AspNetCore.SwaggerGen; namespace DevHive.Web.Configurations.Extensions { public static class SwaggerExtensions { +#pragma warning disable S1075 + private const string LicenseName = "GPL-3.0 License"; + private const string LicenseUri = "https://github.com/Team-Kaleidoscope/DevHive/blob/main/LICENSE"; + private const string TermsOfServiceUri = "https://example.com/terms"; +#pragma warning restore S1075 + public static void SwaggerConfiguration(this IServiceCollection services) { services.AddSwaggerGen(c => { - c.SwaggerDoc("v1", new OpenApiInfo { Title = "API", Version = "v1" }); + c.SwaggerDoc("v0.1", new OpenApiInfo + { + Version = "v0.1", + Title = "API", + Description = "DevHive Social Media's first official API release", + TermsOfService = new Uri(TermsOfServiceUri), + License = new OpenApiLicense + { + Name = LicenseName, + Url = new Uri(LicenseUri) + } + }); + + string xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; + string xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); + c.IncludeXmlComments(xmlPath); }); } public static void UseSwaggerConfiguration(this IApplicationBuilder app) { app.UseSwagger(); - app.UseSwaggerUI(c => c.SwaggerEndpoint("/swagger/v1/swagger.json", "API v1")); + app.UseSwaggerUI(c => + { + c.SwaggerEndpoint("/swagger/v0.1/swagger.json", "v0.1"); + }); } } -} \ No newline at end of file +} diff --git a/src/Web/DevHive.Web/DevHive.Web.csproj b/src/Web/DevHive.Web/DevHive.Web.csproj index 53f354e..6956613 100644 --- a/src/Web/DevHive.Web/DevHive.Web.csproj +++ b/src/Web/DevHive.Web/DevHive.Web.csproj @@ -5,6 +5,7 @@ true latest + true @@ -29,4 +30,4 @@ - \ No newline at end of file + -- cgit v1.2.3 From b9a9d63418d728560b17c23d49255328d16ccb11 Mon Sep 17 00:00:00 2001 From: transtrike Date: Wed, 3 Mar 2021 18:35:12 +0200 Subject: NSwag replaced Swagger; Doc prep configured --- .../DevHive.Common.Models.csproj | 2 +- .../DevHive.Data.Models/DevHive.Data.Models.csproj | 2 +- .../DevHive.Data.Tests/DevHive.Data.Tests.csproj | 2 +- src/Data/DevHive.Data/DevHive.Data.csproj | 2 +- .../DevHive.Services.Models.csproj | 10 ++-- .../DevHive.Services.Tests.csproj | 20 ++++---- .../DevHive.Services/DevHive.Services.csproj | 22 ++++----- .../DevHive.Web.Models/DevHive.Web.Models.csproj | 10 ++-- src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj | 18 +++---- .../Configurations/Extensions/ConfigureSwagger.cs | 56 +++++++++++++--------- src/Web/DevHive.Web/DevHive.Web.csproj | 37 +++++++------- src/Web/DevHive.Web/Startup.cs | 2 +- 12 files changed, 97 insertions(+), 86 deletions(-) (limited to 'src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs') diff --git a/src/Common/DevHive.Common.Models/DevHive.Common.Models.csproj b/src/Common/DevHive.Common.Models/DevHive.Common.Models.csproj index f6d662c..a952c59 100644 --- a/src/Common/DevHive.Common.Models/DevHive.Common.Models.csproj +++ b/src/Common/DevHive.Common.Models/DevHive.Common.Models.csproj @@ -4,7 +4,7 @@ - + true diff --git a/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj b/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj index e9dc644..d249c77 100644 --- a/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj +++ b/src/Data/DevHive.Data.Models/DevHive.Data.Models.csproj @@ -5,6 +5,6 @@ - + \ No newline at end of file diff --git a/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj b/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj index 46c7b83..25b2b39 100644 --- a/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj +++ b/src/Data/DevHive.Data.Tests/DevHive.Data.Tests.csproj @@ -9,7 +9,7 @@ - + diff --git a/src/Data/DevHive.Data/DevHive.Data.csproj b/src/Data/DevHive.Data/DevHive.Data.csproj index 46928c6..fcdb7ae 100644 --- a/src/Data/DevHive.Data/DevHive.Data.csproj +++ b/src/Data/DevHive.Data/DevHive.Data.csproj @@ -12,7 +12,7 @@ - + diff --git a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj index 6bbc60e..a55972a 100644 --- a/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj +++ b/src/Services/DevHive.Services.Models/DevHive.Services.Models.csproj @@ -3,11 +3,11 @@ net5.0 - - + + - - + + - + \ No newline at end of file diff --git a/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj b/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj index b3d0a32..d85eea2 100644 --- a/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj +++ b/src/Services/DevHive.Services.Tests/DevHive.Services.Tests.csproj @@ -4,20 +4,20 @@ false - - - - - - + + + + + + - - - + + + true latest - + \ No newline at end of file diff --git a/src/Services/DevHive.Services/DevHive.Services.csproj b/src/Services/DevHive.Services/DevHive.Services.csproj index 55d9d4e..f51c1b6 100644 --- a/src/Services/DevHive.Services/DevHive.Services.csproj +++ b/src/Services/DevHive.Services/DevHive.Services.csproj @@ -3,25 +3,25 @@ net5.0 - + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - + + + + + - - - - + + + + true latest - + \ No newline at end of file diff --git a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj index 7f3f577..9d62eee 100644 --- a/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj +++ b/src/Web/DevHive.Web.Models/DevHive.Web.Models.csproj @@ -3,11 +3,11 @@ net5.0 - - + + - - + + - + \ No newline at end of file diff --git a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj index 41afbd4..5099119 100644 --- a/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj +++ b/src/Web/DevHive.Web.Tests/DevHive.Web.Tests.csproj @@ -4,19 +4,19 @@ false - - - - - + + + + + - - - + + + true latest - + \ No newline at end of file diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs index bfa44b0..9387561 100644 --- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs +++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs @@ -1,12 +1,8 @@ -using System; -using System.IO; using System.Linq; -using System.Reflection; using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; -using Microsoft.OpenApi.Models; -using Swashbuckle.AspNetCore.SwaggerGen; +using NSwag; +using NSwag.Generation.Processors.Security; namespace DevHive.Web.Configurations.Extensions { @@ -20,33 +16,49 @@ namespace DevHive.Web.Configurations.Extensions public static void SwaggerConfiguration(this IServiceCollection services) { - services.AddSwaggerGen(c => + services.AddOpenApiDocument(c => { - c.SwaggerDoc("v0.1", new OpenApiInfo + c.GenerateXmlObjects = true; + c.UseControllerSummaryAsTagDescription = true; + + c.AllowNullableBodyParameters = false; + c.Description = "DevHive Social Media's API Endpoints"; + + c.PostProcess = doc => { - Version = "v0.1", - Title = "API", - Description = "DevHive Social Media's first official API release", - TermsOfService = new Uri(TermsOfServiceUri), - License = new OpenApiLicense + doc.Info.Version = "v0.1"; + doc.Info.Title = "API"; + doc.Info.Description = "DevHive Social Media's first official API release"; + doc.Info.TermsOfService = TermsOfServiceUri; + doc.Info.License = new NSwag.OpenApiLicense { Name = LicenseName, - Url = new Uri(LicenseUri) - } - }); + Url = LicenseUri + }; + }; - string xmlFile = $"{Assembly.GetExecutingAssembly().GetName().Name}.xml"; - string xmlPath = Path.Combine(AppContext.BaseDirectory, xmlFile); - c.IncludeXmlComments(xmlPath); + c.AddSecurity("Bearer", Enumerable.Empty(), new OpenApiSecurityScheme + { + Type = OpenApiSecuritySchemeType.ApiKey, + Name = "Authorization", + In = OpenApiSecurityApiKeyLocation.Header, + Description = "Type into the textbox: Bearer {your JWT token}." + }); + c.OperationProcessors.Add(new AspNetCoreOperationSecurityScopeProcessor("Bearer")); }); } public static void UseSwaggerConfiguration(this IApplicationBuilder app) { - app.UseSwagger(); - app.UseSwaggerUI(c => + app.UseOpenApi(c => + { + c.DocumentName = "v0.1"; + }); + app.UseSwaggerUi3(c => { - c.SwaggerEndpoint("/swagger/v0.1/swagger.json", "v0.1"); + c.DocumentTitle = "DevHive API"; + c.EnableTryItOut = false; + c.DocExpansion = "list"; }); } } diff --git a/src/Web/DevHive.Web/DevHive.Web.csproj b/src/Web/DevHive.Web/DevHive.Web.csproj index ea9eee6..38f21e6 100644 --- a/src/Web/DevHive.Web/DevHive.Web.csproj +++ b/src/Web/DevHive.Web/DevHive.Web.csproj @@ -5,32 +5,31 @@ true latest - true - true + true + true - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all - - - - - - - - - - - + + + + + + + + + + - - - - + + + + diff --git a/src/Web/DevHive.Web/Startup.cs b/src/Web/DevHive.Web/Startup.cs index 40f674d..ebd091e 100644 --- a/src/Web/DevHive.Web/Startup.cs +++ b/src/Web/DevHive.Web/Startup.cs @@ -48,7 +48,6 @@ namespace DevHive.Web if (env.IsDevelopment()) { app.UseDeveloperExceptionPage(); - app.UseSwaggerConfiguration(); } else { @@ -56,6 +55,7 @@ namespace DevHive.Web app.UseExceptionHandlerMiddlewareConfiguration(); } + app.UseSwaggerConfiguration(); app.UseDatabaseConfiguration(); app.UseAutoMapperConfiguration(); -- cgit v1.2.3 From e3b5757b5a5db2f7874b0924cdd4a22b1a9e1ee2 Mon Sep 17 00:00:00 2001 From: transtrike Date: Mon, 15 Mar 2021 09:23:25 +0200 Subject: Fixed to new() where possible and readable --- .../DevHive.Web.Tests/CommentController.Tests.cs | 6 ++--- src/Web/DevHive.Web.Tests/FeedController.Tests.cs | 26 +++++++++++----------- .../DevHive.Web.Tests/LanguageController.Tests.cs | 26 +++++++++++----------- src/Web/DevHive.Web.Tests/PostController.Tests.cs | 6 ++--- src/Web/DevHive.Web.Tests/RoleController.Tests.cs | 26 +++++++++++----------- .../TechnologyController.Tests.cs | 26 +++++++++++----------- src/Web/DevHive.Web.Tests/UserController.Tests.cs | 6 ++--- .../Configurations/Extensions/ConfigureSwagger.cs | 4 ++-- 8 files changed, 63 insertions(+), 63 deletions(-) (limited to 'src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs') diff --git a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs index 7860f3c..d5ba5a3 100644 --- a/src/Web/DevHive.Web.Tests/CommentController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/CommentController.Tests.cs @@ -24,9 +24,9 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.CommentServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.CommentController = new CommentController(this.CommentServiceMock.Object, this.MapperMock.Object); + this.CommentServiceMock = new(); + this.MapperMock = new(); + this.CommentController = new(this.CommentServiceMock.Object, this.MapperMock.Object); } #endregion diff --git a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs index 01f67e5..646ad93 100644 --- a/src/Web/DevHive.Web.Tests/FeedController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/FeedController.Tests.cs @@ -25,9 +25,9 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.FeedServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.FeedController = new FeedController(this.FeedServiceMock.Object, this.MapperMock.Object); + this.FeedServiceMock = new(); + this.MapperMock = new(); + this.FeedController = new(this.FeedServiceMock.Object, this.MapperMock.Object); } #endregion @@ -35,12 +35,12 @@ namespace DevHive.Web.Tests [Test] public async Task GetPosts_ReturnsOkObjectResultWithCorrectReadPageWebModel_WhenPostsExist() { - GetPageWebModel getPageWebModel = new GetPageWebModel { }; - GetPageServiceModel getPageServiceModel = new GetPageServiceModel { }; - ReadPageServiceModel readPageServiceModel = new ReadPageServiceModel { }; - ReadPageWebModel readPageWebModel = new ReadPageWebModel + GetPageWebModel getPageWebModel = new(); + GetPageServiceModel getPageServiceModel = new(); + ReadPageServiceModel readPageServiceModel = new(); + ReadPageWebModel readPageWebModel = new() { - Posts = new List + Posts = new() { new ReadPostWebModel(), new ReadPostWebModel(), @@ -67,12 +67,12 @@ namespace DevHive.Web.Tests [Test] public async Task GetUserPosts_GetsPostsOfUser_WhenTheyExist() { - GetPageWebModel getPageWebModel = new GetPageWebModel { }; - GetPageServiceModel getPageServiceModel = new GetPageServiceModel { }; - ReadPageServiceModel readPageServiceModel = new ReadPageServiceModel { }; - ReadPageWebModel readPageWebModel = new ReadPageWebModel + GetPageWebModel getPageWebModel = new(); + GetPageServiceModel getPageServiceModel = new(); + ReadPageServiceModel readPageServiceModel = new(); + ReadPageWebModel readPageWebModel = new() { - Posts = new List + Posts = new() { new ReadPostWebModel(), new ReadPostWebModel(), diff --git a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs index af4672a..8724d1a 100644 --- a/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/LanguageController.Tests.cs @@ -23,20 +23,20 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.LanguageServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.LanguageController = new LanguageController(this.LanguageServiceMock.Object, this.MapperMock.Object); + this.LanguageServiceMock = new(); + this.MapperMock = new(); + this.LanguageController = new(this.LanguageServiceMock.Object, this.MapperMock.Object); } #region Create [Test] public void CreateLanguage_ReturnsOkObjectResult_WhenLanguageIsSuccessfullyCreated() { - CreateLanguageWebModel createLanguageWebModel = new CreateLanguageWebModel + CreateLanguageWebModel createLanguageWebModel = new() { Name = NAME }; - CreateLanguageServiceModel createLanguageServiceModel = new CreateLanguageServiceModel + CreateLanguageServiceModel createLanguageServiceModel = new() { Name = NAME }; @@ -63,11 +63,11 @@ namespace DevHive.Web.Tests [Test] public void CreateLanguage_ReturnsBadRequestObjectResult_WhenLanguageIsNotCreatedSuccessfully() { - CreateLanguageWebModel createTechnologyWebModel = new CreateLanguageWebModel + CreateLanguageWebModel createTechnologyWebModel = new() { Name = NAME }; - CreateLanguageServiceModel createTechnologyServiceModel = new CreateLanguageServiceModel + CreateLanguageServiceModel createTechnologyServiceModel = new() { Name = NAME }; @@ -94,11 +94,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - ReadLanguageServiceModel readLanguageServiceModel = new ReadLanguageServiceModel + ReadLanguageServiceModel readLanguageServiceModel = new() { Name = NAME }; - ReadLanguageWebModel readLanguageWebModel = new ReadLanguageWebModel + ReadLanguageWebModel readLanguageWebModel = new() { Name = NAME }; @@ -122,11 +122,11 @@ namespace DevHive.Web.Tests public void Update_ShouldReturnOkResult_WhenLanguageIsUpdatedSuccessfully() { Guid id = Guid.NewGuid(); - UpdateLanguageWebModel updateLanguageWebModel = new UpdateLanguageWebModel + UpdateLanguageWebModel updateLanguageWebModel = new() { Name = NAME }; - UpdateLanguageServiceModel updateLanguageServiceModel = new UpdateLanguageServiceModel + UpdateLanguageServiceModel updateLanguageServiceModel = new() { Name = NAME }; @@ -144,11 +144,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); string message = "Could not update Language"; - UpdateLanguageWebModel updateLanguageWebModel = new UpdateLanguageWebModel + UpdateLanguageWebModel updateLanguageWebModel = new() { Name = NAME }; - UpdateLanguageServiceModel updateLanguageServiceModel = new UpdateLanguageServiceModel + UpdateLanguageServiceModel updateLanguageServiceModel = new() { Name = NAME }; diff --git a/src/Web/DevHive.Web.Tests/PostController.Tests.cs b/src/Web/DevHive.Web.Tests/PostController.Tests.cs index f10f8dd..d2107af 100644 --- a/src/Web/DevHive.Web.Tests/PostController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/PostController.Tests.cs @@ -23,9 +23,9 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.PostServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.PostController = new PostController(this.PostServiceMock.Object, this.MapperMock.Object); + this.PostServiceMock = new(); + this.MapperMock = new(); + this.PostController = new(this.PostServiceMock.Object, this.MapperMock.Object); } #region Create diff --git a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs index ff80dc0..1eaf0c5 100644 --- a/src/Web/DevHive.Web.Tests/RoleController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/RoleController.Tests.cs @@ -23,20 +23,20 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.RoleServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.RoleController = new RoleController(this.RoleServiceMock.Object, this.MapperMock.Object); + this.RoleServiceMock = new(); + this.MapperMock = new(); + this.RoleController = new(this.RoleServiceMock.Object, this.MapperMock.Object); } #region Create [Test] public void CreateRole_ReturnsOkObjectResult_WhenRoleIsSuccessfullyCreated() { - CreateRoleWebModel createRoleWebModel = new CreateRoleWebModel + CreateRoleWebModel createRoleWebModel = new() { Name = NAME }; - CreateRoleServiceModel createRoleServiceModel = new CreateRoleServiceModel + CreateRoleServiceModel createRoleServiceModel = new() { Name = NAME }; @@ -63,11 +63,11 @@ namespace DevHive.Web.Tests [Test] public void CreateRole_ReturnsBadRequestObjectResult_WhenRoleIsNotCreatedSuccessfully() { - CreateRoleWebModel createTechnologyWebModel = new CreateRoleWebModel + CreateRoleWebModel createTechnologyWebModel = new() { Name = NAME }; - CreateRoleServiceModel createTechnologyServiceModel = new CreateRoleServiceModel + CreateRoleServiceModel createTechnologyServiceModel = new() { Name = NAME }; @@ -94,11 +94,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - RoleServiceModel roleServiceModel = new RoleServiceModel + RoleServiceModel roleServiceModel = new() { Name = NAME }; - RoleWebModel roleWebModel = new RoleWebModel + RoleWebModel roleWebModel = new() { Name = NAME }; @@ -122,11 +122,11 @@ namespace DevHive.Web.Tests public void Update_ShouldReturnOkResult_WhenRoleIsUpdatedSuccessfully() { Guid id = Guid.NewGuid(); - UpdateRoleWebModel updateRoleWebModel = new UpdateRoleWebModel + UpdateRoleWebModel updateRoleWebModel = new() { Name = NAME }; - UpdateRoleServiceModel updateRoleServiceModel = new UpdateRoleServiceModel + UpdateRoleServiceModel updateRoleServiceModel = new() { Name = NAME }; @@ -144,11 +144,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); string message = "Could not update role!"; - UpdateRoleWebModel updateRoleWebModel = new UpdateRoleWebModel + UpdateRoleWebModel updateRoleWebModel = new() { Name = NAME }; - UpdateRoleServiceModel updateRoleServiceModel = new UpdateRoleServiceModel + UpdateRoleServiceModel updateRoleServiceModel = new() { Name = NAME }; diff --git a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs index a00f1db..d276951 100644 --- a/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/TechnologyController.Tests.cs @@ -25,9 +25,9 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.TechnologyServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.TechnologyController = new TechnologyController(this.TechnologyServiceMock.Object, this.MapperMock.Object); + this.TechnologyServiceMock = new(); + this.MapperMock = new(); + this.TechnologyController = new(this.TechnologyServiceMock.Object, this.MapperMock.Object); } #endregion @@ -35,11 +35,11 @@ namespace DevHive.Web.Tests [Test] public void Create_ReturnsOkObjectResult_WhenTechnologyIsSuccessfullyCreated() { - CreateTechnologyWebModel createTechnologyWebModel = new CreateTechnologyWebModel + CreateTechnologyWebModel createTechnologyWebModel = new() { Name = NAME }; - CreateTechnologyServiceModel createTechnologyServiceModel = new CreateTechnologyServiceModel + CreateTechnologyServiceModel createTechnologyServiceModel = new() { Name = NAME }; @@ -66,11 +66,11 @@ namespace DevHive.Web.Tests [Test] public void Create_ReturnsBadRequestObjectResult_WhenTechnologyIsNotCreatedSuccessfully() { - CreateTechnologyWebModel createTechnologyWebModel = new CreateTechnologyWebModel + CreateTechnologyWebModel createTechnologyWebModel = new() { Name = NAME }; - CreateTechnologyServiceModel createTechnologyServiceModel = new CreateTechnologyServiceModel + CreateTechnologyServiceModel createTechnologyServiceModel = new() { Name = NAME }; @@ -97,11 +97,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); - ReadTechnologyWebModel readTechnologyWebModel = new ReadTechnologyWebModel + ReadTechnologyWebModel readTechnologyWebModel = new() { Name = NAME }; - ReadTechnologyServiceModel readTechnologyServiceModel = new ReadTechnologyServiceModel + ReadTechnologyServiceModel readTechnologyServiceModel = new() { Name = NAME }; @@ -125,11 +125,11 @@ namespace DevHive.Web.Tests public void Update_ShouldReturnOkResult_WhenTechnologyIsUpdatedSuccessfully() { Guid id = Guid.NewGuid(); - UpdateTechnologyWebModel updateTechnologyWebModel = new UpdateTechnologyWebModel + UpdateTechnologyWebModel updateTechnologyWebModel = new() { Name = NAME }; - UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel + UpdateTechnologyServiceModel updateTechnologyServiceModel = new() { Name = NAME }; @@ -147,11 +147,11 @@ namespace DevHive.Web.Tests { Guid id = Guid.NewGuid(); string message = "Could not update Technology"; - UpdateTechnologyWebModel updateTechnologyWebModel = new UpdateTechnologyWebModel + UpdateTechnologyWebModel updateTechnologyWebModel = new() { Name = NAME }; - UpdateTechnologyServiceModel updateTechnologyServiceModel = new UpdateTechnologyServiceModel + UpdateTechnologyServiceModel updateTechnologyServiceModel = new() { Name = NAME }; diff --git a/src/Web/DevHive.Web.Tests/UserController.Tests.cs b/src/Web/DevHive.Web.Tests/UserController.Tests.cs index e12738e..3dfcfa3 100644 --- a/src/Web/DevHive.Web.Tests/UserController.Tests.cs +++ b/src/Web/DevHive.Web.Tests/UserController.Tests.cs @@ -23,9 +23,9 @@ namespace DevHive.Web.Tests [SetUp] public void SetUp() { - this.UserServiceMock = new Mock(); - this.MapperMock = new Mock(); - this.UserController = new UserController(this.UserServiceMock.Object, this.MapperMock.Object); + this.UserServiceMock = new(); + this.MapperMock = new(); + this.UserController = new(this.UserServiceMock.Object, this.MapperMock.Object); } #region Create diff --git a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs index 9387561..1b7182c 100644 --- a/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs +++ b/src/Web/DevHive.Web/Configurations/Extensions/ConfigureSwagger.cs @@ -30,14 +30,14 @@ namespace DevHive.Web.Configurations.Extensions doc.Info.Title = "API"; doc.Info.Description = "DevHive Social Media's first official API release"; doc.Info.TermsOfService = TermsOfServiceUri; - doc.Info.License = new NSwag.OpenApiLicense + doc.Info.License = new() { Name = LicenseName, Url = LicenseUri }; }; - c.AddSecurity("Bearer", Enumerable.Empty(), new OpenApiSecurityScheme + c.AddSecurity("Bearer", Enumerable.Empty(), new() { Type = OpenApiSecuritySchemeType.ApiKey, Name = "Authorization", -- cgit v1.2.3