feat: add migrations to container

Author: Rens van Moorsel

.github/workflows/build-and-publish-release.yml

@@ -26,6 +26,22 @@ jobs:
       - name: Checkout repository
         uses: actions/checkout@v4
 
+      # --- .NET Setup voor Migration Bundle ---
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '8.0.x'
+
+      - name: Install dotnet-ef
+        run: dotnet tool install --global dotnet-ef
+
+      - name: Restore dependencies
+        run: dotnet restore Backend/Backend.csproj
+
+      - name: Create Migration Bundle
+        run: |
+          dotnet ef migrations bundle --project Backend/ -o efbundle --self-contained -r linux-x64 --force
+
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:

Backend/Database/DatabaseSeeder.cs

@@ -3,14 +3,15 @@
 using Backend.Services;
 using Backend.Utils.DateTime;
 using Microsoft.EntityFrameworkCore;
+using Npgsql;
 
 namespace Backend.Database;
 
 /// <summary>
 /// The DatabaseSeeder class is responsible for seeding the database with initial data and ensuring that certain essential settings and groups exist when the application starts. It implements the IHostedService interface, allowing it to run as a background service during the application's startup process. The seeder checks for the existence of specific settings and groups, creating them if they do not already exist, and also ensures that a backup board account is created if there are no existing board members. This helps to ensure that the application has the necessary configuration and data in place for proper functionality from the moment it is launched.
 /// </summary>
 /// <param name="scopeFactory">The factory for creating service scopes.</param>
