Align persistence providers with new base abstractions

Author: johnsimons

src/ServiceControl.Persistence.Sql.Core/EntityConfigurations/TrialLicenseConfiguration.cs

@@ -14,7 +14,6 @@ public void Configure(EntityTypeBuilder<TrialLicenseEntity> builder)
 
         // Ensure only one row exists by using a fixed primary key
         builder.Property(e => e.Id)
-            .HasDefaultValue(1)
             .ValueGeneratedNever();
 
         builder.Property(e => e.TrialEndDate)

src/ServiceControl.Persistence.Sql.Core/Implementation/TrialLicenseDataProvider.cs

@@ -1,56 +1,51 @@
 namespace ServiceControl.Persistence.Sql.Core.Implementation;
 
-using DbContexts;
+using Entities;
 using Microsoft.EntityFrameworkCore;
-using Microsoft.Extensions.DependencyInjection;
 using ServiceControl.Persistence;
 
-public class TrialLicenseDataProvider : ITrialLicenseDataProvider
+public class TrialLicenseDataProvider : DataStoreBase, ITrialLicenseDataProvider
 {
-    readonly IServiceProvider serviceProvider;
     const int SingletonId = 1;
 
-    public TrialLicenseDataProvider(IServiceProvider serviceProvider)
+    public TrialLicenseDataProvider(IServiceProvider serviceProvider) : base(serviceProvider)
     {
-        this.serviceProvider = serviceProvider;
     }
 
-    public async Task<DateOnly?> GetTrialEndDate(CancellationToken cancellationToken)
+    public Task<DateOnly?> GetTrialEndDate(CancellationToken cancellationToken)
     {
-        using var scope = serviceProvider.CreateScope();
-        var dbContext = scope.ServiceProvider.GetRequiredService<ServiceControlDbContextBase>();
-
-        var entity = await dbContext.TrialLicenses
-            .AsNoTracking()
-            .FirstOrDefaultAsync(t => t.Id == SingletonId, cancellationToken);
+        return ExecuteWithDbContext(async dbContext =>
+        {
+            var entity = await dbContext.TrialLicenses
+                .AsNoTracking()
+                .FirstOrDefaultAsync(t => t.Id == SingletonId, cancellationToken);
 
-        return entity?.TrialEndDate;
+            return entity?.TrialEndDate;
+        });
     }
 
-    public async Task StoreTrialEndDate(DateOnly trialEndDate, CancellationToken cancellationToken)
+    public Task StoreTrialEndDate(DateOnly trialEndDate, CancellationToken cancellationToken)
     {
-        using var scope = serviceProvider.CreateScope();
-        var dbContext = scope.ServiceProvider.GetRequiredService<ServiceControlDbContextBase>();
-
-        var existingEntity = await dbContext.TrialLicenses
-            .FirstOrDefaultAsync(t => t.Id == SingletonId, cancellationToken);
-
-        if (existingEntity != null)
+        return ExecuteWithDbContext(async dbContext =>
         {
-            // Update existing
-            existingEntity.TrialEndDate = trialEndDate;
-        }
-        else
-        {
-            // Insert new
-            var newEntity = new Entities.TrialLicenseEntity
+            var entity = new TrialLicenseEntity
             {
                 Id = SingletonId,
                 TrialEndDate = trialEndDate
             };
-            await dbContext.TrialLicenses.AddAsync(newEntity, cancellationToken);
-        }
 
-        await dbContext.SaveChangesAsync(cancellationToken);
+            // Use EF's change tracking for upsert
+            var existing = await dbContext.TrialLicenses.FindAsync([SingletonId], cancellationToken);
+            if (existing == null)
+            {
+                dbContext.TrialLicenses.Add(entity);
+            }
+            else
+            {
+                dbContext.TrialLicenses.Update(entity);
+            }
+
+            await dbContext.SaveChangesAsync(cancellationToken);
+        });
     }
 }

src/ServiceControl.Persistence.Sql.MySQL/MySqlPersistence.cs

@@ -2,12 +2,11 @@ namespace ServiceControl.Persistence.Sql.MySQL;
 
 using Core.Abstractions;
 using Core.DbContexts;
-using Core.Implementation;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using ServiceControl.Persistence;
 
-class MySqlPersistence : IPersistence
+class MySqlPersistence : BasePersistence, IPersistence
 {
     readonly MySqlPersisterSettings settings;
 
@@ -19,13 +18,7 @@ public MySqlPersistence(MySqlPersisterSettings settings)
     public void AddPersistence(IServiceCollection services)
     {
         ConfigureDbContext(services);
-
-        if (settings.MaintenanceMode)
-        {
-            return;
-        }
-
-        services.AddSingleton<ITrialLicenseDataProvider, TrialLicenseDataProvider>();
+        RegisterDataStores(services, settings.MaintenanceMode);
     }
 
     public void AddInstaller(IServiceCollection services)

src/ServiceControl.Persistence.Sql.PostgreSQL/PostgreSqlPersistence.cs

@@ -2,12 +2,11 @@ namespace ServiceControl.Persistence.Sql.PostgreSQL;
 
 using Core.Abstractions;
 using Core.DbContexts;
-using Core.Implementation;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using ServiceControl.Persistence;
 
-class PostgreSqlPersistence : IPersistence
+class PostgreSqlPersistence : BasePersistence, IPersistence
 {
     readonly PostgreSqlPersisterSettings settings;
 
@@ -19,13 +18,7 @@ public PostgreSqlPersistence(PostgreSqlPersisterSettings settings)
     public void AddPersistence(IServiceCollection services)
     {
         ConfigureDbContext(services);
-
-        if (settings.MaintenanceMode)
-        {
-            return;
-        }
-
-        services.AddSingleton<ITrialLicenseDataProvider, TrialLicenseDataProvider>();
+        RegisterDataStores(services, settings.MaintenanceMode);
     }
 
     public void AddInstaller(IServiceCollection services)

src/ServiceControl.Persistence.Sql.SqlServer/SqlServerPersistence.cs

@@ -2,12 +2,11 @@ namespace ServiceControl.Persistence.Sql.SqlServer;
 
 using Core.Abstractions;
 using Core.DbContexts;
-using Core.Implementation;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.DependencyInjection;
 using ServiceControl.Persistence;
 
-class SqlServerPersistence : IPersistence
+class SqlServerPersistence : BasePersistence, IPersistence
 {
     readonly SqlServerPersisterSettings settings;
 
@@ -19,13 +18,7 @@ public SqlServerPersistence(SqlServerPersisterSettings settings)
     public void AddPersistence(IServiceCollection services)
     {
         ConfigureDbContext(services);
-
-        if (settings.MaintenanceMode)
-        {
-            return;
-        }
-
-        services.AddSingleton<ITrialLicenseDataProvider, TrialLicenseDataProvider>();
+        RegisterDataStores(services, settings.MaintenanceMode);
     }
 
     public void AddInstaller(IServiceCollection services)