Merge branch 'mirolimmajidov-acm1-361'

alifcapital · Dec 27, 2024 · 885e0d7 · 885e0d7
2 parents f77f1c2 + 388192e
commit 885e0d7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 12 deletions.
diff --git a/src/EventBus.RabbitMQ.csproj b/src/EventBus.RabbitMQ.csproj
@@ -18,7 +18,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AlifCapital.EventStorage" Version="9.0.8" />
+        <PackageReference Include="AlifCapital.EventStorage" Version="9.0.9" />
         <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="9.0.0" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="9.0.0" />
         <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="9.0.0" />

diff --git a/src/Subscribers/Consumers/EventConsumerService.cs b/src/Subscribers/Consumers/EventConsumerService.cs
@@ -165,7 +165,7 @@ private async Task Consumer_Received(object sender, BasicDeliverEventArgs eventA
                     receivedEvent!.EventId = eventId;
                     receivedEvent!.Headers = headers;
 
-                    EventSubscriberManager.OnExecutingSubscribedEvent(receivedEvent, _connectionOptions.VirtualHostSettings.VirtualHost);
+                    EventSubscriberManager.OnExecutingSubscribedEvent(receivedEvent, _connectionOptions.VirtualHostSettings.VirtualHost, scope.ServiceProvider);
 
                     var eventHandlerSubscriber = scope.ServiceProvider.GetRequiredService(info.eventHandlerType);
                     var handleMethod = info.eventHandlerType.GetMethod(HandlerMethodName);

diff --git a/src/Subscribers/Managers/EventSubscriberManager.cs b/src/Subscribers/Managers/EventSubscriberManager.cs
@@ -100,18 +100,15 @@ public void CreateConsumerForEachQueueAndStartReceivingEvents()
     /// </summary>
     /// <param name="event">Executing an event</param>
     /// <param name="virtualHostName">The name of virtual host to being able to get a system name that the event published by it.</param>
-    public static void OnExecutingSubscribedEvent(ISubscribeEvent @event, string virtualHostName)
+    /// <param name="serviceProvider">The IServiceProvider used to resolve dependencies from the scope.</param>
+    public static void OnExecutingSubscribedEvent(ISubscribeEvent @event, string virtualHostName, 
+        IServiceProvider serviceProvider)
     {
         if (ExecutingSubscribedEvent is null)
             return;
 
         var systemName = virtualHostName.TrimStart('/');
-        var eventArgs = new SubscribedMessageBrokerEventArgs
-        {
-            Event = @event,
-            SystemName = systemName
-        };
-
+        var eventArgs = new SubscribedMessageBrokerEventArgs(@event, systemName, serviceProvider);
         ExecutingSubscribedEvent.Invoke(null, eventArgs);
     }
 
@@ -130,7 +127,7 @@ public static void HandleExecutingReceivedEvent(object sender, ReceivedEventArgs
                 ? info.eventSettings.VirtualHostSettings.VirtualHost
                 : string.Empty;
 
-            OnExecutingSubscribedEvent(@event, virtualHostName);
+            OnExecutingSubscribedEvent(@event, virtualHostName, e.ServiceProvider);
         }
     }
 }
diff --git a/src/Subscribers/Models/SubscribedMessageBrokerEventArgs.cs b/src/Subscribers/Models/SubscribedMessageBrokerEventArgs.cs
@@ -5,10 +5,22 @@ public class SubscribedMessageBrokerEventArgs : EventArgs
     /// <summary>
     /// Executing received event.
     /// </summary>
-    public required ISubscribeEvent Event { get; init; }
+    public ISubscribeEvent Event { get; }
 
     /// <summary>
     /// The name of system that the event published by it.
     /// </summary>
-    public required string SystemName { get; init; }
+    public string SystemName { get; }
+
+    /// <summary>
+    /// The <see cref="IServiceProvider"/> used to resolve dependencies from the scope.
+    /// </summary>
+    public IServiceProvider ServiceProvider { get; }
+
+    public SubscribedMessageBrokerEventArgs(ISubscribeEvent @event, string systemName, IServiceProvider serviceProvider)
+    {
+        Event = @event;
+        SystemName = systemName;
+        ServiceProvider = serviceProvider;
+    }
 }