fix: Change ID to always

SenexCrenshaw · Feb 9, 2024 · dc56aa9 · dc56aa9
1 parent 33420cf
commit dc56aa9
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 9 deletions.
diff --git a/StreamMaster.API/Services/PostStartup.cs b/StreamMaster.API/Services/PostStartup.cs
@@ -1,6 +1,5 @@
 using StreamMaster.Application.Services;
 using StreamMaster.Infrastructure.EF.PGSQL;
-using StreamMaster.SchedulesDirect.Domain.Interfaces;
 
 namespace StreamMaster.API.Services;
 
@@ -16,6 +15,12 @@ protected override async Task ExecuteAsync(CancellationToken cancellationToken)
 
         logger.LogInformation($"Stream Master is starting.");
 
+        using IServiceScope scope = serviceProvider.CreateScope();
+        PGSQLRepositoryContext repositoryContext = scope.ServiceProvider.GetRequiredService<PGSQLRepositoryContext>();
+
+        //ISchedulesDirectDataService schedulesDirectService = scope.ServiceProvider.GetRequiredService<ISchedulesDirectDataService>();
+        await repositoryContext.MigrateData();
+
         await taskQueue.EPGSync(cancellationToken).ConfigureAwait(false);
 
         await taskQueue.ReadDirectoryLogos(cancellationToken).ConfigureAwait(false);
@@ -37,10 +42,6 @@ protected override async Task ExecuteAsync(CancellationToken cancellationToken)
 
         await taskQueue.SetIsSystemReady(true, cancellationToken).ConfigureAwait(false);
 
-        using IServiceScope scope = serviceProvider.CreateScope();
-        PGSQLRepositoryContext repositoryContext = scope.ServiceProvider.GetRequiredService<PGSQLRepositoryContext>();
 
-        ISchedulesDirectDataService schedulesDirectService = scope.ServiceProvider.GetRequiredService<ISchedulesDirectDataService>();
-        await repositoryContext.MigrateData(schedulesDirectService.AllServices);
     }
 }
diff --git a/StreamMaster.Domain/Repository/IRepositoryContext.cs b/StreamMaster.Domain/Repository/IRepositoryContext.cs
@@ -31,6 +31,6 @@ DbSet<ChannelGroup> ChannelGroups
 
         void Dispose();
         bool IsEntityTracked<TEntity>(TEntity entity) where TEntity : class;
-        Task MigrateData(List<MxfService> allServices);
+        Task MigrateData(List<MxfService>? allServices = null);
     }
 }
diff --git a/...er.Infrastructure.EF.PGSQL/Migrations/Repository/20240203170649_InitialCreate.Designer.cs b/...er.Infrastructure.EF.PGSQL/Migrations/Repository/20240203170649_InitialCreate.Designer.cs
diff --git a/StreamMaster.Infrastructure.EF.PGSQL/Migrations/Repository/RepositoryContextModelSnapshot.cs b/StreamMaster.Infrastructure.EF.PGSQL/Migrations/Repository/RepositoryContextModelSnapshot.cs
@@ -22,7 +22,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.HasPostgresExtension(modelBuilder, "citext");
-            NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
+            NpgsqlModelBuilderExtensions.UseIdentityAlwaysColumns(modelBuilder);
 
             modelBuilder.Entity("Microsoft.AspNetCore.DataProtection.EntityFrameworkCore.DataProtectionKey", b =>
                 {

diff --git a/StreamMaster.Infrastructure.EF.PGSQL/PGSQLRepositoryContext.cs b/StreamMaster.Infrastructure.EF.PGSQL/PGSQLRepositoryContext.cs
@@ -20,15 +20,47 @@ public bool IsEntityTracked<TEntity>(TEntity entity) where TEntity : class
             return ChangeTracker.Entries<TEntity>().Any(e => e.Entity == entity);
         }
 
-        public async Task MigrateData(List<MxfService> allServices)
+        public async Task MigrateData(List<MxfService>? allServices = null)
         {
             string? currentMigration = Database.GetAppliedMigrations().LastOrDefault();
             if (currentMigration == null)
             {
                 return;
             }
+
+            if (!SystemKeyValues.Any(a => a.Key == "ChangeIDAlways"))
+            {
+                await FixIDs().ConfigureAwait(false);
+                SystemKeyValues.Add(new SystemKeyValue { Key = "ChangeIDAlways", Value = "1" });
+                await SaveChangesAsync().ConfigureAwait(false);
+            }
         }
 
+        private async Task FixIDs()
+        {
+            int startValue = ChannelGroups.Max(a => a.Id) + 1;
+            await DoFixID("ChannelGroups", startValue).ConfigureAwait(false);
+            startValue = EPGFiles.Max(a => a.Id) + 1;
+            await DoFixID("EPGFiles", startValue).ConfigureAwait(false);
+            startValue = M3UFiles.Max(a => a.Id) + 1;
+            await DoFixID("M3UFiles", startValue).ConfigureAwait(false);
+            startValue = StreamGroups.Max(a => a.Id) + 1;
+            await DoFixID("StreamGroups", startValue).ConfigureAwait(false);
+        }
+
+        private async Task DoFixID(string tableName, int startValue)
+        {
+            ExecuteSqlRaw($"ALTER TABLE public.\"{tableName}\" ALTER COLUMN \"Id\" SET GENERATED ALWAYS;");
+
+            string sequenceName = $"{tableName}_Id_seq";
+            string alterSequenceCmd = $"ALTER SEQUENCE \"{sequenceName}\" RESTART WITH {startValue}";
+
+            ExecuteSqlRaw(alterSequenceCmd);
+
+            await SaveChangesAsync().ConfigureAwait(false);
+        }
+
+
 
         public DbSet<SystemKeyValue> SystemKeyValues { get; set; }