-public class DatabaseSeeder(IServiceScopeFactory scopeFactory) : IHostedService
+public class DatabaseSeeder(IServiceScopeFactory scopeFactory, Logger<DatabaseSeeder> logger) : IHostedService
 {
     /// <summary>
     /// Starts the database seeding process. This method is called when the application starts and is responsible for ensuring that essential settings and groups are present in the database. It creates a new service scope to access the database context and performs checks to create default settings and groups if they do not already exist. Additionally, it ensures that a backup board account is created if there are no existing board members, providing a fallback option for administrative access. The seeding process helps to establish a baseline configuration for the application, allowing it to function correctly from the outset.
@@ -19,43 +20,50 @@ public class DatabaseSeeder(IServiceScopeFactory scopeFactory) : IHostedService
     /// <returns>A task representing the asynchronous operation.</returns>
     public async Task StartAsync(CancellationToken cancellationToken)
     {
-        using var scope = scopeFactory.CreateScope();
+        try
+        {
+            using var scope = scopeFactory.CreateScope();
 
-        var db = scope.ServiceProvider.GetRequiredService<PostgresDbContext>();
+            var db = scope.ServiceProvider.GetRequiredService<PostgresDbContext>();
 
-        string boardGroupId = await EnsureSettingExists(db, "BoardGroupId", "1");
-        
-        string candidateBoardGroupId = await EnsureSettingExists(db, "CandidateBoardGroupId", "2");
-        
-        await EnsureGroupExists(db, "Board", GroupType.Committee, uint.Parse(boardGroupId));
-        
-        await EnsureGroupExists(db, "Candidate Board", GroupType.Committee, uint.Parse(candidateBoardGroupId));
+            string boardGroupId = await EnsureSettingExists(db, "BoardGroupId", "1");
+            
+            string candidateBoardGroupId = await EnsureSettingExists(db, "CandidateBoardGroupId", "2");
+            
+            await EnsureGroupExists(db, "Board", GroupType.Committee, uint.Parse(boardGroupId));
+            
+            await EnsureGroupExists(db, "Candidate Board", GroupType.Committee, uint.Parse(candidateBoardGroupId));
 
-        await EnsureSettingExists(db, "MollieFee", "0.39");
+            await EnsureSettingExists(db, "MollieFee", "0.39");
 
-        await EnsureSettingExists(db, "MollieFeeGLAccount", "5007");
+            await EnsureSettingExists(db, "MollieFeeGLAccount", "5007");
 
-        await EnsureSettingExists(db, "MollieFeeCostUnit", "TRX");
+            await EnsureSettingExists(db, "MollieFeeCostUnit", "TRX");
 
-        await EnsureSettingExists(db, "MembershipGLAccount", "8000");
-        
-        await EnsureSettingExists(db, "ActivityGLAccount", "7001");
+            await EnsureSettingExists(db, "MembershipGLAccount", "8000");
+            
+            await EnsureSettingExists(db, "ActivityGLAccount", "7001");
 
-        await EnsureSettingExists(db, "MolliePaymentsCondition", "2");
+            await EnsureSettingExists(db, "MolliePaymentsCondition", "2");
 
-        await EnsureSettingExists(db, "MollieRelationCode", "473");
+            await EnsureSettingExists(db, "MollieRelationCode", "473");
 
-        await EnsureSettingExists(db, "MembershipVATCode", "0");
+            await EnsureSettingExists(db, "MembershipVATCode", "0");
 
-        await EnsureSettingExists(db, "MollieFeeVATCode", "21");
+            await EnsureSettingExists(db, "MollieFeeVATCode", "21");
 
-        await EnsureSettingExists(db, "MembershipPrice", "7.50");
+            await EnsureSettingExists(db, "MembershipPrice", "7.50");
 
-        var keycloakOutboxWorker = scope.ServiceProvider.GetRequiredService<KeycloakOutboxWorker>();
+            var keycloakOutboxWorker = scope.ServiceProvider.GetRequiredService<KeycloakOutboxWorker>();
 
-        var createNewBoardService = scope.ServiceProvider.GetRequiredService<ICreateNewBoardService>();
+            var createNewBoardService = scope.ServiceProvider.GetRequiredService<ICreateNewBoardService>();
 
-        await EnsureBoardAccountExists(db, keycloakOutboxWorker, createNewBoardService);
+            await EnsureBoardAccountExists(db, keycloakOutboxWorker, createNewBoardService);
+        }
+        catch (NpgsqlException ex) when (ex.SqlState == "42P01")
+        {
+            logger.LogWarning("Tables not found. Skipping seeder; migrations might be pending.");
+        }
     }
 
     /// <summary>

Backend/Dockerfile

@@ -19,8 +19,15 @@ FROM build AS publish
 ARG BUILD_CONFIGURATION=Release
 RUN dotnet publish "Backend.csproj" -c $BUILD_CONFIGURATION -o /app/publish /p:UseAppHost=false
 
-# Finally, copy over the published project into the base stage
+# Copy over the published project into the base stage
 FROM base AS final
 WORKDIR /app
 COPY --from=publish /app/publish .
+
+# Copy the efbundle tool to the final image and make it executable
+COPY efbundle .
+USER root
+RUN chmod +x ./efbundle
+USER $APP_UID
+
 ENTRYPOINT ["dotnet", "Backend.dll"]

Backend/Program.cs

@@ -15,6 +15,7 @@
 using Microsoft.AspNetCore.HttpLogging;
 using System.Text;
 using System.Net.Http.Headers;
+using Npgsql;
 
 Env.Load();
 
@@ -156,12 +157,12 @@
 
     c.SupportNonNullableReferenceTypes();
 });
-string connectionstring = Environment.GetEnvironmentVariable("PostgresqlConnectionString") ?? throw new InvalidOperationException("PostgresConnectionString environment variable is not set.");
+string connectionstring = Environment.GetEnvironmentVariable("PostgresqlConnectionString") ?? string.Empty;
 builder.Services.AddNpgsql<PostgresDbContext>(connectionString: connectionstring);
 builder.Services.AddControllers().AddNewtonsoftJson();
 builder.Services.AddMollieApi(options => 
 {
-    options.ApiKey = Environment.GetEnvironmentVariable("MollieApiKey") ?? throw new Exception("No Mollie Key initialized");
+    options.ApiKey = Environment.GetEnvironmentVariable("MollieApiKey") ?? string.Empty;
 });
 builder.Services.AddHostedService<PaymentSyncService>();
 builder.Services.AddHttpClient("KeycloakAdmin", client =>

compose.yaml

@@ -11,7 +11,7 @@ services:
     env_file:
       - .env
     environment:
-      - PostgresqlConnectionString=${PostgresConnectionString}
+      - PostgresqlConnectionString=${PostgresqlConnectionString}
       - ASPNETCORE_ENVIRONMENT=Production
 
   tavern-frontend: