Merge pull request #457

Updated dependencies. Refactored to async scheme

Author: ChiaraBm

Moonlight.ApiServer.Runtime/Program.cs

@@ -10,15 +10,15 @@
 
 var cs = new Startup();
 
-await cs.Initialize(args, pluginLoader.Instances);
+await cs.InitializeAsync(args, pluginLoader.Instances);
 
 var builder = WebApplication.CreateBuilder(args);
 
-await cs.AddMoonlight(builder);
+await cs.AddMoonlightAsync(builder);
 
 var app = builder.Build();
 
-await cs.AddMoonlight(app);
+await cs.AddMoonlightAsync(app);
 
 // Handle setup of wasm app hosting in the runtime
 // so the Moonlight.ApiServer doesn't need the wasm package

Moonlight.ApiServer/Configuration/AppConfiguration.cs

@@ -62,7 +62,7 @@ public record SignalRData
     public record FilesData
     {
         [YamlMember(Description = "The maximum file size limit a combine operation is allowed to process")]
-        public long CombineLimit { get; set; } = ByteConverter.FromGigaBytes(5).MegaBytes;
+        public double CombineLimit { get; set; } = ByteConverter.FromGigaBytes(5).MegaBytes;
     }
 
     public record FrontendData

Moonlight.ApiServer/Database/CoreDataContext.cs

@@ -1,34 +1,47 @@
 using Hangfire.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
-using MoonCore.Extended.SingleDb;
 using Moonlight.ApiServer.Configuration;
 using Moonlight.ApiServer.Database.Entities;
 using Moonlight.ApiServer.Models;
 
 namespace Moonlight.ApiServer.Database;
 
-public class CoreDataContext : DatabaseContext
+public class CoreDataContext : DbContext
 {
-    public override string Prefix { get; } = "Core";
-
+    private readonly AppConfiguration Configuration;
+    
     public DbSet<User> Users { get; set; }
     public DbSet<ApiKey> ApiKeys { get; set; }
     public DbSet<Theme> Themes { get; set; }
 
     public CoreDataContext(AppConfiguration configuration)
     {
-        Options = new()
+        Configuration = configuration;
+    }
+
+    protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
+    {
+        if(optionsBuilder.IsConfigured)
+            return;
+
+        var database = Configuration.Database;
+        
+        var connectionString = $"Host={database.Host};" +
+                               $"Port={database.Port};" +
+                               $"Database={database.Database};" +
+                               $"Username={database.Username};" +
+                               $"Password={database.Password}";
+
+        optionsBuilder.UseNpgsql(connectionString, builder =>
         {
-            Host = configuration.Database.Host,
-            Port = configuration.Database.Port,
-            Username = configuration.Database.Username,
-            Password = configuration.Database.Password,
-            Database = configuration.Database.Database
-        };
+            builder.MigrationsHistoryTable("MigrationsHistory", "core");
+        });
     }
 
     protected override void OnModelCreating(ModelBuilder modelBuilder)
     {
+        modelBuilder.Model.SetDefaultSchema("core");
+        
         base.OnModelCreating(modelBuilder);
         modelBuilder.OnHangfireModelCreating();