fix: resolve integration test issues

jeastham1993 · jeastham1993 · commit 8ebd8191145f · 2025-05-28T16:06:06.000+01:00
diff --git a/.github/workflows/user-management-test.yml b/.github/workflows/user-management-test.yml
@@ -31,8 +31,8 @@ jobs:
     strategy:
       matrix:
         DRIVING:
-          - AZURE
-          #- AGNOSTIC
+          - AGNOSTIC
+          #- AZURE
       fail-fast: false
 
     services:
@@ -77,8 +77,8 @@ jobs:
     strategy:
       matrix:
         DRIVING:
-          - AZURE
-          #- AGNOSTIC
+          - AGNOSTIC
+          #- AZURE
       fail-fast: false
 
     steps:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -154,7 +154,7 @@ services:
   user-management:
     build:
       context: ./user-management
-      dockerfile: src/Stickerlandia.UserManagement.AspNet/Dockerfile
+      dockerfile: src/Stickerlandia.UserManagement.Api/Dockerfile
     container_name: user-management
     depends_on:
       user-management-db:
@@ -163,7 +163,7 @@ services:
         condition: service_healthy
     environment:
       ASPNETCORE_ENVIRONMENT: Development
-      DRIVING: ASPNET
+      DRIVING: AGNOSTIC
       DRIVEN: AGNOSTIC
       ConnectionStrings__messaging: "redpanda:9092"
       ConnectionStrings__database: "Host=user-management-db;Port=5432;Database=user_management;Username=user_mgmt_user;Password=user_mgmt_password"
@@ -175,6 +175,44 @@ services:
       - "traefik.http.routers.user-management.rule=PathPrefix(`/api/users`)"
       - "traefik.http.services.user-management.loadbalancer.server.port=8080"
 
+  user-management-worker:
+    build:
+      context: ./user-management
+      dockerfile: src/Stickerlandia.UserManagement.Worker/Dockerfile
+    container_name: user-management-worker
+    depends_on:
+      user-management-db:
+        condition: service_healthy
+      redpanda:
+        condition: service_healthy
+    environment:
+      ASPNETCORE_ENVIRONMENT: Development
+      DRIVING: AGNOSTIC
+      DRIVEN: AGNOSTIC
+      ConnectionStrings__messaging: "redpanda:9092"
+      ConnectionStrings__database: "Host=user-management-db;Port=5432;Database=user_management;Username=user_mgmt_user;Password=user_mgmt_password"
+      KAFKA__BOOTSTRAPSERVERS: "redpanda:9092"
+      KAFKA__SCHEMAREGISTRY: "http://redpanda:8082"
+      KAFKA__GROUPID: "stickerlandia-user-management"
+
+  user-management-db-migrations:
+    build:
+      context: ./user-management
+      dockerfile: src/Stickerlandia.UserManagement.MigrationService/Dockerfile
+    container_name: user-management-migrations
+    depends_on:
+      user-management-db:
+        condition: service_healthy
+    environment:
+      ASPNETCORE_ENVIRONMENT: Development
+      DRIVING: AGNOSTIC
+      DRIVEN: AGNOSTIC
+      ConnectionStrings__messaging: "redpanda:9092"
+      ConnectionStrings__database: "Host=user-management-db;Port=5432;Database=user_management;Username=user_mgmt_user;Password=user_mgmt_password"
+      KAFKA__BOOTSTRAPSERVERS: "redpanda:9092"
+      KAFKA__SCHEMAREGISTRY: "http://redpanda:8082"
+      KAFKA__GROUPID: "stickerlandia-user-management"
+
 volumes:
   sticker-award-data:
   user-management-data:
