update

PandaTechAM · Jun 19, 2024 · df6628a · df6628a
1 parent 8370918
commit df6628a
Show file tree

Hide file tree

Showing 13 changed files with 103 additions and 110 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,70 +1,70 @@
 <Project>
-   <ItemGroup>
-      <PackageVersion Include="AspNetCore.HealthChecks.Elasticsearch" Version="8.0.1"/>
-      <PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.1"/>
-      <PackageVersion Include="AspNetCore.HealthChecks.Rabbitmq" Version="8.0.1"/>
-      <PackageVersion Include="AspNetCore.HealthChecks.Prometheus.Metrics" Version="8.0.1"/>
-      <PackageVersion Include="AspNetCore.HealthChecks.Redis" Version="8.0.1"/>
-      <PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1"/>
-      <PackageVersion Include="EFCore.NamingConventions" Version="8.0.3"/>
-      <PackageVersion Include="FluentDateTime" Version="3.0.0"/>
-      <PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0"/>
-      <PackageVersion Include="Hangfire" Version="1.8.14"/>
-      <PackageVersion Include="Hangfire.Dashboard.Basic.Authentication" Version="7.0.1"/>
-      <PackageVersion Include="Hangfire.EntityFrameworkCore" Version="0.6.0"/>
-      <PackageVersion Include="Hangfire.PostgreSql" Version="1.20.8"/>
-      <PackageVersion Include="MassTransit.RabbitMQ" Version="8.2.3"/>
-      <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6"/>
-      <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.6"/>
-      <PackageVersion Include="MediatR"/>
-      <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
-         <PrivateAssets>all</PrivateAssets>
-         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageVersion>
-      <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
-         <PrivateAssets>all</PrivateAssets>
-         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageVersion>
-      <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0"/>
-      <PackageVersion Include="NetArchTest.Rules" Version="1.3.2"/>
-      <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4"/>
-      <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0"/>
-      <PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.7.0-rc.1"/>
-      <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0"/>
-      <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0"/>
-      <PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1"/>
-      <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0"/>
-      <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0"/>
-      <PackageVersion Include="Otp.NET" Version="1.3.0"/>
-      <PackageVersion Include="PandaTech.BaseConverter" Version="3.0.6"/>
-      <PackageVersion Include="Pandatech.DistributedCache" Version="1.1.0"/>
-      <PackageVersion Include="Pandatech.EFCore.AuditBase" Version="1.0.3"/>
-      <PackageVersion Include="Pandatech.FluentMinimalApiMapper" Version="1.1.0"/>
-      <PackageVersion Include="Pandatech.CommissionCalculator" Version="3.3.0"/>
-      <PackageVersion Include="Pandatech.Communicator" Version="1.0.5"/>
-      <PackageVersion Include="Pandatech.Crypto" Version="2.4.1"/>
-      <PackageVersion Include="Pandatech.GridifyExtensions" Version="1.3.0"/>
-      <PackageVersion Include="Pandatech.MassTransit.PostgresOutbox" Version="1.0.7"/>
-      <PackageVersion Include="Pandatech.PandaVaultClient" Version="3.1.0"/>
-      <PackageVersion Include="Pandatech.RegexBox" Version="1.2.4"/>
-      <PackageVersion Include="Pandatech.ResponseCrafter" Version="2.0.0"/>
-      <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1"/>
-      <PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.0"/>
-      <PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="10.0.0"/>
-      <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.27.0.93347">
-         <PrivateAssets>all</PrivateAssets>
-         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageVersion>
-      <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2"/>
-      <PackageVersion Include="UAParser" Version="3.1.47"/>
-      <PackageVersion Include="coverlet.collector" Version="6.0.2">
-         <PrivateAssets>all</PrivateAssets>
-         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageVersion>
-      <PackageVersion Include="xunit" Version="2.8.1"/>
-      <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1">
-         <PrivateAssets>all</PrivateAssets>
-         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      </PackageVersion>
-   </ItemGroup>
+  <ItemGroup>
+    <PackageVersion Include="AspNetCore.HealthChecks.Elasticsearch" Version="8.0.1" />
+    <PackageVersion Include="AspNetCore.HealthChecks.NpgSql" Version="8.0.1" />
+    <PackageVersion Include="AspNetCore.HealthChecks.Rabbitmq" Version="8.0.1" />
+    <PackageVersion Include="AspNetCore.HealthChecks.Prometheus.Metrics" Version="8.0.1" />
+    <PackageVersion Include="AspNetCore.HealthChecks.Redis" Version="8.0.1" />
+    <PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="8.0.1" />
+    <PackageVersion Include="EFCore.NamingConventions" Version="8.0.3" />
+    <PackageVersion Include="FluentDateTime" Version="3.0.0" />
+    <PackageVersion Include="FluentValidation.AspNetCore" Version="11.3.0" />
+    <PackageVersion Include="Hangfire" Version="1.8.14" />
+    <PackageVersion Include="Hangfire.Dashboard.Basic.Authentication" Version="7.0.1" />
+    <PackageVersion Include="Hangfire.EntityFrameworkCore" Version="0.6.0" />
+    <PackageVersion Include="Hangfire.PostgreSql" Version="1.20.8" />
+    <PackageVersion Include="MassTransit.RabbitMQ" Version="8.2.3" />
+    <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
+    <PackageVersion Include="MediatR" Version="12.3.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
+    <PackageVersion Include="NetArchTest.Rules" Version="1.3.2" />
+    <PackageVersion Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
+    <PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.9.0" />
+    <PackageVersion Include="OpenTelemetry.Exporter.Prometheus.AspNetCore" Version="1.7.0-rc.1" />
+    <PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.AspNetCore" Version="1.9.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.GrpcNetClient" Version="1.7.0-beta.1" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Http" Version="1.9.0" />
+    <PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />
+    <PackageVersion Include="Otp.NET" Version="1.3.0" />
+    <PackageVersion Include="PandaTech.BaseConverter" Version="4.0.1" />
+    <PackageVersion Include="Pandatech.DistributedCache" Version="1.1.0" />
+    <PackageVersion Include="Pandatech.EFCore.AuditBase" Version="1.0.3" />
+    <PackageVersion Include="Pandatech.FluentMinimalApiMapper" Version="1.1.0" />
+    <PackageVersion Include="Pandatech.CommissionCalculator" Version="3.3.0" />
+    <PackageVersion Include="Pandatech.Communicator" Version="1.0.5" />
+    <PackageVersion Include="Pandatech.Crypto" Version="2.4.1" />
+    <PackageVersion Include="Pandatech.GridifyExtensions" Version="1.3.0" />
+    <PackageVersion Include="Pandatech.MassTransit.PostgresOutbox" Version="1.0.7" />
+    <PackageVersion Include="Pandatech.PandaVaultClient" Version="3.1.0" />
+    <PackageVersion Include="Pandatech.RegexBox" Version="1.2.4" />
+    <PackageVersion Include="Pandatech.ResponseCrafter" Version="2.0.0" />
+    <PackageVersion Include="Serilog.AspNetCore" Version="8.0.1" />
+    <PackageVersion Include="Serilog.Enrichers.Environment" Version="3.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Elasticsearch" Version="10.0.0" />
+    <PackageVersion Include="SonarAnalyzer.CSharp" Version="9.27.0.93347">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Swashbuckle.AspNetCore" Version="6.6.2" />
+    <PackageVersion Include="UAParser" Version="3.1.47" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="xunit" Version="2.8.1" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+  </ItemGroup>
 </Project>
