Updated test

dandrejvv · dandrejvv · commit 5c9da780fee6 · 2024-02-25T21:46:28.000+02:00
diff --git a/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/Configuration/MassTransitConfiguration.cs b/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/Configuration/MassTransitConfiguration.cs
@@ -30,10 +30,13 @@ public static void AddMassTransitConfiguration(this IServiceCollection services,
                     cfg.UseMessageRetry(r => r.Interval(
                         configuration.GetValue<int?>("MassTransit:RetryInterval:RetryCount") ?? 10,
                         configuration.GetValue<TimeSpan?>("MassTransit:RetryInterval:Interval") ?? TimeSpan.FromSeconds(5)));
+
                     cfg.ConfigureEndpoints(context);
-                    cfg.UseInMemoryOutbox();
+                    cfg.UseMessageScope(context);
+                    cfg.UseInMemoryOutbox(context);
                     cfg.UsePublishFilter(typeof(FinbucklePublishingFilter<>), context);
                     cfg.UseConsumeFilter(typeof(FinbuckleConsumingFilter<>), context);
+                    cfg.UseSendFilter(typeof(FinbuckleSendingFilter<>), context);
                 });
                 x.AddInMemoryInboxOutbox();
             });
diff --git a/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/Eventing/FinbuckleConsumingFilter.cs b/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/Eventing/FinbuckleConsumingFilter.cs
@@ -18,8 +18,8 @@ public class FinbuckleConsumingFilter<T> : IFilter<ConsumeContext<T>>
     {
         private readonly string _headerName;
         private readonly FinbuckleMessageHeaderStrategy _messageHeaderStrategy;
-        private IMultiTenantContextAccessor _accessor;
-        private ITenantResolver _tenantResolver;
+        private readonly IMultiTenantContextAccessor _accessor;
+        private readonly ITenantResolver _tenantResolver;
 
         public FinbuckleConsumingFilter(IServiceProvider serviceProvider,
             IMultiTenantContextAccessor accessor,
@@ -29,9 +29,10 @@ public FinbuckleConsumingFilter(IServiceProvider serviceProvider,
             _accessor = accessor;
             _tenantResolver = tenantResolver;
             _headerName = configuration.GetValue<string?>("MassTransit:TenantHeader") ?? "Tenant-Identifier";
-            _messageHeaderStrategy = (FinbuckleMessageHeaderStrategy)serviceProvider.GetRequiredService<IEnumerable<IMultiTenantStrategy>>()
-                              .Where(s => s.GetType() == typeof(FinbuckleMessageHeaderStrategy))
-                              .Single();
+
+            _messageHeaderStrategy = (FinbuckleMessageHeaderStrategy)serviceProvider
+                .GetRequiredService<IEnumerable<IMultiTenantStrategy>>()
+                .Single(s => s.GetType() == typeof(FinbuckleMessageHeaderStrategy));
         }
 
         public async Task Send(ConsumeContext<T> context, IPipe<ConsumeContext<T>> next)
diff --git a/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/Eventing/FinbuckleMessageHeaderStrategy.cs b/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/Eventing/FinbuckleMessageHeaderStrategy.cs
@@ -9,9 +9,9 @@ namespace MinimalHostingModel.Infrastructure.Eventing
 {
     public class FinbuckleMessageHeaderStrategy : IMultiTenantStrategy
     {
-        private string _tenantIdentifier = null!;
+        private string? _tenantIdentifier;
 
-        public Task<string> GetIdentifierAsync(object context)
+        public Task<string?> GetIdentifierAsync(object context)
         {
             return Task.FromResult(_tenantIdentifier);
         }
diff --git a/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/Eventing/FinbuckleSendingFilter.cs b/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/Eventing/FinbuckleSendingFilter.cs
@@ -0,0 +1,34 @@
+using System.Threading.Tasks;
+using Finbuckle.MultiTenant;
+using Intent.RoslynWeaver.Attributes;
+using MassTransit;
+using Microsoft.Extensions.Configuration;
+
+[assembly: DefaultIntentManaged(Mode.Fully)]
+[assembly: IntentTemplate("Intent.Eventing.MassTransit.FinbuckleSendingFilter", Version = "1.0")]
+
+namespace MinimalHostingModel.Infrastructure.Eventing
+{
+    public class FinbuckleSendingFilter<T> : IFilter<SendContext<T>>
+        where T : class
+    {
+        private readonly string _headerName;
+        private readonly ITenantInfo _tenant;
+
+        public FinbuckleSendingFilter(ITenantInfo tenant, IConfiguration configuration)
+        {
+            _tenant = tenant;
+            _headerName = configuration.GetValue<string?>("MassTransit:TenantHeader") ?? "Tenant-Identifier";
+        }
+
+        public void Probe(ProbeContext context)
+        {
+        }
+
+        public Task Send(SendContext<T> context, IPipe<SendContext<T>> next)
+        {
+            context.Headers.Set(_headerName, _tenant.Identifier);
+            return next.Send(context);
+        }
+    }
+}
diff --git a/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/Eventing/IntegrationEventConsumer.cs b/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/Eventing/IntegrationEventConsumer.cs
@@ -8,28 +8,28 @@
 using MinimalHostingModel.Domain.Common.Interfaces;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Eventing.MassTransit.WrapperConsumer", Version = "1.0")]
+[assembly: IntentTemplate("Intent.Eventing.MassTransit.IntegrationEventConsumer", Version = "1.0")]
 
 namespace MinimalHostingModel.Infrastructure.Eventing
 {
-    public class WrapperConsumer<THandler, TMessage> : IConsumer<TMessage>
+    public class IntegrationEventConsumer<THandler, TMessage> : IConsumer<TMessage>
         where TMessage : class
         where THandler : IIntegrationEventHandler<TMessage>
     {
         private readonly IServiceProvider _serviceProvider;
         private readonly IUnitOfWork _unitOfWork;
 
-        public WrapperConsumer(IServiceProvider serviceProvider, IUnitOfWork unitOfWork)
+        public IntegrationEventConsumer(IServiceProvider serviceProvider, IUnitOfWork unitOfWork)
         {
             _serviceProvider = serviceProvider;
             _unitOfWork = unitOfWork ?? throw new ArgumentNullException(nameof(unitOfWork));
         }
 
         public async Task Consume(ConsumeContext<TMessage> context)
         {
-            var eventBus = _serviceProvider.GetService<MassTransitEventBus>()!;
+            var eventBus = _serviceProvider.GetRequiredService<MassTransitEventBus>();
             eventBus.ConsumeContext = context;
-            var handler = _serviceProvider.GetService<THandler>()!;
+            var handler = _serviceProvider.GetRequiredService<THandler>();
 
             // The execution is wrapped in a transaction scope to ensure that if any other
             // SaveChanges calls to the data source (e.g. EF Core) are called, that they are
@@ -55,22 +55,16 @@ public async Task Consume(ConsumeContext<TMessage> context)
         }
     }
 
-    public class WrapperConsumerDefinition<THandler, TMessage> : ConsumerDefinition<WrapperConsumer<THandler, TMessage>>
+    public class IntegrationEventConsumerDefinition<THandler, TMessage> : ConsumerDefinition<IntegrationEventConsumer<THandler, TMessage>>
         where TMessage : class
         where THandler : IIntegrationEventHandler<TMessage>
     {
-        private readonly IServiceProvider _serviceProvider;
-
-        public WrapperConsumerDefinition(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
         protected override void ConfigureConsumer(
             IReceiveEndpointConfigurator endpointConfigurator,
-            IConsumerConfigurator<WrapperConsumer<THandler, TMessage>> consumerConfigurator)
+            IConsumerConfigurator<IntegrationEventConsumer<THandler, TMessage>> consumerConfigurator,
+            IRegistrationContext context)
         {
-            endpointConfigurator.UseInMemoryInboxOutbox(_serviceProvider);
+            endpointConfigurator.UseInMemoryInboxOutbox(context);
         }
     }
 }
diff --git a/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/MinimalHostingModel.Infrastructure.csproj b/Tests/MinimalHostingModel/MinimalHostingModel.Infrastructure/MinimalHostingModel.Infrastructure.csproj
@@ -16,8 +16,8 @@
     <PackageReference Include="Finbuckle.MultiTenant.EntityFrameworkCore" Version="6.12.0" />
     <PackageReference Include="IdentityModel.AspNetCore" Version="4.3.0" />
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
-    <PackageReference Include="MassTransit" Version="8.0.16" />
-    <PackageReference Include="MassTransit.Abstractions" Version="8.0.16" />
+    <PackageReference Include="MassTransit" Version="8.1.3" />
+    <PackageReference Include="MassTransit.Abstractions" Version="8.1.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.0" />
diff --git a/Tests/MinimalHostingModel/MinimalHostingModel.application.output.log b/Tests/MinimalHostingModel/MinimalHostingModel.application.output.log
@@ -932,18 +932,26 @@
     </FileLog>
     <FileLog>
       <ProjectId>de97fc2c-cddf-4284-b3b6-33e6fae0dca8</ProjectId>
-      <CorrelationId>Intent.Eventing.MassTransit.MassTransitEventBus</CorrelationId>
+      <CorrelationId>Intent.Eventing.MassTransit.FinbuckleSendingFilter</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>MinimalHostingModel.Infrastructure/Eventing/MassTransitEventBus.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>MassTransitEventBus.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>MinimalHostingModel.Infrastructure/Eventing/FinbuckleSendingFilter.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>FinbuckleSendingFilter.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>de97fc2c-cddf-4284-b3b6-33e6fae0dca8</ProjectId>
-      <CorrelationId>Intent.Eventing.MassTransit.WrapperConsumer</CorrelationId>
+      <CorrelationId>Intent.Eventing.MassTransit.IntegrationEventConsumer</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>MinimalHostingModel.Infrastructure/Eventing/WrapperConsumer.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>WrapperConsumer.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>MinimalHostingModel.Infrastructure/Eventing/IntegrationEventConsumer.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IntegrationEventConsumer.cs</ProjectRelativeFilePath>
+      <IsIgnored>false</IsIgnored>
+    </FileLog>
+    <FileLog>
+      <ProjectId>de97fc2c-cddf-4284-b3b6-33e6fae0dca8</ProjectId>
+      <CorrelationId>Intent.Eventing.MassTransit.MassTransitEventBus</CorrelationId>
+      <OverwriteBehaviour>always</OverwriteBehaviour>
+      <ApplicationRelativeFilePath>MinimalHostingModel.Infrastructure/Eventing/MassTransitEventBus.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>MassTransitEventBus.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
diff --git a/Tests/Standard.AspNetCore.ServiceCallHandlers/Standard.AspNetCore.ServiceCallHandlers.Infrastructure/Configuration/MassTransitConfiguration.cs b/Tests/Standard.AspNetCore.ServiceCallHandlers/Standard.AspNetCore.ServiceCallHandlers.Infrastructure/Configuration/MassTransitConfiguration.cs
@@ -30,8 +30,9 @@ public static void AddMassTransitConfiguration(this IServiceCollection services,
                     cfg.UseMessageRetry(r => r.Interval(
                         configuration.GetValue<int?>("MassTransit:RetryInterval:RetryCount") ?? 10,
                         configuration.GetValue<TimeSpan?>("MassTransit:RetryInterval:Interval") ?? TimeSpan.FromSeconds(5)));
+
                     cfg.ConfigureEndpoints(context);
-                    cfg.UseInMemoryOutbox();
+                    cfg.UseInMemoryOutbox(context);
                 });
                 x.AddInMemoryInboxOutbox();
             });
diff --git a/Tests/Standard.AspNetCore.ServiceCallHandlers/Standard.AspNetCore.ServiceCallHandlers.Infrastructure/Eventing/IntegrationEventConsumer.cs b/Tests/Standard.AspNetCore.ServiceCallHandlers/Standard.AspNetCore.ServiceCallHandlers.Infrastructure/Eventing/IntegrationEventConsumer.cs
@@ -8,28 +8,28 @@
 using Standard.AspNetCore.ServiceCallHandlers.Domain.Common.Interfaces;
 
 [assembly: DefaultIntentManaged(Mode.Fully)]
-[assembly: IntentTemplate("Intent.Eventing.MassTransit.WrapperConsumer", Version = "1.0")]
+[assembly: IntentTemplate("Intent.Eventing.MassTransit.IntegrationEventConsumer", Version = "1.0")]
 
 namespace Standard.AspNetCore.ServiceCallHandlers.Infrastructure.Eventing
 {
-    public class WrapperConsumer<THandler, TMessage> : IConsumer<TMessage>
+    public class IntegrationEventConsumer<THandler, TMessage> : IConsumer<TMessage>
         where TMessage : class
         where THandler : IIntegrationEventHandler<TMessage>
     {
         private readonly IServiceProvider _serviceProvider;
         private readonly IUnitOfWork _unitOfWork;
 
-        public WrapperConsumer(IServiceProvider serviceProvider, IUnitOfWork unitOfWork)
+        public IntegrationEventConsumer(IServiceProvider serviceProvider, IUnitOfWork unitOfWork)
         {
             _serviceProvider = serviceProvider;
             _unitOfWork = unitOfWork ?? throw new ArgumentNullException(nameof(unitOfWork));
         }
 
         public async Task Consume(ConsumeContext<TMessage> context)
         {
-            var eventBus = _serviceProvider.GetService<MassTransitEventBus>()!;
+            var eventBus = _serviceProvider.GetRequiredService<MassTransitEventBus>();
             eventBus.ConsumeContext = context;
-            var handler = _serviceProvider.GetService<THandler>()!;
+            var handler = _serviceProvider.GetRequiredService<THandler>();
 
             // The execution is wrapped in a transaction scope to ensure that if any other
             // SaveChanges calls to the data source (e.g. EF Core) are called, that they are
@@ -55,22 +55,16 @@ public async Task Consume(ConsumeContext<TMessage> context)
         }
     }
 
-    public class WrapperConsumerDefinition<THandler, TMessage> : ConsumerDefinition<WrapperConsumer<THandler, TMessage>>
+    public class IntegrationEventConsumerDefinition<THandler, TMessage> : ConsumerDefinition<IntegrationEventConsumer<THandler, TMessage>>
         where TMessage : class
         where THandler : IIntegrationEventHandler<TMessage>
     {
-        private readonly IServiceProvider _serviceProvider;
-
-        public WrapperConsumerDefinition(IServiceProvider serviceProvider)
-        {
-            _serviceProvider = serviceProvider;
-        }
-
         protected override void ConfigureConsumer(
             IReceiveEndpointConfigurator endpointConfigurator,
-            IConsumerConfigurator<WrapperConsumer<THandler, TMessage>> consumerConfigurator)
+            IConsumerConfigurator<IntegrationEventConsumer<THandler, TMessage>> consumerConfigurator,
+            IRegistrationContext context)
         {
-            endpointConfigurator.UseInMemoryInboxOutbox(_serviceProvider);
+            endpointConfigurator.UseInMemoryInboxOutbox(context);
         }
     }
 }
