Merge branch 'main' into allow-put-without-payload

ikesnowy · web-flow · commit f7fe64ac569c · 2023-02-20T14:11:20.000+08:00
diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IEventBusHandler.cs b/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IEventBusHandler.cs
@@ -0,0 +1,8 @@
+namespace Cnblogs.Architecture.Ddd.EventBus.Abstractions;
+
+/// <summary>
+/// The empty interface as a generic type constraint
+/// </summary>
+public interface IEventBusHandler
+{
+}
diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IIntegrationEventHandler.cs b/src/Cnblogs.Architecture.Ddd.EventBus.Abstractions/IIntegrationEventHandler.cs
@@ -1,12 +1,12 @@
-﻿using MediatR;
+using MediatR;
 
 namespace Cnblogs.Architecture.Ddd.EventBus.Abstractions;
 
 /// <summary>
 /// 集成事件处理器。
 /// </summary>
 /// <typeparam name="TEvent">集成事件。</typeparam>
-public interface IIntegrationEventHandler<TEvent> : INotificationHandler<TEvent>
+public interface IIntegrationEventHandler<TEvent> : INotificationHandler<TEvent>, IEventBusHandler
     where TEvent : IntegrationEvent
 {
-}
+}
diff --git a/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/EndPointExtensions.cs b/src/Cnblogs.Architecture.Ddd.EventBus.Dapr/EndPointExtensions.cs
@@ -1,6 +1,7 @@
-﻿using System.Reflection;
+using System.Reflection;
 using Cnblogs.Architecture.Ddd.EventBus.Abstractions;
 using Cnblogs.Architecture.Ddd.EventBus.Dapr;
+using MediatR;
 using Microsoft.AspNetCore.Routing;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
@@ -19,20 +20,11 @@ public static class EndPointExtensions
     /// <param name="builder"><see cref="IEndpointRouteBuilder"/></param>
     /// <typeparam name="TEvent">事件类型。</typeparam>
     /// <returns><see cref="IEndpointConventionBuilder"/></returns>
-    public static IEndpointConventionBuilder Subscribe<TEvent>(this IEndpointRouteBuilder builder)
+    public static IEndpointRouteBuilder Subscribe<TEvent>(this IEndpointRouteBuilder builder)
         where TEvent : IntegrationEvent
     {
-        var attr = typeof(TEvent).Assembly
-            .GetCustomAttributes(typeof(AssemblyAppNameAttribute), false)
-            .Cast<AssemblyAppNameAttribute>()
-            .FirstOrDefault();
-        if (attr is null || string.IsNullOrEmpty(attr.Name))
-        {
-            throw new InvalidOperationException(
-                $"No AppName was configured in assembly for event: {typeof(TEvent).Name}, either use Subscribe<TEvent>(string appName) method to set AppName manually or add [assembly:AssemblyAppName()] to the Assembly that {typeof(TEvent).Name} belongs to");
-        }
-
-        return builder.Subscribe<TEvent>(attr.Name);
+        var appName = typeof(TEvent).Assembly.GetAppName();
+        return builder.Subscribe<TEvent>(appName);
     }
 
     /// <summary>
