Merge pull request #15 from babaktaremi/feature/updated-to-net-9

feature/updated-to-net-9

Author: babaktaremi

CleanArcTemplate.nuspec

@@ -3,15 +3,15 @@
   <metadata>
 
     <id>Bobby.CleanArcTemplate</id>
-    <version>5.2.0</version>
+    <version>9.0.0</version>
     <title>Clean Architecture Solution Template</title>
     <authors>BabakTaremi</authors>
-    <description>Clean Architecture Solution Template for and .NET 8. With many features available out of the box</description>
+    <description>Clean Architecture Solution Template for and .NET 9. With many features available out of the box</description>
     <summary>
      Ready to develop template based on clean architecture principles. Supports ASP NET Core Identity integrated with JWE tokens, OTP authentication, stand alone plugin development, CQRS pattern using MediatR library and dynamic permission management system out of the box
     </summary>
      <releaseNotes>
-Package updates. Fix a bug in auto register Automapper profiles where class did not have default constructor 
+Update To NET 9, Package Updates, Replaced Swashbuckle With NSwag ,Validation Errors No longer Throw Exceptions ,Removed Dependency of IServiceProvider in Base validator class, Monitoring Project ( Health Checks And Metrics ) Added With OpenTelemetry And Prometheus ,Added Metrics Related To Commands/Queries ,Updated AutoMapper Sample For Supporting Record Types, Dockerfile updated for .NET9 SDK, Added Custom Produce Response attribute to add ApiResult type example
     </releaseNotes>
 
 

CleanArcTemplate.sln

@@ -43,6 +43,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastru
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CleanArc.Test.Infrastructure.Identity", "src\Tests\CleanArc.Test.Infrastructure.Identity\CleanArc.Test.Infrastructure.Identity\CleanArc.Test.Infrastructure.Identity.csproj", "{54203B4F-3CE8-4EBA-B5E2-F7C985FACE60}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CleanArc.Infrastructure.Monitoring", "src\Infrastructure\CleanArc.Infrastructure.Monitoring\CleanArc.Infrastructure.Monitoring.csproj", "{7699705C-2C15-467F-957D-4C5EBE4FD92E}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -93,6 +95,10 @@ Global
 		{54203B4F-3CE8-4EBA-B5E2-F7C985FACE60}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{54203B4F-3CE8-4EBA-B5E2-F7C985FACE60}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{54203B4F-3CE8-4EBA-B5E2-F7C985FACE60}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7699705C-2C15-467F-957D-4C5EBE4FD92E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7699705C-2C15-467F-957D-4C5EBE4FD92E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7699705C-2C15-467F-957D-4C5EBE4FD92E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7699705C-2C15-467F-957D-4C5EBE4FD92E}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -117,6 +123,7 @@ Global
 		{33AF382A-9E22-42F0-82E5-4F78BCFD40C1} = {34B1F72E-A991-4705-ACC5-08E65E46D26E}
 		{45FA88C0-9986-40E5-A2E2-7742302518D2} = {77986571-8153-4120-AD08-36729310A56B}
 		{54203B4F-3CE8-4EBA-B5E2-F7C985FACE60} = {45FA88C0-9986-40E5-A2E2-7742302518D2}
+		{7699705C-2C15-467F-957D-4C5EBE4FD92E} = {2373AFFC-1389-4D78-8465-074AB22084AF}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {05C223B9-EA89-44B2-B9F5-D01181F85DFE}

Dockerfile

@@ -1,11 +1,11 @@
 #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging.
 
-FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base
+FROM mcr.microsoft.com/dotnet/aspnet:9.0 AS base
 WORKDIR /app
 EXPOSE 80
 EXPOSE 443
 
-FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:9.0 AS build
 WORKDIR /src
 COPY ["src/API/CleanArc.Web.Api/CleanArc.Web.Api.csproj", "src/API/CleanArc.Web.Api/"]
 COPY ["src/API/CleanArc.WebFramework/CleanArc.WebFramework.csproj", "src/API/CleanArc.WebFramework/"]

