Merge pull request #7654 from abpframework/gterdem/eventbus_eto_extra…

…_property_test Added Test for Eto Extra Properties
abpframework · Feb 8, 2021 · 835aa88 · 835aa88
2 parents 7083364 + fe02e72
commit 835aa88
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 1 deletion.
diff --git a/...st/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus_Test.cs b/...st/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/Distributed/LocalDistributedEventBus_Test.cs
@@ -44,5 +44,23 @@ public async Task Should_Change_TenantId_If_Generic_EventData_Is_MultiTenant()
 
             Assert.Equal(tenantId, MySimpleDistributedSingleInstanceEventHandler.TenantId);
         }
+
+        [Fact]
+        public async Task Should_Get_TenantId_From_EventEto_Extra_Property()
+        {
+            var tenantId = Guid.NewGuid();
+
+            DistributedEventBus.Subscribe<MySimpleEto>(GetRequiredService<MySimpleDistributedSingleInstanceEventHandler>());
+
+            await DistributedEventBus.PublishAsync(new MySimpleEto
+            {
+                Properties =
+                {
+                    {"TenantId", tenantId}
+                }
+            });
+
+            Assert.Equal(tenantId, MySimpleDistributedSingleInstanceEventHandler.TenantId);
+        }
     }
 }
diff --git a/...tBus.Tests/Volo/Abp/EventBus/Distributed/MySimpleDistributedSingleInstanceEventHandler.cs b/...tBus.Tests/Volo/Abp/EventBus/Distributed/MySimpleDistributedSingleInstanceEventHandler.cs
@@ -1,12 +1,13 @@
 using System;
+using System.Collections.Generic;
 using System.Threading.Tasks;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Domain.Entities.Events.Distributed;
 using Volo.Abp.MultiTenancy;
 
 namespace Volo.Abp.EventBus.Distributed
 {
-    public class MySimpleDistributedSingleInstanceEventHandler : IDistributedEventHandler<MySimpleEventData>, IDistributedEventHandler<EntityCreatedEto<MySimpleEventData>>, ITransientDependency
+    public class MySimpleDistributedSingleInstanceEventHandler : IDistributedEventHandler<MySimpleEventData>, IDistributedEventHandler<EntityCreatedEto<MySimpleEventData>>, IDistributedEventHandler<MySimpleEto>, ITransientDependency
     {
         private readonly ICurrentTenant _currentTenant;
 
@@ -28,5 +29,12 @@ public Task HandleEventAsync(EntityCreatedEto<MySimpleEventData> eventData)
             TenantId = _currentTenant.Id;
             return Task.CompletedTask;
         }
+
+        public Task HandleEventAsync(MySimpleEto eventData)
+        {
+            var tenantIdString = eventData.Properties.GetOrDefault("TenantId").ToString();
+            TenantId = tenantIdString != null ? new Guid(tenantIdString) : _currentTenant.Id;
+            return Task.CompletedTask;
+        }
     }
 }
diff --git a/framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/MySimpleEto.cs b/framework/test/Volo.Abp.EventBus.Tests/Volo/Abp/EventBus/MySimpleEto.cs
@@ -0,0 +1,8 @@
+using Volo.Abp.Domain.Entities.Events.Distributed;
+
+namespace Volo.Abp.EventBus
+{
+    public class MySimpleEto : EtoBase
+    {
+    }
+}