feat(eventBus): EventBus extension supports UseMiddleware and Optimiz…

…ed use of UseSoftDelete method (#16) * feat(EventBUs): Support Middleware * chore(library): update package version * perf(Contracts.EF): Optimize the UseSoftDelete method * doc(Masa.Contrib.Data.Contracts.EF): Modify the UseSoftDelete documentation
masastack · Mar 14, 2022 · b9bde32 · b9bde32
1 parent 12c3df0
commit b9bde32
Show file tree

Hide file tree

Showing 19 changed files with 72 additions and 53 deletions.
diff --git a/README.md b/README.md
@@ -118,11 +118,7 @@ Install-Package Masa.Contrib.Data.Contracts.EF
 
 ```C#
 builder.Services.AddEventBus(options => {
-    options.UseUoW<CustomDbContext>(dbOptions =>
-    {
-        dbOptions.UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity");
-        dbOptions.UseSoftDelete(builder.Services);
-    });
+    options.UseUoW<CustomDbContext>(dbOptions => dbOptions.UseSoftDelete().UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity"));
 });
 
 ```

diff --git a/README.zh-CN.md b/README.zh-CN.md
@@ -118,11 +118,7 @@ Install-Package Masa.Contrib.Data.Contracts.EF
 
 ```C#
 builder.Services.AddEventBus(options => {
-    options.UseUoW<CustomDbContext>(dbOptions =>
-    {
-        dbOptions.UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity");
-        dbOptions.UseSoftDelete(builder.Services);//启动软删除
-    });
+    options.UseUoW<CustomDbContext>(dbOptions => dbOptions.UseSoftDelete().UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity"));
 });
 ```
 

diff --git a/src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Masa.Contrib.BasicAbility.Dcc.csproj b/src/BasicAbility/Masa.Contrib.BasicAbility.Dcc/Masa.Contrib.BasicAbility.Dcc.csproj
@@ -7,10 +7,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.Utils.Caching.DistributedMemory" Version="0.3.1" />
-    <PackageReference Include="Masa.Utils.Caching.Redis" Version="0.3.1" />
-    <PackageReference Include="Masa.Utils.Caller.Core" Version="0.3.1" />
-    <PackageReference Include="Masa.Utils.Caller.HttpClient" Version="0.3.1" />
+    <PackageReference Include="Masa.Utils.Caching.DistributedMemory" Version="0.3.2" />
+    <PackageReference Include="Masa.Utils.Caching.Redis" Version="0.3.2" />
+    <PackageReference Include="Masa.Utils.Caller.Core" Version="0.3.2" />
+    <PackageReference Include="Masa.Utils.Caller.HttpClient" Version="0.3.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />

diff --git a/src/BuildingBlocks/MASA.BuildingBlocks b/src/BuildingBlocks/MASA.BuildingBlocks
diff --git a/src/Data/Masa.Contrib.Data.Contracts.EF/Masa.Contrib.Data.Contracts.EF.csproj b/src/Data/Masa.Contrib.Data.Contracts.EF/Masa.Contrib.Data.Contracts.EF.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.Utils.Data.EntityFrameworkCore" Version="0.3.1" />
+    <PackageReference Include="Masa.Utils.Data.EntityFrameworkCore" Version="0.3.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
   </ItemGroup>

diff --git a/src/Data/Masa.Contrib.Data.Contracts.EF/README.md b/src/Data/Masa.Contrib.Data.Contracts.EF/README.md
@@ -11,11 +11,7 @@ Install-Package Masa.Contrib.Data.Contracts.EF
 
 ```C#
 builder.Services.AddEventBus(options => {
-    options.UseUoW<CustomDbContext>(dbOptions =>
-    {
-        dbOptions.UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity");
-        dbOptions.UseSoftDelete(builder.Services);
-    });
+    options.UseUoW<CustomDbContext>(dbOptions => dbOptions.UseSoftDelete().UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity"));
 });
 ```
 

diff --git a/src/Data/Masa.Contrib.Data.Contracts.EF/README.zh-CN.md b/src/Data/Masa.Contrib.Data.Contracts.EF/README.zh-CN.md
@@ -11,11 +11,7 @@ Install-Package Masa.Contrib.Data.Contracts.EF
 
 ```C#
 builder.Services.AddEventBus(options => {
-    options.UseUoW<CustomDbContext>(dbOptions =>
-    {
-        dbOptions.UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity");
-        dbOptions.UseSoftDelete(builder.Services);//启动软删除
-    });
+    options.UseUoW<CustomDbContext>(dbOptions => dbOptions.UseSoftDelete().UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity"));
 });
 ```
 

diff --git a/src/Data/Masa.Contrib.Data.Contracts.EF/ServiceCollectionExtensions.cs b/src/Data/Masa.Contrib.Data.Contracts.EF/ServiceCollectionExtensions.cs
@@ -2,19 +2,24 @@ namespace Masa.Contrib.Data.Contracts.EF;
 
 public static class ServiceCollectionExtensions
 {
+    [Obsolete("Please use optionsBuilder.UseSoftDelete()")]
     public static MasaDbContextOptionsBuilder UseSoftDelete(
-        this MasaDbContextOptionsBuilder optionsBuilder, IServiceCollection services)
+        this MasaDbContextOptionsBuilder masaDbContextOptionsBuilder,
+        IServiceCollection services) => masaDbContextOptionsBuilder.UseSoftDelete();
+
+    public static MasaDbContextOptionsBuilder UseSoftDelete(
+        this MasaDbContextOptionsBuilder masaDbContextOptionsBuilder)
     {
-        if (services.Any(s => s.ImplementationType == typeof(ContractsFilter))) return optionsBuilder;
-        services.AddSingleton<ContractsFilter>();
+        if (masaDbContextOptionsBuilder.Services.Any(s => s.ImplementationType == typeof(ContractsFilter))) return masaDbContextOptionsBuilder;
+        masaDbContextOptionsBuilder.Services.AddSingleton<ContractsFilter>();
 
-        if (services.All(service => service.ServiceType != typeof(IUnitOfWork)))
+        if (masaDbContextOptionsBuilder.Services.All(service => service.ServiceType != typeof(IUnitOfWork)))
             throw new Exception("Please add UoW first.");
 
-        optionsBuilder.UseQueryFilterProvider<QueryFilterProvider>()
+        masaDbContextOptionsBuilder.UseQueryFilterProvider<QueryFilterProvider>()
             .UseSaveChangesFilter<SoftDeleteSaveChangesFilter>();
 
-        return optionsBuilder;
+        return masaDbContextOptionsBuilder;
     }
 
     private class ContractsFilter

diff --git a/src/Data/Masa.Contrib.Data.UoW.EF/Masa.Contrib.Data.UoW.EF.csproj b/src/Data/Masa.Contrib.Data.UoW.EF/Masa.Contrib.Data.UoW.EF.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.Utils.Data.EntityFrameworkCore" Version="0.3.1" />
+    <PackageReference Include="Masa.Utils.Data.EntityFrameworkCore" Version="0.3.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
   </ItemGroup>

diff --git a/src/Data/Masa.Contrib.Data.UoW.EF/README.md b/src/Data/Masa.Contrib.Data.UoW.EF/README.md
@@ -11,10 +11,7 @@ Install-Package Masa.Contrib.Data.Contracts.EF
 
 ```C#
 builder.Services.AddEventBus(options => {
-    options.UseUoW<CustomDbContext>(dbOptions =>
-    {
-        dbOptions.UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity");
-    });
+    options.UseUoW<CustomDbContext>(dbOptions => dbOptions.UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity"));
 });
 ```
 
diff --git a/src/Data/Masa.Contrib.Data.UoW.EF/README.zh-CN.md b/src/Data/Masa.Contrib.Data.UoW.EF/README.zh-CN.md
@@ -11,10 +11,7 @@ Install-Package Masa.Contrib.Data.Contracts.EF
 
 ```C#
 builder.Services.AddEventBus(options => {
-    options.UseUoW<CustomDbContext>(dbOptions =>
-    {
-        dbOptions.UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity");
-    });
+    options.UseUoW<CustomDbContext>(dbOptions => dbOptions.UseSqlServer("server=localhost;uid=sa;pwd=P@ssw0rd;database=identity"));
 });
 ```
 
diff --git a/src/Dispatcher/Masa.Contrib.Dispatcher.Events/DispatcherOptionsExtensions.cs b/src/Dispatcher/Masa.Contrib.Dispatcher.Events/DispatcherOptionsExtensions.cs
@@ -8,10 +8,22 @@ public static IDispatcherOptions UseEventBus(
 
     public static IDispatcherOptions UseEventBus(
         this IDispatcherOptions options,
+        Action<EventBusBuilder> eventBusBuilder)
+        => options.UseEventBus(eventBusBuilder, ServiceLifetime.Scoped);
+
+    public static IDispatcherOptions UseEventBus(
+        this IDispatcherOptions options,
+        ServiceLifetime lifetime)
+        => options.UseEventBus(null, lifetime);
+
+    public static IDispatcherOptions UseEventBus(
+        this IDispatcherOptions options,
+        Action<EventBusBuilder>? eventBusBuilder,
         ServiceLifetime lifetime)
     {
-        ArgumentNullException.ThrowIfNull(options.Services,nameof(options.Services));
+        ArgumentNullException.ThrowIfNull(options.Services, nameof(options.Services));
 
+        eventBusBuilder?.Invoke(new EventBusBuilder(options.Services));
         options.Services.AddEventBus(options.Assemblies, lifetime);
         return options;
     }

diff --git a/src/Dispatcher/Masa.Contrib.Dispatcher.Events/EventBusBuilder.cs b/src/Dispatcher/Masa.Contrib.Dispatcher.Events/EventBusBuilder.cs
@@ -0,0 +1,8 @@
+namespace Masa.Contrib.Dispatcher.Events;
+
+public class EventBusBuilder
+{
+    public IServiceCollection Services { get; }
+
+    public EventBusBuilder(IServiceCollection services) => Services = services;
+}
diff --git a/src/Dispatcher/Masa.Contrib.Dispatcher.Events/Masa.Contrib.Dispatcher.Events.csproj b/src/Dispatcher/Masa.Contrib.Dispatcher.Events/Masa.Contrib.Dispatcher.Events.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.Utils.Models.Config" Version="0.3.1" />
+    <PackageReference Include="Masa.Utils.Models.Config" Version="0.3.2" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />

diff --git a/src/Dispatcher/Masa.Contrib.Dispatcher.Events/UseMiddlewareExtensions.cs b/src/Dispatcher/Masa.Contrib.Dispatcher.Events/UseMiddlewareExtensions.cs
@@ -0,0 +1,17 @@
+namespace Masa.Contrib.Dispatcher.Events;
+
+public static class UseMiddlewareExtensions
+{
+    public static EventBusBuilder UseMiddleware(
+        this EventBusBuilder eventBusBuilder,
+        Type middleware,
+        ServiceLifetime middlewareLifetime = ServiceLifetime.Scoped)
+    {
+        if (!typeof(IMiddleware<>).IsGenericInterfaceAssignableFrom(middleware))
+            throw new ArgumentException($"{middleware.Name} doesn't implement IMiddleware<>");
+
+        var descriptor = new ServiceDescriptor(typeof(IMiddleware<>), middleware, middlewareLifetime);
+        eventBusBuilder.Services.Add(descriptor);
+        return eventBusBuilder;
+    }
+}
diff --git a/...b.Dispatcher.IntegrationEvents.Dapr/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.csproj b/...b.Dispatcher.IntegrationEvents.Dapr/Masa.Contrib.Dispatcher.IntegrationEvents.Dapr.csproj
@@ -8,8 +8,8 @@
 
   <ItemGroup>
     <PackageReference Include="Dapr.AspNetCore" Version="1.5.0" />
-    <PackageReference Include="Masa.Utils.Models.Config" Version="0.3.1" />
-    <PackageReference Include="Masa.Utils.Exceptions" Version="0.3.1" />
+    <PackageReference Include="Masa.Utils.Models.Config" Version="0.3.2" />
+    <PackageReference Include="Masa.Utils.Exceptions" Version="0.3.2" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
   </ItemGroup>

diff --git a/...egrationEvents.EventLogs.EF/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.csproj b/...egrationEvents.EventLogs.EF/Masa.Contrib.Dispatcher.IntegrationEvents.EventLogs.EF.csproj
@@ -7,8 +7,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.Utils.Data.EntityFrameworkCore" Version="0.3.1" />
-    <PackageReference Include="Masa.Utils.Exceptions" Version="0.3.1" />
+    <PackageReference Include="Masa.Utils.Data.EntityFrameworkCore" Version="0.3.2" />
+    <PackageReference Include="Masa.Utils.Exceptions" Version="0.3.2" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="6.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
   </ItemGroup>

diff --git a/src/Service/Masa.Contrib.Service.MinimalAPIs/Masa.Contrib.Service.MinimalAPIs.csproj b/src/Service/Masa.Contrib.Service.MinimalAPIs/Masa.Contrib.Service.MinimalAPIs.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Masa.Utils.Caching.Core" Version="0.3.1" />
-    <PackageReference Include="Masa.Utils.Extensions.DependencyInjection" Version="0.3.1" />
+    <PackageReference Include="Masa.Utils.Caching.Core" Version="0.3.2" />
+    <PackageReference Include="Masa.Utils.Extensions.DependencyInjection" Version="0.3.2" />
     <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
   </ItemGroup>
 

diff --git a/test/Masa.Contrib.Data.Contracts.EF.Tests/SoftDeleteTest.cs b/test/Masa.Contrib.Data.Contracts.EF.Tests/SoftDeleteTest.cs
@@ -25,7 +25,7 @@ public void UseNotUseUoW()
         services.AddMasaDbContext<CustomDbContext>(option =>
         {
             option.UseSqlite(_connection);
-            Assert.ThrowsException<Exception>(() => option.UseSoftDelete(services), "Please add UoW first.");
+            Assert.ThrowsException<Exception>(option.UseSoftDelete, "Please add UoW first.");
         });
     }
 
@@ -38,8 +38,7 @@ public void TestUseSoftDelete()
         services.AddScoped(serviceProvider => uoW.Object);
         services.AddMasaDbContext<CustomDbContext>(option =>
         {
-            option.UseSqlite(_connection);
-            option.UseSoftDelete(services);
+            option.UseSoftDelete().UseSqlite(_connection);
         });
 
         var serviceProvider = services.BuildServiceProvider();
@@ -73,7 +72,7 @@ public void TestUseMultiSoftDelete()
         services.AddMasaDbContext<CustomDbContext>(option =>
         {
             option.UseSqlite(_connection);
-            option.UseSoftDelete(services).UseSoftDelete(services);
+            option.UseSoftDelete().UseSoftDelete();
         });
     }
 }
+21 −21		src/Ddd/Masa.BuildingBlocks.Ddd.Domain/Repositories/BaseRepository.cs
+25 −21		src/Ddd/Masa.BuildingBlocks.Ddd.Domain/Repositories/IRepository.cs
+14 −11		test/Masa.BuildingBlocks.Ddd.Domain.Tests/TestEntity.cs