src/API/CleanArc.Web.Api/CleanArc.Web.Api.csproj

@@ -1,38 +1,30 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 	  <ImplicitUsings>enable</ImplicitUsings>
 	  <IsPackable>true</IsPackable>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DocumentationFile>Project.xml</DocumentationFile>
-    <OutputPath>bin\Debug\</OutputPath>
+    <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <NoWarn>$(NoWarn);1591</NoWarn>
   </PropertyGroup>
   <ItemGroup>
-	  <PackageReference Include="Carter" Version="8.0.0" />
-	  <PackageReference Include="Serilog.AspNetCore" Version="8.0.1" />
-	  <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.3">
+	  <PackageReference Include="Carter" Version="8.2.1" />
+	  <PackageReference Include="Serilog.AspNetCore" Version="8.0.3" />
+	  <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
+    <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="9.0.0" />
 	  <PackageReference Include="AutoMapper" Version="13.0.1" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
+    <ProjectReference Include="..\..\Infrastructure\CleanArc.Infrastructure.Monitoring\CleanArc.Infrastructure.Monitoring.csproj" />
     <ProjectReference Include="..\CleanArc.WebFramework\CleanArc.WebFramework.csproj" />
     <ProjectReference Include="..\Plugins\CleanArc.Web.Plugins.Grpc\CleanArc.Web.Plugins.Grpc.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <None Update="Project.xml">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
-
 </Project>

src/API/CleanArc.Web.Api/Controllers/V1/Admin/AdminManagerController.cs

@@ -1,8 +1,9 @@
 using Asp.Versioning;
 using CleanArc.Application.Features.Admin.Commands.AddAdminCommand;
 using CleanArc.Application.Features.Admin.Queries.GetToken;
+using CleanArc.Application.Models.Jwt;
+using CleanArc.WebFramework.Attributes;
 using CleanArc.WebFramework.BaseController;
