Merge pull request #2162 from Cratis:fix/rules-validators

Fix/rules-validators

Author: einari

Source/Clients/AspNetCore.Specs/Rules/for_RulesModelValidatorProvider/given/one_rule_for_type.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Cratis.Chronicle.Rules;
+using Microsoft.AspNetCore.Http;
 
 namespace Cratis.Chronicle.AspNetCore.Rules.for_RulesModelValidatorProvider.given;
 
@@ -10,12 +11,20 @@ public class one_rule_for_type : Specification
     protected RulesModelValidatorProvider _provider;
     protected IRules _rules;
     protected IServiceProvider _serviceProvider;
+    protected IServiceProvider _scopedServiceProvider;
+    protected IHttpContextAccessor _httpContextAccessor;
 
     void Establish()
     {
         _rules = Substitute.For<IRules>();
         _serviceProvider = Substitute.For<IServiceProvider>();
-        _serviceProvider.GetService(typeof(IRules)).Returns(_rules);
+        _httpContextAccessor = Substitute.For<IHttpContextAccessor>();
+        _serviceProvider.GetService(typeof(IHttpContextAccessor)).Returns(_httpContextAccessor);
+        var httpContext = Substitute.For<HttpContext>();
+        _httpContextAccessor.HttpContext.Returns(httpContext);
+        _scopedServiceProvider = Substitute.For<IServiceProvider>();
+        httpContext.RequestServices.Returns(_scopedServiceProvider);
+        _scopedServiceProvider.GetService(typeof(IRules)).Returns(_rules);
         _provider = new(_serviceProvider);
     }
 }

Source/Clients/AspNetCore/ChronicleClientServiceCollectionExtensions.cs

@@ -79,7 +79,7 @@ public static IServiceCollection AddCratisChronicleClient(this IServiceCollectio
         services.AddScoped(sp => sp.GetRequiredService<IEventStore>().Reactors);
         services.AddScoped(sp => sp.GetRequiredService<IEventStore>().Reducers);
         services.AddScoped(sp => sp.GetRequiredService<IEventStore>().Projections);
-        services.AddSingleton<IRules, Rules>();
+        services.AddScoped<IRules, Rules>();
         services.AddSingleton(sp => sp.GetRequiredService<IChronicleClient>().Options.ArtifactsProvider);
         services.AddSingleton(sp => sp.GetRequiredService<IChronicleClient>().Options.NamingPolicy);
 

Source/Clients/AspNetCore/Rules/RulesModelValidatorProvider.cs

@@ -2,6 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Cratis.Chronicle.Rules;
+using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.ModelBinding.Validation;
 using Microsoft.Extensions.DependencyInjection;
 
@@ -35,7 +36,8 @@ public RulesModelValidatorProvider(IServiceProvider serviceProvider)
     /// <inheritdoc/>
     public void CreateValidators(ModelValidatorProviderContext context)
     {
-        var rulesSystem = ServiceProvider.GetRequiredService<IRules>();
+        var httpContextAccessor = ServiceProvider.GetRequiredService<IHttpContextAccessor>();
+        var rulesSystem = httpContextAccessor.HttpContext!.RequestServices.GetRequiredService<IRules>();
         if (rulesSystem.HasFor(context.ModelMetadata.ModelType))
         {
             var ruleTypes = rulesSystem.GetFor(context.ModelMetadata.ModelType);