Moved builder one level upper to support having global registration a…

…nd subscribers registration at the same time
gsoft-inc · Jan 3, 2024 · 58674a4 · 58674a4
1 parent f98e532
commit 58674a4
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 23 deletions.
diff --git a/...tion.Subscription.PullDelivery.Tests/ServiceCollectionEventSubscriptionExtensionsTests.cs b/...tion.Subscription.PullDelivery.Tests/ServiceCollectionEventSubscriptionExtensionsTests.cs
@@ -19,7 +19,7 @@ public void GivenUnnamedConfiguration_WhenAddSubscriber_ThenOptionsAreRegistered
         GivenConfigurations(services, EventPropagationSubscriptionOptions.DefaultSectionName);
 
         // When
-        services.AddEventPropagationSubscriber();
+        services.AddPullDeliverySubscription().AddSubscriber();
         var serviceProvider = services.BuildServiceProvider();
         var options = serviceProvider.GetRequiredService<IOptionsMonitor<EventPropagationSubscriptionOptions>>().Get(EventPropagationSubscriptionOptions.DefaultSectionName);
 
@@ -38,7 +38,7 @@ public void GivenUnnamedConfiguration_WhenAddSubscriber_CanOverrideConfiguration
         GivenConfigurations(services, EventPropagationSubscriptionOptions.DefaultSectionName);
 
         // When
-        services.AddEventPropagationSubscriber(options => { options.TopicEndpoint = "http://ovewrite.io"; });
+        services.AddPullDeliverySubscription().AddSubscriber(options => { options.TopicEndpoint = "http://ovewrite.io"; });
         var serviceProvider = services.BuildServiceProvider();
         var options = serviceProvider.GetRequiredService<IOptionsMonitor<EventPropagationSubscriptionOptions>>().Get(EventPropagationSubscriptionOptions.DefaultSectionName);
 
@@ -59,8 +59,9 @@ public void GivenNamedConfigurations_WhenAddSubscribers_ThenOptionsAreRegistered
         GivenConfigurations(services, sectionName1, sectionName2);
 
         // When
-        services.AddEventPropagationSubscriber(sectionName1);
-        services.AddEventPropagationSubscriber(sectionName2);
+        services.AddPullDeliverySubscription()
+            .AddSubscriber(sectionName1)
+            .AddSubscriber(sectionName2);
         var serviceProvider = services.BuildServiceProvider();
         var monitor = serviceProvider.GetRequiredService<IOptionsMonitor<EventPropagationSubscriptionOptions>>();
         var options1 = monitor.Get(sectionName1);
@@ -88,8 +89,9 @@ public void GivenNamedConfigurations_WhenAddSubscribers_CanOverrideConfiguration
         GivenConfigurations(services, sectionName1, sectionName2);
 
         // When
-        services.AddEventPropagationSubscriber(options => { options.TopicEndpoint = "http://ovewrite1.io"; }, sectionName1);
-        services.AddEventPropagationSubscriber(options => { options.TopicEndpoint = "http://ovewrite2.io"; }, sectionName2);
+        services.AddPullDeliverySubscription()
+            .AddSubscriber(options => { options.TopicEndpoint = "http://ovewrite1.io"; }, sectionName1)
+            .AddSubscriber(options => { options.TopicEndpoint = "http://ovewrite2.io"; }, sectionName2);
         var serviceProvider = services.BuildServiceProvider();
         var monitor = serviceProvider.GetRequiredService<IOptionsMonitor<EventPropagationSubscriptionOptions>>();
         var options1 = monitor.Get(sectionName1);

diff --git a/...eap.DomainEventPropagation.Subscription.PullDelivery/EventPropagationSubscriberBuilder.cs b/...eap.DomainEventPropagation.Subscription.PullDelivery/EventPropagationSubscriberBuilder.cs
@@ -1,5 +1,4 @@
-using System.Reflection;
-using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection.Extensions;
 using Microsoft.Extensions.Options;
