Fix DI lifetimes

atmina · Oct 22, 2023 · 051928f · 051928f
1 parent 101b938
commit 051928f
Show file tree

Hide file tree

Showing 10 changed files with 24 additions and 37 deletions.
diff --git a/src/Fluss.HotChocolate/Fluss.HotChocolate.csproj b/src/Fluss.HotChocolate/Fluss.HotChocolate.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0; net7.0; net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0; net7.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/src/Fluss.PostgreSQL/Fluss.PostgreSQL.csproj b/src/Fluss.PostgreSQL/Fluss.PostgreSQL.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0; net7.0; net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0; net7.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/src/Fluss.PostgreSQL/ServiceCollectionExtensions.cs b/src/Fluss.PostgreSQL/ServiceCollectionExtensions.cs
@@ -14,10 +14,7 @@ public static class ServiceCollectionExtensions
     public static IServiceCollection AddPostgresEventSourcingRepository(this IServiceCollection services,
         string connectionString, Assembly? upcasterSourceAssembly = null)
     {
-        if (services is null)
-        {
-            throw new ArgumentNullException(nameof(services));
-        }
+        ArgumentNullException.ThrowIfNull(services);
 
         if (upcasterSourceAssembly is not null)
         {
@@ -27,7 +24,7 @@ public static IServiceCollection AddPostgresEventSourcingRepository(this IServic
         }
 
         return services
-            .AddScoped<IBaseEventRepository, Fluss.PostgreSQL.PostgreSQLEventRepository>()
+            .AddBaseEventRepository<PostgreSQLEventRepository>()
             .AddFluentMigratorCore()
             .ConfigureRunner(rb => rb
                 .AddPostgres()
@@ -43,15 +40,15 @@ public static IServiceCollection AddPostgresEventSourcingRepository(this IServic
 public class Migrator : BackgroundService
 {
     private readonly ILogger<Migrator> _logger;
-    private readonly IMigrationRunner _migrationRunner;
+    private readonly IServiceProvider _serviceProvider;
     private bool _didFinish;
 
     private readonly SemaphoreSlim _didFinishChanged = new(0, 1);
 
-    public Migrator(IMigrationRunner migrationRunner, ILogger<Migrator> logger)
+    public Migrator(ILogger<Migrator> logger, IServiceProvider serviceProvider)
     {
-        _migrationRunner = migrationRunner;
         _logger = logger;
+        _serviceProvider = serviceProvider;
     }
 
     public async Task WaitForFinish()
@@ -77,30 +74,20 @@ protected override Task ExecuteAsync(CancellationToken stoppingToken)
         {
             try
             {
-                Migrate();
+                var scope = _serviceProvider.CreateScope();
+                var migrationRunner = scope.ServiceProvider.GetRequiredService<IMigrationRunner>()
+                migrationRunner.MigrateUp();
+
+                _didFinish = true;
+                _didFinishChanged.Release();
             }
             catch (Exception e)
             {
                 _logger.LogError(e, "Error while migrating");
+                Environment.Exit(-1);
             }
         }, stoppingToken);
     }
-
-    public void Migrate()
-    {
-        //_migrationRunner.ListMigrations();
-        try
-        {
-            _migrationRunner.MigrateUp();
-        }
-        catch
-        {
-            Environment.Exit(-1);
-        }
-
-        _didFinish = true;
-        _didFinishChanged.Release();
-    }
 }
 
 public class Upcaster : BackgroundService

diff --git a/src/Fluss.Testing/Fluss.Testing.csproj b/src/Fluss.Testing/Fluss.Testing.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0; net7.0; net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0; net7.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>

diff --git a/src/Fluss.UnitTest/Fluss.UnitTest.csproj b/src/Fluss.UnitTest/Fluss.UnitTest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0; net7.0; net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0; net7.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 

diff --git a/src/Fluss/Authentication/ServiceCollectionExtensions.cs b/src/Fluss/Authentication/ServiceCollectionExtensions.cs
@@ -11,9 +11,9 @@ public static IServiceCollection AddPoliciesFrom(this IServiceCollection service
 
         foreach (var policyType in policyTypes)
         {
-            services = services
-                .AddScoped(policyType)
-                .AddScoped(sp => (Policy)sp.GetRequiredService(policyType));
+            services
+                .AddSingleton(policyType)
+                .AddSingleton(sp => (Policy)sp.GetRequiredService(policyType));
         }
 
         return services;

diff --git a/src/Fluss/Fluss.csproj b/src/Fluss/Fluss.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>net8.0; net7.0; net6.0</TargetFrameworks>
+        <TargetFrameworks>net8.0; net7.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <PackageId>Fluss</PackageId>

diff --git a/src/Fluss/ServiceCollectionExtensions.cs b/src/Fluss/ServiceCollectionExtensions.cs
@@ -91,7 +91,7 @@ public static IServiceCollection AddUpcasters(this IServiceCollection services,
 
         foreach (var upcaster in upcasters)
         {
-            services.AddScoped(upcasterType, upcaster);
+            services.AddSingleton(upcasterType, upcaster);
         }
 
         return services.AddSingleton<EventUpcasterService>().AddSingleton<UpcasterSorter>();

diff --git a/src/Fluss/SideEffects/SideEffectsServiceCollectionExtension.cs b/src/Fluss/SideEffects/SideEffectsServiceCollectionExtension.cs
@@ -11,7 +11,7 @@ public static IServiceCollection RegisterSideEffects(this IServiceCollection ser
 
         foreach (var @class in implementingClasses)
         {
-            services.AddScoped(typeof(SideEffect), @class);
+            services.AddSingleton(typeof(SideEffect), @class);
         }
 
         services.AddHostedService<SideEffectDispatcher>();

diff --git a/src/Fluss/Validation/ValidationServiceCollectionExtension.cs b/src/Fluss/Validation/ValidationServiceCollectionExtension.cs
@@ -12,15 +12,15 @@ public static IServiceCollection AddValidationFrom(this IServiceCollection servi
             sourceAssembly.GetTypes().Where(t => t.IsAssignableTo(aggregateValidatorType)).ToList();
         foreach (var aggregateValidator in aggregateValidators)
         {
-            services.AddScoped(aggregateValidatorType, aggregateValidator);
+            services.AddSingleton(aggregateValidatorType, aggregateValidator);
         }
 
         var eventValidatorType = typeof(EventValidator);
         var eventValidators =
             sourceAssembly.GetTypes().Where(t => t.IsAssignableTo(eventValidatorType)).ToList();
         foreach (var eventValidator in eventValidators)
         {
-            services.AddScoped(eventValidatorType, eventValidator);
+            services.AddSingleton(eventValidatorType, eventValidator);
         }
 
         services.AddSingleton<IRootValidator, RootValidator>();