diff --git a/user-management/Stickerlandia.UserManagement.sln b/user-management/Stickerlandia.UserManagement.sln
@@ -39,6 +39,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagemen
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.ServiceDefaults", "src\Stickerlandia.UserManagement.ServiceDefaults\Stickerlandia.UserManagement.ServiceDefaults.csproj", "{7C28228C-4B3D-4AAE-95E6-4669413BD06C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Stickerlandia.UserManagement.MigrationService", "src\Stickerlandia.UserManagement.MigrationService\Stickerlandia.UserManagement.MigrationService.csproj", "{91536DB3-CBA5-44DE-943C-76F8577793FE}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -100,6 +102,10 @@ Global
 		{7C28228C-4B3D-4AAE-95E6-4669413BD06C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7C28228C-4B3D-4AAE-95E6-4669413BD06C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7C28228C-4B3D-4AAE-95E6-4669413BD06C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{91536DB3-CBA5-44DE-943C-76F8577793FE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{91536DB3-CBA5-44DE-943C-76F8577793FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{91536DB3-CBA5-44DE-943C-76F8577793FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{91536DB3-CBA5-44DE-943C-76F8577793FE}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{4DDC795B-2EA4-4123-B631-F0D8CAA99BA6} = {FE220876-2B87-4095-8BD2-039049503C72}
@@ -117,5 +123,6 @@ Global
 		{408EFE63-AA9C-46BD-ADD5-AB917BB4E9E6} = {FC9DDF76-8DAC-4498-8926-8883F984709C}
 		{ED36763B-8971-4CC9-A4FE-16924F1961C0} = {924749FC-98D5-40A6-8F4B-BA9BFDEDDEC3}
 		{7C28228C-4B3D-4AAE-95E6-4669413BD06C} = {924749FC-98D5-40A6-8F4B-BA9BFDEDDEC3}
+		{91536DB3-CBA5-44DE-943C-76F8577793FE} = {924749FC-98D5-40A6-8F4B-BA9BFDEDDEC3}
 	EndGlobalSection
 EndGlobal
diff --git a/user-management/src/Stickerlandia.UserManagement.Agnostic/AuthenticationWorker.cs b/user-management/src/Stickerlandia.UserManagement.Agnostic/AuthenticationWorker.cs
diff --git a/user-management/src/Stickerlandia.UserManagement.Agnostic/ServiceExtensions.cs b/user-management/src/Stickerlandia.UserManagement.Agnostic/ServiceExtensions.cs
@@ -78,7 +78,6 @@ public static IServiceCollection AddPostgresAuthServices(this IServiceCollection
                 .UseDbContext<UserManagementDbContext>());
         
         services.AddScoped<IAuthService, MicrosoftIdentityAuthService>();
-        services.AddHostedService<AuthenticationWorker>();
         
         services.AddScoped<IUsers, PostgresUserRepository>();
         services.AddScoped<IOutbox, PostgresUserRepository>();
diff --git a/user-management/src/Stickerlandia.UserManagement.Api/Dockerfile b/user-management/src/Stickerlandia.UserManagement.Api/Dockerfile
@@ -3,17 +3,17 @@ FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 WORKDIR /App
 
 # Deps
-COPY src/Stickerlandia.UserManagement.AspNet/Stickerlandia.UserManagement.AspNet.csproj src/Stickerlandia.UserManagement.AspNet/
-RUN dotnet restore src/Stickerlandia.UserManagement.AspNet/Stickerlandia.UserManagement.AspNet.csproj
+COPY src/Stickerlandia.UserManagement.Api/Stickerlandia.UserManagement.Api.csproj src/Stickerlandia.UserManagement.Api/
+RUN dotnet restore src/Stickerlandia.UserManagement.Api/Stickerlandia.UserManagement.Api.csproj
 
 # Now copy the rest of the source code
 COPY . ./
 
 # Publish the application
-RUN dotnet publish src/Stickerlandia.UserManagement.AspNet/Stickerlandia.UserManagement.AspNet.csproj -o out -c Release -r linux-arm64
+RUN dotnet publish src/Stickerlandia.UserManagement.Api/Stickerlandia.UserManagement.Api.csproj -o out -c Release -r linux-arm64
 
 FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled AS runtime
 WORKDIR /App
 COPY --from=build /App/out .
 EXPOSE 80
-ENTRYPOINT [ "dotnet", "Stickerlandia.UserManagement.AspNet.dll" ]
+ENTRYPOINT [ "dotnet", "Stickerlandia.UserManagement.Api.dll" ]
diff --git a/user-management/src/Stickerlandia.UserManagement.Api/Dockerfile-x86 b/user-management/src/Stickerlandia.UserManagement.Api/Dockerfile-x86
@@ -1,12 +1,19 @@
-FROM mcr.microsoft.com/dotnet/sdk:9.0 as build
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
 
 WORKDIR /App
+
+# Deps
+COPY src/Stickerlandia.UserManagement.Api/Stickerlandia.UserManagement.Api.csproj src/Stickerlandia.UserManagement.Api/
+RUN dotnet restore src/Stickerlandia.UserManagement.Api/Stickerlandia.UserManagement.Api.csproj
+
+# Now copy the rest of the source code
 COPY . ./
-RUN dotnet restore PlantBasedPizza.Account/application/PlantBasedPizza.Account.Api/PlantBasedPizza.Account.Api.csproj
-RUN dotnet publish PlantBasedPizza.Account/application/PlantBasedPizza.Account.Api/PlantBasedPizza.Account.Api.csproj -o out -c Release -r linux-x64
 
-FROM mcr.microsoft.com/dotnet/aspnet:9.0-noble-chiseled as runtime
+# Publish the application
+RUN dotnet publish src/Stickerlandia.UserManagement.Api/Stickerlandia.UserManagement.Api.csproj -o out -c Release -r linux-x64
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled AS runtime
 WORKDIR /App
 COPY --from=build /App/out .
 EXPOSE 80
-ENTRYPOINT [ "dotnet", "PlantBasedPizza.Account.Api.dll" ]
+ENTRYPOINT [ "dotnet", "Stickerlandia.UserManagement.Api.dll" ]
diff --git a/user-management/src/Stickerlandia.UserManagement.Aspire/AppBuilderExtensions.cs b/user-management/src/Stickerlandia.UserManagement.Aspire/AppBuilderExtensions.cs
@@ -27,6 +27,7 @@ public static IDistributedApplicationBuilder WithContainerizedApi(
             .WithEnvironment("DRIVING", builder.Configuration["DRIVING"])
             .WithEnvironment("DRIVEN", builder.Configuration["DRIVEN"])
             .WithHttpsEndpoint(51545)
+            .WaitForCompletion(resources.MigrationServiceResource)
             .WaitFor(resources.MessagingResource)
             .WaitFor(resources.DatabaseResource);
 
@@ -47,8 +48,17 @@ public static InfrastructureResources WithAgnosticServices(
             .AddPostgres("database")
             .WithLifetime(ContainerLifetime.Persistent)
             .AddDatabase("users");
+        
+        var migrationService = builder.AddProject<Projects.Stickerlandia_UserManagement_MigrationService>("migration-service")
+            .WithEnvironment("ConnectionStrings__database", agnosticDb)
+            .WithEnvironment("ConnectionStrings__messaging", kafka)
+            .WithEnvironment("DRIVING", builder.Configuration["DRIVING"])
+            .WithEnvironment("DRIVEN", builder.Configuration["DRIVEN"])
+            .WithHttpsEndpoint(51545)
+            .WaitFor(agnosticDb)
+            .WaitFor(kafka);
 
-        return new InfrastructureResources(agnosticDb, kafka);
+        return new InfrastructureResources(agnosticDb, kafka, migrationService);
     }
     
     public static IDistributedApplicationBuilder CreateKafkaTopicsOnReady(
@@ -151,8 +161,17 @@ public static InfrastructureResources WithAzureNativeServices(this IDistributedA
             .AddPostgres("database")
             .WithLifetime(ContainerLifetime.Persistent)
             .AddDatabase("users");
+        
+        var migrationService = builder.AddProject<Projects.Stickerlandia_UserManagement_MigrationService>("migration-service")
+            .WithEnvironment("ConnectionStrings__database", azurePostgresDb)
+            .WithEnvironment("ConnectionStrings__messaging", serviceBus)
+            .WithEnvironment("DRIVING", builder.Configuration["DRIVING"])
+            .WithEnvironment("DRIVEN", builder.Configuration["DRIVEN"])
+            .WithHttpsEndpoint(51545)
+            .WaitFor(azurePostgresDb)
+            .WaitFor(serviceBus);
 
-        return new InfrastructureResources(azurePostgresDb, serviceBus);
+        return new InfrastructureResources(azurePostgresDb, serviceBus, migrationService);
     }
 
     public static IResourceBuilder<AzureServiceBusQueueResource> WithServiceBusTestCommands(
@@ -191,6 +210,7 @@ public static IDistributedApplicationBuilder WithBackgroundWorker(
             .WithEnvironment("ConnectionStrings__database", resources.DatabaseResource)
             .WithEnvironment("DRIVING", builder.Configuration["DRIVING"])
             .WithEnvironment("DRIVEN", builder.Configuration["DRIVEN"])
+            .WaitForCompletion(resources.MigrationServiceResource)
             .WaitFor(resources.MessagingResource)
             .WaitFor(resources.DatabaseResource);
 
@@ -210,6 +230,7 @@ public static IDistributedApplicationBuilder WithAzureFunctions(
             .WithEnvironment("ConnectionStrings__database", resources.DatabaseResource)
             .WithEnvironment("DRIVING", builder.Configuration["DRIVING"])
             .WithEnvironment("DRIVEN", builder.Configuration["DRIVEN"])
+            .WaitForCompletion(resources.MigrationServiceResource)
             .WaitFor(resources.MessagingResource)
             .WaitFor(resources.DatabaseResource)
             .WithExternalHttpEndpoints();
diff --git a/user-management/src/Stickerlandia.UserManagement.Aspire/InfrastructureResources.cs b/user-management/src/Stickerlandia.UserManagement.Aspire/InfrastructureResources.cs
@@ -6,4 +6,5 @@ namespace Stickerlandia.UserManagement.Aspire;
 
 public record InfrastructureResources(
     IResourceBuilder<IResourceWithConnectionString>? DatabaseResource,
-    IResourceBuilder<IResourceWithConnectionString>? MessagingResource);
+    IResourceBuilder<IResourceWithConnectionString>? MessagingResource,
+    IResourceBuilder<ProjectResource> MigrationServiceResource);
diff --git a/user-management/src/Stickerlandia.UserManagement.Aspire/Stickerlandia.UserManagement.Aspire.csproj b/user-management/src/Stickerlandia.UserManagement.Aspire/Stickerlandia.UserManagement.Aspire.csproj
@@ -25,6 +25,7 @@
     <ItemGroup>
       <ProjectReference Include="..\Stickerlandia.UserManagement.FunctionApp\Stickerlandia.UserManagement.FunctionApp.csproj" />
       <ProjectReference Include="..\Stickerlandia.UserManagement.Api\Stickerlandia.UserManagement.Api.csproj" />
+      <ProjectReference Include="..\Stickerlandia.UserManagement.MigrationService\Stickerlandia.UserManagement.MigrationService.csproj" />
       <ProjectReference Include="..\Stickerlandia.UserManagement.Worker\Stickerlandia.UserManagement.Worker.csproj" />
     </ItemGroup>
 
diff --git a/user-management/src/Stickerlandia.UserManagement.MigrationService/Dockerfile b/user-management/src/Stickerlandia.UserManagement.MigrationService/Dockerfile
@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+
+WORKDIR /App
+
+# Deps
+COPY src/Stickerlandia.UserManagement.MigrationService/Stickerlandia.UserManagement.MigrationService.csproj src/Stickerlandia.UserManagement.MigrationService/
+RUN dotnet restore src/Stickerlandia.UserManagement.MigrationService/Stickerlandia.UserManagement.MigrationService.csproj
+
+# Now copy the rest of the source code
+COPY . ./
+
+# Publish the application
+RUN dotnet publish src/Stickerlandia.UserManagement.MigrationService/Stickerlandia.UserManagement.MigrationService.csproj -o out -c Release -r linux-arm64
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled AS runtime
+WORKDIR /App
+COPY --from=build /App/out .
+EXPOSE 80
+ENTRYPOINT [ "dotnet", "Stickerlandia.UserManagement.MigrationService.dll" ]
diff --git a/user-management/src/Stickerlandia.UserManagement.MigrationService/Dockerfile-x86 b/user-management/src/Stickerlandia.UserManagement.MigrationService/Dockerfile-x86
@@ -0,0 +1,19 @@
+FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build
+
+WORKDIR /App
+
+# Deps
+COPY src/Stickerlandia.UserManagement.MigrationService/Stickerlandia.UserManagement.MigrationService.csproj src/Stickerlandia.UserManagement.MigrationService/
+RUN dotnet restore src/Stickerlandia.UserManagement.MigrationService/Stickerlandia.UserManagement.MigrationService.csproj
+
+# Now copy the rest of the source code
+COPY . ./
+
+# Publish the application
+RUN dotnet publish src/Stickerlandia.UserManagement.MigrationService/Stickerlandia.UserManagement.MigrationService.csproj -o out -c Release -r linux-x64
+
+FROM mcr.microsoft.com/dotnet/aspnet:8.0-noble-chiseled AS runtime
+WORKDIR /App
+COPY --from=build /App/out .
+EXPOSE 80
+ENTRYPOINT [ "dotnet", "Stickerlandia.UserManagement.MigrationService.dll" ]
diff --git a/user-management/src/Stickerlandia.UserManagement.MigrationService/Program.cs b/user-management/src/Stickerlandia.UserManagement.MigrationService/Program.cs
@@ -0,0 +1,9 @@
+using Stickerlandia.UserManagement.MigrationService;
+using Stickerlandia.UserManagement.ServiceDefaults;
+
+var builder = Host.CreateApplicationBuilder(args);
+builder.AddServiceDefaults();
+builder.Services.AddHostedService<Worker>();
+
+var host = builder.Build();
+host.Run();
diff --git a/user-management/src/Stickerlandia.UserManagement.MigrationService/Properties/launchSettings.json b/user-management/src/Stickerlandia.UserManagement.MigrationService/Properties/launchSettings.json
@@ -0,0 +1,12 @@
+﻿{
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "Stickerlandia.UserManagement.MigrationService": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "environmentVariables": {
+        "DOTNET_ENVIRONMENT": "Development"
+      }
+    }
+  }
+}
diff --git a/user-management/src/Stickerlandia.UserManagement.MigrationService/Stickerlandia.UserManagement.MigrationService.csproj b/user-management/src/Stickerlandia.UserManagement.MigrationService/Stickerlandia.UserManagement.MigrationService.csproj
@@ -0,0 +1,17 @@
+<Project Sdk="Microsoft.NET.Sdk.Worker">
+
+    <PropertyGroup>
+        <TargetFramework>net8.0</TargetFramework>
+        <Nullable>enable</Nullable>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <UserSecretsId>dotnet-Stickerlandia.UserManagement.MigrationService-30ec7008-31bc-4d0f-8b38-66e6b94fd269</UserSecretsId>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.1"/>
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Stickerlandia.UserManagement.ServiceDefaults\Stickerlandia.UserManagement.ServiceDefaults.csproj" />
+    </ItemGroup>
+</Project>
diff --git a/user-management/src/Stickerlandia.UserManagement.MigrationService/Worker.cs b/user-management/src/Stickerlandia.UserManagement.MigrationService/Worker.cs
diff --git a/user-management/src/Stickerlandia.UserManagement.MigrationService/appsettings.Development.json b/user-management/src/Stickerlandia.UserManagement.MigrationService/appsettings.Development.json
diff --git a/user-management/src/Stickerlandia.UserManagement.MigrationService/appsettings.json b/user-management/src/Stickerlandia.UserManagement.MigrationService/appsettings.json
diff --git a/user-management/src/Stickerlandia.UserManagement.Worker/Dockerfile b/user-management/src/Stickerlandia.UserManagement.Worker/Dockerfile
diff --git a/user-management/src/Stickerlandia.UserManagement.Worker/Dockerfile-x86 b/user-management/src/Stickerlandia.UserManagement.Worker/Dockerfile-x86
diff --git a/user-management/tests/Stickerlandia.UserManagement.IntegrationTest/Hooks/TestSetupFixture.cs b/user-management/tests/Stickerlandia.UserManagement.IntegrationTest/Hooks/TestSetupFixture.cs