@@ -8,18 +7,16 @@ namespace Workleap.DomainEventPropagation;
 
 internal sealed class EventPropagationSubscriberBuilder : IEventPropagationSubscriberBuilder
 {
-    public EventPropagationSubscriberBuilder(IServiceCollection services, Action<EventPropagationSubscriptionOptions> configure, string optionsSectionName)
+    public EventPropagationSubscriberBuilder(IServiceCollection services)
     {
         this.Services = services;
-        this.AddRegistrations(configure, optionsSectionName);
     }
 
     public IServiceCollection Services { get; }
 
-    private void AddRegistrations(Action<EventPropagationSubscriptionOptions> configure, string optionsSectionName)
+    public void ConfigureSubscriber(Action<EventPropagationSubscriptionOptions> configure, string optionsSectionName)
     {
-        this.Services
-            .AddOptions<EventPropagationSubscriptionOptions>(optionsSectionName)
+        this.Services.AddOptions<EventPropagationSubscriptionOptions>(optionsSectionName)
             .Configure<IConfiguration>((opt, cfg) => BindFromWellKnownConfigurationSection(opt, cfg, optionsSectionName))
             .Configure(configure);
 

diff --git a/...ap.DomainEventPropagation.Subscription.PullDelivery/IEventPropagationSubscriberBuilder.cs b/...ap.DomainEventPropagation.Subscription.PullDelivery/IEventPropagationSubscriberBuilder.cs
@@ -1,9 +1,10 @@
-using System.Reflection;
-using Microsoft.Extensions.DependencyInjection;
+using Microsoft.Extensions.DependencyInjection;
 
 namespace Workleap.DomainEventPropagation;
 
 public interface IEventPropagationSubscriberBuilder
 {
     IServiceCollection Services { get; }
+
+    internal void ConfigureSubscriber(Action<EventPropagationSubscriptionOptions> configure, string optionsSectionName);
 }
diff --git a/...ventPropagation.Subscription.PullDelivery/ServiceCollectionEventSubscriptionExtensions.cs b/...ventPropagation.Subscription.PullDelivery/ServiceCollectionEventSubscriptionExtensions.cs
@@ -4,24 +4,30 @@ namespace Workleap.DomainEventPropagation;
 
 public static class ServiceCollectionEventSubscriptionExtensions
 {
-    public static IEventPropagationSubscriberBuilder AddEventPropagationSubscriber(this IServiceCollection services)
-        => services.AddEventPropagationSubscriber(_ => { });
+    public static IEventPropagationSubscriberBuilder AddPullDeliverySubscription(this IServiceCollection services)
+    {
+        return new EventPropagationSubscriberBuilder(services);
+    }
+
+    public static IEventPropagationSubscriberBuilder AddSubscriber(this IEventPropagationSubscriberBuilder builder)
+        => builder.AddSubscriber(_ => { });
 
-    public static IEventPropagationSubscriberBuilder AddEventPropagationSubscriber(this IServiceCollection services, string optionsSectionName)
-        => services.AddEventPropagationSubscriber(_ => { }, optionsSectionName);
+    public static IEventPropagationSubscriberBuilder AddSubscriber(this IEventPropagationSubscriberBuilder builder, string optionsSectionName)
+        => builder.AddSubscriber(_ => { }, optionsSectionName);
 
-    public static IEventPropagationSubscriberBuilder AddEventPropagationSubscriber(this IServiceCollection services, Action<EventPropagationSubscriptionOptions> configure, string optionsSectionName = EventPropagationSubscriptionOptions.DefaultSectionName)
+    public static IEventPropagationSubscriberBuilder AddSubscriber(this IEventPropagationSubscriberBuilder builder, Action<EventPropagationSubscriptionOptions> configure, string optionsSectionName = EventPropagationSubscriptionOptions.DefaultSectionName)
     {
-        if (services == null)
+        if (builder == null)
         {
-            throw new ArgumentNullException(nameof(services));
+            throw new ArgumentNullException(nameof(builder));
         }
 
         if (configure == null)
         {
             throw new ArgumentNullException(nameof(configure));
         }
 
-        return new EventPropagationSubscriberBuilder(services, configure, optionsSectionName);
+        builder.ConfigureSubscriber(configure, optionsSectionName);
+        return builder;
     }
 }