diff --git a/src/Pandatech.CleanArchitecture.Api/Endpoints/Users/UserEndpoints.cs b/src/Pandatech.CleanArchitecture.Api/Endpoints/Users/UserEndpoints.cs
@@ -1,4 +1,5 @@
 using BaseConverter.Attributes;
+using BaseConverter.Extensions;
 using FluentMinimalApiMapper;
 using GridifyExtensions.Extensions;
 using MediatR;
@@ -40,49 +41,52 @@ public void AddRoutes(IEndpointRouteBuilder app)
          .Authorize()
          .ProducesErrorResponse(400);
 
-      groupApp.MapGet("/{id}", async (ISender sender, [PandaParameterBaseConverter] long id, CancellationToken token) =>
+      groupApp.MapGet("/{id}", async (ISender sender, long id, CancellationToken token) =>
          {
             var user = await sender.Send(new GetUserQuery(id), token);
             return TypedResults.Ok(user);
          })
          .Authorize()
+         .RouteBaseConverter()
          .ProducesErrorResponse(404);
 
 
       groupApp.MapPut("/{id}",
-            async (ISender sender, [PandaParameterBaseConverter] long id, [FromBody] UpdateUserCommand command,
+            async (ISender sender, long id, [FromBody] UpdateUserCommand command,
                CancellationToken token) =>
             {
                command.Id = id;
                await sender.Send(command, token);
                return TypedResults.Ok();
             })
          .Authorize()
+         .RouteBaseConverter()
          .ProducesErrorResponse(400)
          .ProducesErrorResponse(409);
 
 
       groupApp.MapPatch("/{id}/password",
-            async (ISender sender, [PandaParameterBaseConverter] long id,
+            async (ISender sender, long id,
                [FromBody] UpdateUserPasswordCommand command, CancellationToken token) =>
             {
                command.Id = id;
                await sender.Send(command, token);
                return TypedResults.Ok();
             })
          .Authorize()
+         .RouteBaseConverter()
          .ProducesErrorResponse(400)
          .ProducesErrorResponse(404);
 
       groupApp.MapPatch("/{id}/status",
-            async (ISender sender, [PandaParameterBaseConverter] long id,
-               [FromBody] UpdateUserStatusCommand command, CancellationToken token) =>
+            async (ISender sender, long id, [FromBody] UpdateUserStatusCommand command, CancellationToken token) =>
             {
                command.Id = id;
                await sender.Send(command, token);
                return TypedResults.Ok();
             })
          .Authorize()
+         .RouteBaseConverter()
          .ProducesErrorResponse(400)
          .ProducesErrorResponse(404);
 

diff --git a/src/Pandatech.CleanArchitecture.Api/Extensions/SwaggerExtension.cs b/src/Pandatech.CleanArchitecture.Api/Extensions/SwaggerExtension.cs
@@ -1,4 +1,5 @@
 using BaseConverter.Attributes;
+using BaseConverter.Extensions;
 using BaseConverter.Filters;
 using Microsoft.OpenApi.Models;
 using Pandatech.CleanArchitecture.Api.Configurations.Options;
@@ -39,8 +40,7 @@ public static WebApplicationBuilder AddSwagger(this WebApplicationBuilder builde
          }
 
          // Add string input support into int64 field
-         options.ParameterFilter<PandaParameterBaseConverterAttribute>();
-         options.SchemaFilter<PandaPropertyBaseConverterSwaggerFilter>();
+         options.AddBaseConverterFilters();
          options.SchemaFilter<EnumSwaggerSchemaFilter>();
 
          // Add the custom token authentication option

diff --git a/src/Pandatech.CleanArchitecture.Api/wwwroot/assets/css/panda-style.css b/src/Pandatech.CleanArchitecture.Api/wwwroot/assets/css/panda-style.css
@@ -1,10 +1,12 @@
-.swagger-ui .auth-container .btn.modal-btn.auth{
+.swagger-ui .auth-container .btn.modal-btn.auth {
    display: flex;
    justify-content: center;
 }
-.topbar-wrapper > a > svg{
+
+.topbar-wrapper > a > svg {
    opacity: 0;
 }
+
 .swagger-ui .topbar .download-url-wrapper {
    display: flex;
 }

diff --git a/src/Pandatech.CleanArchitecture.Api/wwwroot/assets/images/favicon.svg b/src/Pandatech.CleanArchitecture.Api/wwwroot/assets/images/favicon.svg
diff --git a/...tecture.Application/Features/Auth/Contracts/IdentityState/IdentityStateCommandResponse.cs b/...tecture.Application/Features/Auth/Contracts/IdentityState/IdentityStateCommandResponse.cs
@@ -10,7 +10,7 @@ public class IdentityStateCommandResponse(
    string fullName,
    UserRole userRole)
 {
-   [PandaPropertyBaseConverter] public long UserId { get; set; } = userId;
+   [PropertyBaseConverter] public long UserId { get; set; } = userId;
    public UserStatus Status { get; set; } = status;
    public string FullName { get; set; } = fullName;
    public UserRole UserRole { get; set; } = userRole;