Merge pull request #13 from cnblogs/refactor-subscribe-extensions

refactor: refactor Subscribe extensions

Author: ikesnowy

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

@@ -63,9 +63,7 @@ public static IEndpointConventionBuilder Subscribe<TEvent>(
         string appName)
         where TEvent : IntegrationEvent
     {
-        var daprOptions = builder.ServiceProvider.GetRequiredService<IOptions<DaprOptions>>().Value;
-        EnsureDaprSubscribeHandlerMapped(builder, daprOptions);
-        EnsureEventBusRegistered(builder, daprOptions);
+        builder.EnsureDaprEventBus();
 
         var result = builder
             .MapPost(route, (TEvent receivedEvent, IEventBus eventBus) => eventBus.ReceiveAsync(receivedEvent))
@@ -80,6 +78,8 @@ public static IEndpointConventionBuilder Subscribe<TEvent>(
     /// <param name="assemblies"><see cref="Assembly"/></param>
     public static void Subscribe(this IEndpointRouteBuilder builder, params Assembly[] assemblies)
     {
+        builder.EnsureDaprEventBus();
+
         var method = typeof(EndPointExtensions).GetMethod(
             nameof(Subscribe),
             new[] { typeof(IEndpointRouteBuilder), typeof(string) })!;
@@ -100,7 +100,7 @@ public static void Subscribe(this IEndpointRouteBuilder builder, params Assembly
         }
     }
 
-    private static void EnsureEventBusRegistered(IEndpointRouteBuilder builder, DaprOptions daprOptions)
+    private static void EnsureEventBusRegistered(this IEndpointRouteBuilder builder, DaprOptions daprOptions)
     {
         if (daprOptions.IsEventBusRegistered)
         {
@@ -115,9 +115,10 @@ private static void EnsureEventBusRegistered(IEndpointRouteBuilder builder, Dapr
         }
 
         daprOptions.IsEventBusRegistered = true;
+        return;
     }
 
-    private static void EnsureDaprSubscribeHandlerMapped(IEndpointRouteBuilder builder, DaprOptions daprOptions)
+    private static void EnsureDaprSubscribeHandlerMapped(this IEndpointRouteBuilder builder, DaprOptions daprOptions)
     {
         if (daprOptions.IsDaprSubscribeHandlerMapped)
         {
@@ -131,5 +132,16 @@ private static void EnsureDaprSubscribeHandlerMapped(IEndpointRouteBuilder build
 
         builder.MapSubscribeHandler();
         daprOptions.IsDaprSubscribeHandlerMapped = true;
+        return;
+    }
+
+    private static DaprOptions GetDaprOptions(this IEndpointRouteBuilder builder)
+        => builder.ServiceProvider.GetRequiredService<IOptions<DaprOptions>>().Value;
+
+    private static void EnsureDaprEventBus(this IEndpointRouteBuilder builder)
+    {
+        var options = builder.GetDaprOptions();
+        builder.EnsureDaprSubscribeHandlerMapped(options);
+        builder.EnsureEventBusRegistered(options);
     }
 }

test/Cnblogs.Architecture.IntegrationTests/DaprTests.cs

@@ -34,7 +34,27 @@ public async Task Dapr_SubscribeEndpoint_OkAsync()
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.OK);
         var responseText = await response.Content.ReadAsStringAsync();
-        responseText.Should().Contain("pubsub");
+        responseText.Should().Contain(nameof(TestIntegrationEvent));
+    }
+
+    [Fact]
+    public async Task Dapr_SubscribeWithoutAnyAssembly_OkAsync()
+    {
+        // Arrange
+        var builder = WebApplication.CreateBuilder();
+        builder.Services.AddDaprEventBus(nameof(DaprTests));
+        builder.WebHost.UseTestServer();
+
+        var app = builder.Build();
+        app.Subscribe();
+        await app.StartAsync();
+        var httpClient = app.GetTestClient();
+
+        // Act
+        var response = await httpClient.GetAsync("/dapr/subscribe");
+
+        // Assert
+        response.StatusCode.Should().Be(HttpStatusCode.OK);
     }
 
     [Fact]