diff --git a/Tests/Standard.AspNetCore.ServiceCallHandlers/Standard.AspNetCore.ServiceCallHandlers.Infrastructure/Standard.AspNetCore.ServiceCallHandlers.Infrastructure.csproj b/Tests/Standard.AspNetCore.ServiceCallHandlers/Standard.AspNetCore.ServiceCallHandlers.Infrastructure/Standard.AspNetCore.ServiceCallHandlers.Infrastructure.csproj
@@ -13,8 +13,8 @@
   <ItemGroup>
     <PackageReference Include="AutoMapper" Version="13.0.1" />
     <PackageReference Include="Intent.RoslynWeaver.Attributes" Version="2.1.4" />
-    <PackageReference Include="MassTransit" Version="8.0.16" />
-    <PackageReference Include="MassTransit.Abstractions" Version="8.0.16" />
+    <PackageReference Include="MassTransit" Version="8.1.3" />
+    <PackageReference Include="MassTransit.Abstractions" Version="8.1.3" />
     <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.14" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.14" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="7.0.14" />
diff --git a/Tests/Standard.AspNetCore.ServiceCallHandlers/Standard.AspNetCore.ServiceCallHandlers.application.output.log b/Tests/Standard.AspNetCore.ServiceCallHandlers/Standard.AspNetCore.ServiceCallHandlers.application.output.log
@@ -444,18 +444,18 @@
     </FileLog>
     <FileLog>
       <ProjectId>1d945490-fd1f-43ef-a54e-a69010514f18</ProjectId>