-using CleanArc.WebFramework.WebExtensions;
 using Mediator;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -15,6 +16,7 @@ namespace CleanArc.Web.Api.Controllers.V1.Admin
     public class AdminManagerController(ISender sender) : BaseController
     {
         [HttpPost("Login")]
+        [ProducesOkApiResponseType<AccessToken>]
         public async Task<IActionResult> AdminLogin(AdminGetTokenQuery model)
         {
             var query = await sender.Send(model);
@@ -24,6 +26,7 @@ public async Task<IActionResult> AdminLogin(AdminGetTokenQuery model)
 
         [Authorize(Roles = "admin")]
         [HttpPost("NewAdmin")]
+        [ProducesOkApiResponseType]
         public async Task<IActionResult> AddNewAdmin(AddAdminCommand model)
         {
             var commandResult = await sender.Send(model);

src/API/CleanArc.Web.Api/Controllers/V1/Admin/OrderManagementController.cs

@@ -4,8 +4,8 @@
 using System.ComponentModel.DataAnnotations;
 using Asp.Versioning;
 using CleanArc.Application.Features.Order.Queries.GetAllOrders;
+using CleanArc.WebFramework.Attributes;
 using CleanArc.WebFramework.BaseController;
-using CleanArc.WebFramework.WebExtensions;
 using Mediator;
 
 namespace CleanArc.Web.Api.Controllers.V1.Admin
@@ -25,6 +25,7 @@ public OrderManagementController(ISender sender)
         }
 
         [HttpGet("OrderList")]
+        [ProducesOkApiResponseType<List<GetAllOrdersQueryResult>>]
         public async Task<IActionResult> GetOrders()
         {
             var queryResult = await _sender.Send(new GetAllOrdersQuery());

src/API/CleanArc.Web.Api/Controllers/V1/Admin/RoleManagerController.cs

@@ -5,8 +5,8 @@
 using CleanArc.Application.Features.Role.Queries.GetAllRolesQuery;
 using CleanArc.Application.Features.Role.Queries.GetAuthorizableRoutesQuery;
 using CleanArc.Infrastructure.Identity.Identity.PermissionManager;
+using CleanArc.WebFramework.Attributes;
 using CleanArc.WebFramework.BaseController;
-using CleanArc.WebFramework.WebExtensions;
 using Mediator;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -22,6 +22,7 @@ namespace CleanArc.Web.Api.Controllers.V1.Admin
     public class RoleManagerController(ISender sender) : BaseController
     {
         [HttpGet("Roles")]
+        [ProducesOkApiResponseType<List<GetAllRolesQueryResponse>>]
         public async Task<IActionResult> GetRoles()
         {
             var queryResult = await sender.Send(new GetAllRolesQuery());
@@ -30,6 +31,7 @@ public async Task<IActionResult> GetRoles()
         }
 
         [HttpGet("AuthRoutes")]
+        [ProducesOkApiResponseType<List<GetAuthorizableRoutesQueryResponse>>]
         public async Task<IActionResult> GetAuthRoutes()
         {
             var queryModel = await sender.Send(new GetAuthorizableRoutesQuery());
@@ -43,6 +45,7 @@ public async Task<IActionResult> GetAuthRoutes()
         /// <param name="model"></param>
         /// <returns></returns>
         [HttpPut("UpdateRolePermissions")]
+        [ProducesOkApiResponseType]
         public async Task<IActionResult> UpdateRolePermissions(UpdateRoleClaimsCommand model)
         {
             var commandResult =
@@ -52,6 +55,7 @@ public async Task<IActionResult> UpdateRolePermissions(UpdateRoleClaimsCommand m
         }
 
         [HttpPost("NewRole")]
+        [ProducesOkApiResponseType]
         public async Task<IActionResult> AddRole(AddRoleCommand model)
         {
             var commandResult = await sender.Send(model);

src/API/CleanArc.Web.Api/Controllers/V1/Admin/UserManagementController.cs

@@ -4,8 +4,8 @@
 using System.ComponentModel.DataAnnotations;
 using Asp.Versioning;
 using CleanArc.Application.Features.Users.Queries.GetUsers;
+using CleanArc.WebFramework.Attributes;
 using CleanArc.WebFramework.BaseController;
-using CleanArc.WebFramework.WebExtensions;
 using Mediator;
 
 namespace CleanArc.Web.Api.Controllers.V1.Admin
@@ -25,6 +25,7 @@ public UserManagementController(ISender sender)
         }
 
         [HttpGet("CurrentUsers")]
+        [ProducesOkApiResponseType<List<GetUsersQueryResponse>>]
         public async Task<IActionResult> GetAllUsers()
         {
             var queryResult = await _sender.Send(new GetUsersQuery());

src/API/CleanArc.Web.Api/Controllers/V1/Order/OrderController.cs

@@ -1,8 +1,8 @@
 using Asp.Versioning;
 using CleanArc.Application.Features.Order.Commands;
 using CleanArc.Application.Features.Order.Queries.GetUserOrders;
+using CleanArc.WebFramework.Attributes;
 using CleanArc.WebFramework.BaseController;
-using CleanArc.WebFramework.WebExtensions;
 using Mediator;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -16,6 +16,7 @@ namespace CleanArc.Web.Api.Controllers.V1.Order;
 public class OrderController(ISender sender) : BaseController
 {
     [HttpPost("CreateNewOrder")]
+    [ProducesOkApiResponseType]
     public async Task<IActionResult> CreateNewOrder(AddOrderCommand model)
     {
         model.UserId = base.UserId;
@@ -25,6 +26,7 @@ public async Task<IActionResult> CreateNewOrder(AddOrderCommand model)
     }
 
     [HttpGet("GetUserOrders")]
+    [ProducesOkApiResponseType<List<GetUsersQueryResultModel>>]
     public async Task<IActionResult> GetUserOrders()
     {
         var query = await sender.Send(new GetUserOrdersQueryModel(UserId));
@@ -33,6 +35,7 @@ public async Task<IActionResult> GetUserOrders()
     }
 
     [HttpPut("UpdateOrder")]
+    [ProducesOkApiResponseType]
     public async Task<IActionResult> UpdateOrder(UpdateUserOrderCommand model)
     {
         model.UserId=base.UserId;
@@ -43,6 +46,7 @@ public async Task<IActionResult> UpdateOrder(UpdateUserOrderCommand model)
     }
 
     [HttpDelete("DeleteAllUserOrders")]
+    [ProducesOkApiResponseType]
     public async Task<IActionResult> DeleteAllUserOrders()
         => base.OperationResult(await sender.Send(new DeleteUserOrdersCommand(base.UserId)));
 }

src/API/CleanArc.Web.Api/Controllers/V1/UserManagement/UserController.cs

@@ -4,9 +4,10 @@
 using CleanArc.Application.Features.Users.Commands.RequestLogout;
 using CleanArc.Application.Features.Users.Queries.GenerateUserToken;
 using CleanArc.Application.Features.Users.Queries.TokenRequest;
+using CleanArc.Application.Models.Jwt;
+using CleanArc.WebFramework.Attributes;
 using CleanArc.WebFramework.BaseController;
 using CleanArc.WebFramework.Swagger;
-using CleanArc.WebFramework.WebExtensions;
 using Mediator;
 using Microsoft.AspNetCore.Authentication;
 using Microsoft.AspNetCore.Authentication.JwtBearer;
@@ -28,6 +29,7 @@ public UserController(IMediator mediator)
     }
 
     [HttpPost("Register")]
+    [ProducesOkApiResponseType<UserCreateCommandResult>]
     public async Task<IActionResult> CreateUser(UserCreateCommand model)
     {
         var command = await _mediator.Send(model);
@@ -37,6 +39,7 @@ public async Task<IActionResult> CreateUser(UserCreateCommand model)
 
 
     [HttpPost("TokenRequest")]
+    [ProducesOkApiResponseType<UserTokenRequestQueryResponse>]
     public async Task<IActionResult> TokenRequest(UserTokenRequestQuery model)
     {
         var query = await _mediator.Send(model);
@@ -45,6 +48,7 @@ public async Task<IActionResult> TokenRequest(UserTokenRequestQuery model)
     }
 
     [HttpPost("LoginConfirmation")]
+    [ProducesOkApiResponseType<AccessToken>]
     public async Task<IActionResult> ValidateUser(GenerateUserTokenQuery model)
     {
         var result = await _mediator.Send(model);
@@ -54,6 +58,7 @@ public async Task<IActionResult> ValidateUser(GenerateUserTokenQuery model)
 
     [HttpPost("RefreshSignIn")]
     [RequireTokenWithoutAuthorization]
+    [ProducesOkApiResponseType<AccessToken>]
     public async Task<IActionResult> RefreshUserToken(RefreshUserTokenCommand model)
     {
         var checkCurrentAccessTokenValidity =await HttpContext.AuthenticateAsync(JwtBearerDefaults.AuthenticationScheme);
@@ -68,6 +73,7 @@ public async Task<IActionResult> RefreshUserToken(RefreshUserTokenCommand model)
 
     [HttpPost("Logout")]
     [Authorize]
+    [ProducesOkApiResponseType]
     public async Task<IActionResult> RequestLogout()
     {
         var commandResult = await _mediator.Send(new RequestLogoutCommand(base.UserId));

src/API/CleanArc.Web.Api/Endpoints/UserEndpoints.cs

@@ -8,9 +8,6 @@
 using CleanArc.SharedKernel.Extensions;
 using CleanArc.WebFramework.WebExtensions;
 using Mediator;
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Mvc;
 
 namespace CleanArc.Web.Api.Endpoints;