remove log context and merge with default

HomeAutomation.Core/Logging/DatabaseLogger.cs

@@ -33,7 +33,7 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
 
             try
             {
-                using LogContext db = serviceScope.ServiceProvider.GetRequiredService<LogContext>();
+                using DefaultContext db = serviceScope.ServiceProvider.GetRequiredService<DefaultContext>();
                 using IDbContextTransaction transaction = db.Database.BeginTransaction();
 
                 LogRow row = new LogRow
@@ -65,4 +65,4 @@ public void Log<TState>(LogLevel logLevel, EventId eventId, TState state, Except
             }
         }
     }
-}
+}

HomeAutomation.Core/ScheduledJobs/CleanupLogScheduleJob.cs

@@ -5,7 +5,7 @@
 
 namespace HomeAutomation.ScheduledJobs;
 
-public class CleanupLogScheduleJob(LogContext logContext, ILogger<CleanupLogScheduleJob> logger) : IScheduledJob
+public class CleanupLogScheduleJob(DefaultContext logContext, ILogger<CleanupLogScheduleJob> logger) : IScheduledJob
 {
     public async Task Execute(DateTime currentExecution, DateTime? lastExecution, CancellationToken cancellationToken)
     {
@@ -14,10 +14,9 @@ public async Task Execute(DateTime currentExecution, DateTime? lastExecution, Ca
         DateTime loglimit = DateTime.UtcNow.AddDays(-7); // TODO: place in configuration?
         _ = await logContext.Rows.Where(x => loglimit > x.Timestamp).ExecuteDeleteAsync();
 
-
         DateTime maillimit = DateTime.UtcNow.AddDays(-3); // TODO: place in configuration?
         _ = await logContext.MailMessages.Where(x => maillimit > x.Timestamp).ExecuteDeleteAsync();
 
         logger.LogInformation("Schedule.Cleanup :: done");
     }
-}
+}

HomeAutomation.Core/Services/EmailReceiveService.cs

@@ -86,10 +86,10 @@ private async Task SaveToEml(IServiceScope scope, string messageId, byte[] emlDa
                 EmlData = emlData
             };
 
-            var context = scope.ServiceProvider.GetService<LogContext>();
+            var context = scope.ServiceProvider.GetService<DefaultContext>();
 
             context.Add(mailMessage);
             await context.SaveChangesAsync();
         }
     }
-}
+}

HomeAutomation.Database/Contexts/DefaultContext.cs

@@ -11,6 +11,10 @@ public class DefaultContext(DbContextOptions<DefaultContext> options) : DbContex
 
     public DbSet<WeatherForecast> WeatherForecast { get; set; }
 
+    public DbSet<LogRow> Rows { get; set; }
+
+    public DbSet<MailMessage> MailMessages { get; set; }
+
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
         base.OnModelCreating(modelBuilder);

HomeAutomation.Database/Extensions/IHostExtensions.cs

@@ -10,7 +10,6 @@ public static class IHostExtensions
     public static void ApplyDatabaseMigrations(this IHost host)
     {
         host.ApplyDatabaseMigration<DefaultContext>();
-        host.ApplyDatabaseMigration<LogContext>();
     }
 
     private static void ApplyDatabaseMigration<TContext>(this IHost host) where TContext : DbContext
@@ -19,4 +18,4 @@ private static void ApplyDatabaseMigration<TContext>(this IHost host) where TCon
         var context = scope.ServiceProvider.GetRequiredService<TContext>();
         context.Database.Migrate();
     }
-}
+}

HomeAutomation.Database/Extensions/IServiceCollectionExtensions.cs

@@ -17,14 +17,9 @@ public static void AddDefaultDatabaseContext(this IServiceCollection services, s
         services.AddDatabaseContext<DefaultContext>(postgressConnectionString);
     }
 
-    public static void AddLoggingDatabaseContext(this IServiceCollection services, string postgressConnectionString)
-    {
-        services.AddDatabaseContext<LogContext>(postgressConnectionString);
-    }
-
     private static void AddDatabaseContext<TContext>(this IServiceCollection services, string postgressConnectionString) where TContext : DbContext
     {
         string assemblyName = Assembly.GetExecutingAssembly().GetName().Name!;
         services.AddDbContext<TContext>(options => options.UseNpgsql(postgressConnectionString, x => x.MigrationsAssembly(assemblyName)), ServiceLifetime.Transient);
     }
-}
+}

HomeAutomation.Database/Migrations/LogMigrations/20240604091127_postgres_init.cs → HomeAutomation.Database/Migrations/DefaultMigrations/20241216172408_mergeWithLog.cs

@@ -4,14 +4,17 @@
 
 #nullable disable
 
-namespace HomeAutomation.Database.Migrations.LogMigrations
+namespace HomeAutomation.Database.Migrations.DefaultMigrations
 {
     /// <inheritdoc />
-    public partial class postgres_init : Migration
+    public partial class mergeWithLog : Migration
     {
         /// <inheritdoc />
         protected override void Up(MigrationBuilder migrationBuilder)
         {
+            migrationBuilder.DropTable(
+                name: "PhoneCalls");
+
             migrationBuilder.CreateTable(
                 name: "MailMessages",
                 columns: table => new
@@ -56,6 +59,22 @@ protected override void Down(MigrationBuilder migrationBuilder)
 
             migrationBuilder.DropTable(
                 name: "Rows");
+
+            migrationBuilder.CreateTable(
+                name: "PhoneCalls",
+                columns: table => new
+                {
+                    ID = table.Column<int>(type: "integer", nullable: false)
+                        .Annotation("Npgsql:ValueGenerationStrategy", NpgsqlValueGenerationStrategy.IdentityByDefaultColumn),
+                    Length = table.Column<TimeSpan>(type: "interval", nullable: false),
+                    Number = table.Column<string>(type: "text", nullable: false),
+                    Timestamp = table.Column<DateTime>(type: "timestamp with time zone", nullable: false),
+                    Type = table.Column<int>(type: "integer", nullable: false)
+                },
+                constraints: table =>
+                {
+                    table.PrimaryKey("PK_PhoneCalls", x => x.ID);
+                });
         }
     }
 }