-      <CorrelationId>Intent.Eventing.MassTransit.MassTransitEventBus</CorrelationId>
+      <CorrelationId>Intent.Eventing.MassTransit.IntegrationEventConsumer</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>Standard.AspNetCore.ServiceCallHandlers.Infrastructure/Eventing/MassTransitEventBus.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>MassTransitEventBus.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>Standard.AspNetCore.ServiceCallHandlers.Infrastructure/Eventing/IntegrationEventConsumer.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>IntegrationEventConsumer.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>
       <ProjectId>1d945490-fd1f-43ef-a54e-a69010514f18</ProjectId>
-      <CorrelationId>Intent.Eventing.MassTransit.WrapperConsumer</CorrelationId>
+      <CorrelationId>Intent.Eventing.MassTransit.MassTransitEventBus</CorrelationId>
       <OverwriteBehaviour>always</OverwriteBehaviour>
-      <ApplicationRelativeFilePath>Standard.AspNetCore.ServiceCallHandlers.Infrastructure/Eventing/WrapperConsumer.cs</ApplicationRelativeFilePath>
-      <ProjectRelativeFilePath>WrapperConsumer.cs</ProjectRelativeFilePath>
+      <ApplicationRelativeFilePath>Standard.AspNetCore.ServiceCallHandlers.Infrastructure/Eventing/MassTransitEventBus.cs</ApplicationRelativeFilePath>
+      <ProjectRelativeFilePath>MassTransitEventBus.cs</ProjectRelativeFilePath>
       <IsIgnored>false</IsIgnored>
     </FileLog>
     <FileLog>

