fix: remove mapper

netcorepal · Jan 16, 2025 · a00d012 · a00d012
1 parent 42c6a49
commit a00d012
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 36 deletions.
diff --git a/eng/versions.props b/eng/versions.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.2.0</VersionPrefix>
+    <VersionPrefix>2.2.1</VersionPrefix>
     <VersionSuffix></VersionSuffix>
   </PropertyGroup>
 </Project>
diff --git a/template/src/ABC.Template.Web/ABC.Template.Web.csproj b/template/src/ABC.Template.Web/ABC.Template.Web.csproj
@@ -7,7 +7,6 @@
     <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <DockerfileContext>..\..</DockerfileContext>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <UserSecretsId>668ac7fd-2ad0-4516-903a-21027c77bd2c</UserSecretsId>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="AspNet.Security.OAuth.Feishu" Version="9.0.0" />
@@ -32,7 +31,6 @@
     <PackageReference Include="NetCorePal.Extensions.AspNetCore" Version="$(NetCorePalVersion)" />
     <PackageReference Include="NetCorePal.Extensions.DistributedLocks.Redis" Version="$(NetCorePalVersion)" />
     <PackageReference Include="NetCorePal.Extensions.DistributedTransactions.CAP.MySql" Version="$(NetCorePalVersion)" />
-    <PackageReference Include="NetCorePal.Extensions.Mappers" Version="$(NetCorePalVersion)" />
     <PackageReference Include="NetCorePal.Extensions.MultiEnv" Version="$(NetCorePalVersion)" />
     <PackageReference Include="NetCorePal.Extensions.Primitives" Version="$(NetCorePalVersion)" />
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="9.0.0-preview.2.efcore.9.0.0" />
@@ -50,16 +48,15 @@
     <ProjectReference Include="..\ABC.Template.Infrastructure\ABC.Template.Infrastructure.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Migrations\" />
-    <Folder Include="wwwroot\" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Update="SonarAnalyzer.CSharp" Version="10.3.0.106239">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <Folder Include="wwwroot\" />
+  </ItemGroup>
+
 </Project>
diff --git a/template/src/ABC.Template.Web/Application/Commands/CreateOrderCommand.cs b/template/src/ABC.Template.Web/Application/Commands/CreateOrderCommand.cs
@@ -2,7 +2,6 @@
 using ABC.Template.Infrastructure.Repositories;
 using ABC.Template.Web.Application.IntegrationEventHandlers;
 using FluentValidation;
-using NetCorePal.Extensions.Mappers;
 using NetCorePal.Extensions.Primitives;
 
 namespace ABC.Template.Web.Application.Commands;
@@ -18,12 +17,12 @@ public CreateOrderCommandValidator()
     }
 }
 
-public class CreateOrderCommandHandler(IOrderRepository orderRepository, IMapperProvider mapperProvider, ILogger<OrderPaidIntegrationEventHandler> logger) : ICommandHandler<CreateOrderCommand, OrderId>
+public class CreateOrderCommandHandler(IOrderRepository orderRepository, ILogger<OrderPaidIntegrationEventHandler> logger) : ICommandHandler<CreateOrderCommand, OrderId>
 {
 
     public async Task<OrderId> Handle(CreateOrderCommand request, CancellationToken cancellationToken)
     {
-        var order = request.MapTo<Order>(mapperProvider);
+        var order = new Order(request.Name, request.Count);
         order = await orderRepository.AddAsync(order, cancellationToken);
         logger.LogInformation("order created, id:{orderId}", order.Id);
         return order.Id;

diff --git a/template/src/ABC.Template.Web/Application/Mappers/CreateOrderCommandToOrder.cs b/template/src/ABC.Template.Web/Application/Mappers/CreateOrderCommandToOrder.cs
diff --git a/template/src/ABC.Template.Web/Program.cs b/template/src/ABC.Template.Web/Program.cs
@@ -89,12 +89,6 @@
 
     #endregion
 
-    #region Mapper Provider
-
-    builder.Services.AddMapperPrivider(Assembly.GetExecutingAssembly());
-
-    #endregion
-
     #region Query
 
     builder.Services.AddScoped<OrderQuery>();

diff --git a/template/test/ABC.Template.Web.Tests/DemoTests.cs b/template/test/ABC.Template.Web.Tests/DemoTests.cs
@@ -124,11 +124,11 @@ public async Task LockTest()
         {
             var task1 = _client.GetAsync("/demo/lock");
             var task2 = _client.GetAsync("/demo/lock");
-            await Task.WhenAll(task1, task2);
-            Assert.True(task1.Result.IsSuccessStatusCode);
-            Assert.True(task2.Result.IsSuccessStatusCode);
-            var result1 = await task1.Result.Content.ReadFromNewtonsoftJsonAsync<ResponseData<bool>>();
-            var result2 = await task2.Result.Content.ReadFromNewtonsoftJsonAsync<ResponseData<bool>>();
+            var results = await Task.WhenAll(task1, task2);
+            Assert.True(results[0].IsSuccessStatusCode);
+            Assert.True(results[1].IsSuccessStatusCode);
+            var result1 = await results[0].Content.ReadFromNewtonsoftJsonAsync<ResponseData<bool>>();
+            var result2 = await results[1].Content.ReadFromNewtonsoftJsonAsync<ResponseData<bool>>();
             Assert.NotNull(result1);
             Assert.NotNull(result2);
             Assert.False(result1.Data);