Merge pull request #19 from cnblogs/fix-domain-event-generator

fix: extract domain event publish method

Author: ikesnowy

src/Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr/DaprEventBusServiceCollectionExtensions.cs

@@ -1,10 +1,11 @@
-using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr;
+using System.Reflection;
+using Cnblogs.Architecture.Ddd.Cqrs.DependencyInjection.EventBus.Dapr;
 using Cnblogs.Architecture.Ddd.EventBus.Abstractions;
 using Cnblogs.Architecture.Ddd.EventBus.Dapr;
 using Dapr.Client;
 using MediatR;
-using System.Reflection;
 
+// ReSharper disable once CheckNamespace
 namespace Microsoft.Extensions.DependencyInjection;
 
 /// <summary>
@@ -36,5 +37,4 @@ public static IServiceCollection AddDaprEventBus(
 
         return services;
     }
-
 }

src/Cnblogs.Architecture.Ddd.EventBus.Dapr/EndPointExtensions.cs

@@ -115,7 +115,6 @@ private static void EnsureEventBusRegistered(this IEndpointRouteBuilder builder,
         }
 
         daprOptions.IsEventBusRegistered = true;
-        return;
     }
 
     private static void EnsureDaprSubscribeHandlerMapped(this IEndpointRouteBuilder builder, DaprOptions daprOptions)
@@ -132,7 +131,6 @@ private static void EnsureDaprSubscribeHandlerMapped(this IEndpointRouteBuilder
 
         builder.MapSubscribeHandler();
         daprOptions.IsDaprSubscribeHandlerMapped = true;
-        return;
     }
 
     private static DaprOptions GetDaprOptions(this IEndpointRouteBuilder builder)

src/Cnblogs.Architecture.Ddd.Infrastructure.EntityFramework/BaseRepository.cs

@@ -148,24 +148,29 @@ private async Task<bool> SaveEntitiesInternalAsync(
         bool dispatchDomainEventFirst = false,
         CancellationToken cancellationToken = default)
     {
-        var entities = Context.ExtractDomainEventSources();
-        var domainEvents = entities.SelectMany(x => x.DomainEvents!.OfType<DomainEvent>()).ToList();
-        entities.ForEach(x => x.ClearDomainEvents());
         if (dispatchDomainEventFirst)
         {
+            await ExtraAndPublishDomainEventsAsync();
             await SaveChangesAsync(cancellationToken);
         }
-
-        await BeforeDispatchDomainEventAsync(domainEvents, Context);
-        await _mediator.DispatchDomainEventsAsync(domainEvents);
-        if (dispatchDomainEventFirst == false)
+        else
         {
             await SaveChangesAsync(cancellationToken);
+            await ExtraAndPublishDomainEventsAsync();
         }
 
         return true;
     }
 
+    private async Task ExtraAndPublishDomainEventsAsync()
+    {
+        var entities = Context.ExtractDomainEventSources();
+        var domainEvents = entities.SelectMany(x => x.DomainEvents!.OfType<DomainEvent>()).ToList();
+        entities.ForEach(x => x.ClearDomainEvents());
+        await BeforeDispatchDomainEventAsync(domainEvents, Context);
+        await _mediator.DispatchDomainEventsAsync(domainEvents);
+    }
+
     private void CallBeforeUpdate()
     {
         var domainEntities = Context.ChangeTracker

test/Cnblogs.Architecture.IntegrationTestProject/EventHandlers/TestIntegrationEventHandler.cs

@@ -1,7 +1,5 @@
-using System.Diagnostics;
-using Cnblogs.Architecture.Ddd.EventBus.Abstractions;
+using Cnblogs.Architecture.Ddd.EventBus.Abstractions;
 using Cnblogs.Architecture.TestIntegrationEvents;
-using MediatR;
 
 namespace Cnblogs.Architecture.IntegrationTestProject.EventHandlers;
 

test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs

@@ -3,7 +3,6 @@
 using Cnblogs.Architecture.TestIntegrationEvents;
 using FluentAssertions;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 

test/Cnblogs.Architecture.IntegrationTests/IntegrationEventHandlerTests.cs

@@ -3,10 +3,7 @@
 using Cnblogs.Architecture.IntegrationTestProject.EventHandlers;
 using Cnblogs.Architecture.TestIntegrationEvents;
 using FluentAssertions;
-using MediatR;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc.Testing;
 using Microsoft.AspNetCore.TestHost;
 using Microsoft.Extensions.DependencyInjection;
 using Xunit.Abstractions;

test/Cnblogs.Architecture.UnitTests/EventBus/AssemblyAttributeTests.cs

@@ -1,7 +1,6 @@
 using Cnblogs.Architecture.TestIntegrationEvents;
 using FluentAssertions;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace Cnblogs.Architecture.UnitTests.EventBus;