Original file line number	Diff line number	Diff line change
`@@ -9,9 +9,9 @@ namespace MinimalHostingModel.Infrastructure.Eventing`
`9`	`9`	`{`
`10`	`10`	`public class FinbuckleMessageHeaderStrategy : IMultiTenantStrategy`
`11`	`11`	`{`
`12`		`- private string _tenantIdentifier = null!;`
	`12`	`+ private string? _tenantIdentifier;`
`13`	`13`
`14`		`- public Task<string> GetIdentifierAsync(object context)`
	`14`	`+ public Task<string?> GetIdentifierAsync(object context)`
`15`	`15`	`{`
`16`	`16`	`return Task.FromResult(_tenantIdentifier);`
`17`	`17`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,28 +8,28 @@`
`8`	`8`	`using MinimalHostingModel.Domain.Common.Interfaces;`
`9`	`9`
`10`	`10`	`[assembly: DefaultIntentManaged(Mode.Fully)]`
`11`		`-[assembly: IntentTemplate("Intent.Eventing.MassTransit.WrapperConsumer", Version = "1.0")]`
	`11`	`+[assembly: IntentTemplate("Intent.Eventing.MassTransit.IntegrationEventConsumer", Version = "1.0")]`
`12`	`12`
`13`	`13`	`namespace MinimalHostingModel.Infrastructure.Eventing`
`14`	`14`	`{`
`15`		`- public class WrapperConsumer<THandler, TMessage> : IConsumer<TMessage>`
	`15`	`+ public class IntegrationEventConsumer<THandler, TMessage> : IConsumer<TMessage>`
`16`	`16`	`where TMessage : class`
`17`	`17`	`where THandler : IIntegrationEventHandler<TMessage>`
`18`	`18`	`{`
`19`	`19`	`private readonly IServiceProvider _serviceProvider;`
`20`	`20`	`private readonly IUnitOfWork _unitOfWork;`
`21`	`21`
`22`		`- public WrapperConsumer(IServiceProvider serviceProvider, IUnitOfWork unitOfWork)`
	`22`	`+ public IntegrationEventConsumer(IServiceProvider serviceProvider, IUnitOfWork unitOfWork)`
`23`	`23`	`{`
`24`	`24`	`_serviceProvider = serviceProvider;`
`25`	`25`	`_unitOfWork = unitOfWork ?? throw new ArgumentNullException(nameof(unitOfWork));`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public async Task Consume(ConsumeContext<TMessage> context)`
`29`	`29`	`{`
`30`		`- var eventBus = _serviceProvider.GetService<MassTransitEventBus>()!;`
	`30`	`+ var eventBus = _serviceProvider.GetRequiredService<MassTransitEventBus>();`
`31`	`31`	`eventBus.ConsumeContext = context;`
`32`		`- var handler = _serviceProvider.GetService<THandler>()!;`
	`32`	`+ var handler = _serviceProvider.GetRequiredService<THandler>();`
`33`	`33`
`34`	`34`	`// The execution is wrapped in a transaction scope to ensure that if any other`
`35`	`35`	`// SaveChanges calls to the data source (e.g. EF Core) are called, that they are`
`@@ -55,22 +55,16 @@ public async Task Consume(ConsumeContext<TMessage> context)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- public class WrapperConsumerDefinition<THandler, TMessage> : ConsumerDefinition<WrapperConsumer<THandler, TMessage>>`
	`58`	`+ public class IntegrationEventConsumerDefinition<THandler, TMessage> : ConsumerDefinition<IntegrationEventConsumer<THandler, TMessage>>`
`59`	`59`	`where TMessage : class`
`60`	`60`	`where THandler : IIntegrationEventHandler<TMessage>`
`61`	`61`	`{`
`62`		`- private readonly IServiceProvider _serviceProvider;`
`63`		`-`
`64`		`- public WrapperConsumerDefinition(IServiceProvider serviceProvider)`
`65`		`- {`
`66`		`- _serviceProvider = serviceProvider;`
`67`		`- }`
`68`		`-`
`69`	`62`	`protected override void ConfigureConsumer(`
`70`	`63`	`IReceiveEndpointConfigurator endpointConfigurator,`
`71`		`- IConsumerConfigurator<WrapperConsumer<THandler, TMessage>> consumerConfigurator)`
	`64`	`+ IConsumerConfigurator<IntegrationEventConsumer<THandler, TMessage>> consumerConfigurator,`
	`65`	`+ IRegistrationContext context)`
`72`	`66`	`{`
`73`		`- endpointConfigurator.UseInMemoryInboxOutbox(_serviceProvider);`
	`67`	`+ endpointConfigurator.UseInMemoryInboxOutbox(context);`
`74`	`68`	`}`
`75`	`69`	`}`
`76`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -8,28 +8,28 @@`
`8`	`8`	`using Standard.AspNetCore.ServiceCallHandlers.Domain.Common.Interfaces;`
`9`	`9`
`10`	`10`	`[assembly: DefaultIntentManaged(Mode.Fully)]`
`11`		`-[assembly: IntentTemplate("Intent.Eventing.MassTransit.WrapperConsumer", Version = "1.0")]`
	`11`	`+[assembly: IntentTemplate("Intent.Eventing.MassTransit.IntegrationEventConsumer", Version = "1.0")]`
`12`	`12`
`13`	`13`	`namespace Standard.AspNetCore.ServiceCallHandlers.Infrastructure.Eventing`
`14`	`14`	`{`
`15`		`- public class WrapperConsumer<THandler, TMessage> : IConsumer<TMessage>`
	`15`	`+ public class IntegrationEventConsumer<THandler, TMessage> : IConsumer<TMessage>`
`16`	`16`	`where TMessage : class`
`17`	`17`	`where THandler : IIntegrationEventHandler<TMessage>`
`18`	`18`	`{`
`19`	`19`	`private readonly IServiceProvider _serviceProvider;`
`20`	`20`	`private readonly IUnitOfWork _unitOfWork;`
`21`	`21`
`22`		`- public WrapperConsumer(IServiceProvider serviceProvider, IUnitOfWork unitOfWork)`
	`22`	`+ public IntegrationEventConsumer(IServiceProvider serviceProvider, IUnitOfWork unitOfWork)`
`23`	`23`	`{`
`24`	`24`	`_serviceProvider = serviceProvider;`
`25`	`25`	`_unitOfWork = unitOfWork ?? throw new ArgumentNullException(nameof(unitOfWork));`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`public async Task Consume(ConsumeContext<TMessage> context)`
`29`	`29`	`{`
`30`		`- var eventBus = _serviceProvider.GetService<MassTransitEventBus>()!;`
	`30`	`+ var eventBus = _serviceProvider.GetRequiredService<MassTransitEventBus>();`
`31`	`31`	`eventBus.ConsumeContext = context;`
`32`		`- var handler = _serviceProvider.GetService<THandler>()!;`
	`32`	`+ var handler = _serviceProvider.GetRequiredService<THandler>();`
`33`	`33`
`34`	`34`	`// The execution is wrapped in a transaction scope to ensure that if any other`
`35`	`35`	`// SaveChanges calls to the data source (e.g. EF Core) are called, that they are`
`@@ -55,22 +55,16 @@ public async Task Consume(ConsumeContext<TMessage> context)`
`55`	`55`	`}`
`56`	`56`	`}`
`57`	`57`
`58`		`- public class WrapperConsumerDefinition<THandler, TMessage> : ConsumerDefinition<WrapperConsumer<THandler, TMessage>>`
	`58`	`+ public class IntegrationEventConsumerDefinition<THandler, TMessage> : ConsumerDefinition<IntegrationEventConsumer<THandler, TMessage>>`
`59`	`59`	`where TMessage : class`
`60`	`60`	`where THandler : IIntegrationEventHandler<TMessage>`
`61`	`61`	`{`
`62`		`- private readonly IServiceProvider _serviceProvider;`
`63`		`-`
`64`		`- public WrapperConsumerDefinition(IServiceProvider serviceProvider)`
`65`		`- {`
`66`		`- _serviceProvider = serviceProvider;`
`67`		`- }`
`68`		`-`
`69`	`62`	`protected override void ConfigureConsumer(`
`70`	`63`	`IReceiveEndpointConfigurator endpointConfigurator,`
`71`		`- IConsumerConfigurator<WrapperConsumer<THandler, TMessage>> consumerConfigurator)`
	`64`	`+ IConsumerConfigurator<IntegrationEventConsumer<THandler, TMessage>> consumerConfigurator,`
	`65`	`+ IRegistrationContext context)`
`72`	`66`	`{`
`73`		`- endpointConfigurator.UseInMemoryInboxOutbox(_serviceProvider);`
	`67`	`+ endpointConfigurator.UseInMemoryInboxOutbox(context);`
`74`	`68`	`}`
`75`	`69`	`}`
`76`	`70`	`}`