@@ -42,7 +34,7 @@ public static IEndpointConventionBuilder Subscribe<TEvent>(this IEndpointRouteBu
     /// <param name="appName">事件隶属名称。</param>
     /// <typeparam name="TEvent">事件类型。</typeparam>
     /// <returns></returns>
-    public static IEndpointConventionBuilder Subscribe<TEvent>(this IEndpointRouteBuilder builder, string appName)
+    public static IEndpointRouteBuilder Subscribe<TEvent>(this IEndpointRouteBuilder builder, string appName)
         where TEvent : IntegrationEvent
     {
         var eventName = typeof(TEvent).Name;
@@ -57,7 +49,7 @@ public static IEndpointConventionBuilder Subscribe<TEvent>(this IEndpointRouteBu
     /// <param name="appName">应用名称。</param>
     /// <typeparam name="TEvent">事件类型。</typeparam>
     /// <returns></returns>
-    public static IEndpointConventionBuilder Subscribe<TEvent>(
+    public static IEndpointRouteBuilder Subscribe<TEvent>(
         this IEndpointRouteBuilder builder,
         string route,
         string appName)
@@ -68,36 +60,78 @@ public static IEndpointConventionBuilder Subscribe<TEvent>(
         var result = builder
             .MapPost(route, (TEvent receivedEvent, IEventBus eventBus) => eventBus.ReceiveAsync(receivedEvent))
             .WithTopic(DaprOptions.PubSubName, DaprUtils.GetDaprTopicName<TEvent>(appName));
-        return result;
+
+        return builder;
     }
 
     /// <summary>
     ///     订阅 Assembly 中的全部事件。
     /// </summary>
     /// <param name="builder"><see cref="IEndpointRouteBuilder"/></param>
     /// <param name="assemblies"><see cref="Assembly"/></param>
-    public static void Subscribe(this IEndpointRouteBuilder builder, params Assembly[] assemblies)
+    public static IEndpointRouteBuilder Subscribe(this IEndpointRouteBuilder builder, params Assembly[] assemblies)
     {
         builder.EnsureDaprEventBus();
 
-        var method = typeof(EndPointExtensions).GetMethod(
-            nameof(Subscribe),
-            new[] { typeof(IEndpointRouteBuilder), typeof(string) })!;
+        var method = GetSubscribeMethod();
+
         foreach (var assembly in assemblies)
         {
             var events = assembly.GetTypes().Where(x => x.IsSubclassOf(typeof(IntegrationEvent))).ToList();
-            var attr = assembly
-                .GetCustomAttributes(typeof(AssemblyAppNameAttribute), false)
-                .Cast<AssemblyAppNameAttribute>()
-                .FirstOrDefault();
-            if (attr is null || string.IsNullOrEmpty(attr.Name))
+            var appName = assembly.GetAppName();
+            events.ForEach(e => method.InvokeSubscribe(e, builder, appName));
+        }
+
+        return builder;
+    }
+
+    /// <summary>
+    /// Subscribes integration events that the TEventHandler implements
+    /// </summary>
+    /// <typeparam name="TEventHandler">The integration event handler that implements <![CDATA[IIntegrationEventHandler<TEvent>]]></typeparam>
+    /// <param name="builder"><see cref="IEndpointRouteBuilder"/></param>
+    public static IEndpointRouteBuilder SubscribeByEventHandler<TEventHandler>(this IEndpointRouteBuilder builder)
+        where TEventHandler : IEventBusHandler
+    {
+        return builder.SubscribeByEventHandler(typeof(TEventHandler));
+    }
+
+    /// <summary>
+    /// Subscribes integration events that event handlers implement in assemblies
+    /// </summary>
+    /// <param name="builder"><see cref="IEndpointRouteBuilder"/></param>
+    /// <param name="assemblies">assemblies that event handlers reside</param>
+    /// <returns></returns>
+    public static IEndpointRouteBuilder SubscribeByEventHandler(this IEndpointRouteBuilder builder, params Assembly[] assemblies)
+    {
+        foreach (var assembly in assemblies)
+        {
+            foreach (Type type in assembly.GetTypes())
             {
-                throw new InvalidOperationException(
-                    $"No AppName was configured in assembly: {assembly.FullName}, either use Subscribe<TEvent>(string appName) method to set AppName manually or add [assembly:AssemblyAppName()] to the Assembly");
+                builder.SubscribeByEventHandler(type);
             }
+        }
+
+        return builder;
+    }
 
-            events.ForEach(e => method.MakeGenericMethod(e).Invoke(null, new object[] { builder, attr.Name }));
+    private static IEndpointRouteBuilder SubscribeByEventHandler(this IEndpointRouteBuilder builder, Type type)
+    {
+        var interfaces = type.GetInterfaces()
+            .Where(i => i.IsGenericType && i.GetGenericTypeDefinition() == typeof(IIntegrationEventHandler<>));
+
+        foreach (var handlerInterface in interfaces)
+        {
+            var eventType = handlerInterface.GetGenericArguments().FirstOrDefault();
+            if (eventType != null)
+            {
+                var assembly = eventType.Assembly;
+                var appName = assembly.GetAppName();
+                GetSubscribeMethod().InvokeSubscribe(eventType, builder, appName);
+            }
         }
+
+        return builder;
     }
 
     private static void EnsureEventBusRegistered(this IEndpointRouteBuilder builder, DaprOptions daprOptions)
@@ -142,4 +176,32 @@ private static void EnsureDaprEventBus(this IEndpointRouteBuilder builder)
         builder.EnsureDaprSubscribeHandlerMapped(options);
         builder.EnsureEventBusRegistered(options);
     }
-}
+
+    private static MethodInfo GetSubscribeMethod()
+    {
+        return typeof(EndPointExtensions).GetMethod(
+            nameof(Subscribe),
+            new[] { typeof(IEndpointRouteBuilder), typeof(string) })!;
+    }
+
+    private static void InvokeSubscribe(this MethodInfo method, Type eventType, IEndpointRouteBuilder builder, string appName)
+    {
+        method.MakeGenericMethod(eventType).Invoke(null, new object[] { builder, appName });
+    }
+
+    private static string GetAppName(this Assembly assembly)
+    {
+        var appName = assembly
+            .GetCustomAttributes(typeof(AssemblyAppNameAttribute), false)
+            .Cast<AssemblyAppNameAttribute>()
+            .FirstOrDefault()?.Name;
+
+        if (string.IsNullOrEmpty(appName))
+        {
+            throw new InvalidOperationException(
+                $"No AppName was configured in assembly: {assembly.FullName}, either use Subscribe<TEvent>(string appName) method to set AppName manually or add [assembly:AssemblyAppName()] to the Assembly");
+        }
+
+        return appName;
+    }
+}
diff --git a/test/Cnblogs.Architecture.IntegrationTestProject/EventHandlers/TestIntegrationEventHandler.cs b/test/Cnblogs.Architecture.IntegrationTestProject/EventHandlers/TestIntegrationEventHandler.cs
@@ -4,7 +4,8 @@
 
 namespace Cnblogs.Architecture.IntegrationTestProject.EventHandlers;
 
-public class TestIntegrationEventHandler : IIntegrationEventHandler<TestIntegrationEvent>
+public class TestIntegrationEventHandler : IIntegrationEventHandler<TestIntegrationEvent>,
+    IIntegrationEventHandler<BlogPostCreatedIntegrationEvent>
 {
     private readonly ILogger _logger;
 
@@ -19,4 +20,11 @@ public Task Handle(TestIntegrationEvent notification, CancellationToken cancella
 
         return Task.CompletedTask;
     }
+
+    public Task Handle(BlogPostCreatedIntegrationEvent notification, CancellationToken cancellationToken)
+    {
+        _logger.LogInformation(LogTemplates.HandledIntegratonEvent, notification);
+
+        return Task.CompletedTask;
+    }
 }
diff --git a/test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs b/test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs
@@ -1,5 +1,6 @@
 ﻿using System.Diagnostics;
 using System.Net;
+using Cnblogs.Architecture.IntegrationTestProject.EventHandlers;
 using Cnblogs.Architecture.TestIntegrationEvents;
 using FluentAssertions;
 using Microsoft.AspNetCore.Builder;
@@ -10,16 +11,29 @@ namespace Cnblogs.Architecture.IntegrationTests;
 
 public class DaprTests
 {
-    [Fact]
-    public async Task Dapr_SubscribeEndpoint_OkAsync()
+    [Theory]
+    [InlineData(SubscribeType.ByEvent)]
+    [InlineData(SubscribeType.ByEventAssemblies)]
+    [InlineData(SubscribeType.ByEventHandler)]
+    [InlineData(SubscribeType.ByEventHandlerAssemblies)]
+    public async Task Dapr_SubscribeEndpoint_OkAsync(SubscribeType subscribeType)
     {
         // Arrange
         var builder = WebApplication.CreateBuilder();
         builder.Services.AddDaprEventBus(nameof(DaprTests));
         builder.WebHost.UseTestServer();
 
-        var app = builder.Build();
-        app.Subscribe<TestIntegrationEvent>();
+        using var app = builder.Build();
+
+        _ = subscribeType switch
+        {
+            SubscribeType.ByEvent => app.Subscribe<TestIntegrationEvent>().Subscribe<BlogPostCreatedIntegrationEvent>(),
+            SubscribeType.ByEventAssemblies => app.Subscribe(typeof(TestIntegrationEvent).Assembly),
+            SubscribeType.ByEventHandler => app.SubscribeByEventHandler<TestIntegrationEventHandler>(),
+            SubscribeType.ByEventHandlerAssemblies => app.SubscribeByEventHandler(typeof(TestIntegrationEventHandler).Assembly),
+            _ => app
+        };
+
         await app.StartAsync();
         var httpClient = app.GetTestClient();
 
@@ -29,8 +43,8 @@ public async Task Dapr_SubscribeEndpoint_OkAsync()
         // Assert
         response.Should().BeSuccessful();
         var responseText = await response.Content.ReadAsStringAsync();
-        Debug.WriteLine(responseText);
         responseText.Should().Contain(nameof(TestIntegrationEvent));
+        responseText.Should().Contain(nameof(BlogPostCreatedIntegrationEvent));
     }
 
     [Fact]
diff --git a/test/Cnblogs.Architecture.IntegrationTests/SubscribeType.cs b/test/Cnblogs.Architecture.IntegrationTests/SubscribeType.cs
@@ -0,0 +1,10 @@
+﻿namespace Cnblogs.Architecture.IntegrationTests;
+
+public enum SubscribeType
+{
+    None,
+    ByEvent,
+    ByEventAssemblies,
+    ByEventHandler,
+    ByEventHandlerAssemblies,
+}
diff --git a/test/Cnblogs.Architecture.TestIntegrationEvents/BlogPostCreatedIntegrationEvent.cs b/test/Cnblogs.Architecture.TestIntegrationEvents/BlogPostCreatedIntegrationEvent.cs
@@ -0,0 +1,5 @@
+﻿using Cnblogs.Architecture.Ddd.EventBus.Abstractions;
+
+namespace Cnblogs.Architecture.TestIntegrationEvents;
+
+public record BlogPostCreatedIntegrationEvent(Guid Id, DateTimeOffset CreatedTime, string Title) : IntegrationEvent(Id, CreatedTime);

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,8 @@`
`4`	`4`
`5`	`5`	`namespace Cnblogs.Architecture.IntegrationTestProject.EventHandlers;`
`6`	`6`
`7`		`-public class TestIntegrationEventHandler : IIntegrationEventHandler<TestIntegrationEvent>`
	`7`	`+public class TestIntegrationEventHandler : IIntegrationEventHandler<TestIntegrationEvent>,`
	`8`	`+ IIntegrationEventHandler<BlogPostCreatedIntegrationEvent>`
`8`	`9`	`{`
`9`	`10`	`private readonly ILogger _logger;`
`10`	`11`
`@@ -19,4 +20,11 @@ public Task Handle(TestIntegrationEvent notification, CancellationToken cancella`
`19`	`20`
`20`	`21`	`return Task.CompletedTask;`
`21`	`22`	`}`
	`23`	`+`
	`24`	`+ public Task Handle(BlogPostCreatedIntegrationEvent notification, CancellationToken cancellationToken)`
	`25`	`+ {`
	`26`	`+ _logger.LogInformation(LogTemplates.HandledIntegratonEvent, notification);`
	`27`	`+`
	`28`	`+ return Task.CompletedTask;`
	`29`	`+ }`
`22`	`30`	`}`