Simplify Aspire implementation to match Chapter 2 pattern, remove ServiceDefaults

Co-authored-by: kamilbaczek <[email protected]>

Author: Copilot

Chapter-3-microservice-extraction/Docs/ASPIRE_IMPLEMENTATION.md

@@ -17,7 +17,6 @@
   <ItemGroup>
     <ProjectReference Include="..\Fitnet.Contracts\Src\Fitnet.Contracts\Fitnet.Contracts.csproj" />
     <ProjectReference Include="..\Fitnet\Src\Fitnet\Fitnet.csproj" />
-    <ProjectReference Include="..\Fitnet.ServiceDefaults\Fitnet.ServiceDefaults.csproj" />
   </ItemGroup>
 
 </Project>

Chapter-3-microservice-extraction/Fitnet.AppHost/Fitnet.AppHost.csproj

@@ -1,33 +1,28 @@
+using Projects;
+
 var builder = DistributedApplication.CreateBuilder(args);
 
-// Add PostgreSQL database
 var postgres = builder.AddPostgres("postgres")
-    .WithImage("postgres")
-    .WithImageTag("14.3")
-    .WithEnvironment("POSTGRES_PASSWORD", "mysecretpassword")
-    .WithHealthCheck();
+    .WithImage("postgres", "14.3")
+    .WithPgAdmin();
 
-var fitnetDb = postgres.AddDatabase("fitnet");
+var fitnetDatabase = postgres.AddDatabase("fitnetsdb", "fitnet");
 
-// Add RabbitMQ message broker
 var rabbitmq = builder.AddRabbitMQ("rabbitmq")
-    .WithImage("rabbitmq")
-    .WithImageTag("management")
-    .WithManagementPlugin()
-    .WithHealthCheck();
+    .WithManagementPlugin();
 
-// Add Fitnet Contracts Microservice
-var contractsApi = builder.AddProject<Projects.Fitnet_Contracts>("fitnet-contracts-microservice")
-    .WithReference(fitnetDb)
-    .WithReference(rabbitmq)
-    .WithHttpEndpoint(port: 8081, targetPort: 80, name: "http")
-    .WithEnvironment("ASPNETCORE_ENVIRONMENT", "Development");
+builder.AddProject<Fitnet>("fitnet-modular-monolith")
+    .WithEnvironment("ASPNETCORE_ENVIRONMENT", "Development")
+    .WithReference(fitnetDatabase, "Database__ConnectionString")
+    .WithReference(rabbitmq, "EventBus__ConnectionString")
+    .WaitFor(postgres)
+    .WaitFor(rabbitmq);
 
-// Add Fitnet Modular Monolith
-var fitnetApi = builder.AddProject<Projects.Fitnet>("fitnet-modular-monolith")
-    .WithReference(fitnetDb)
-    .WithReference(rabbitmq)
-    .WithHttpEndpoint(port: 8080, targetPort: 80, name: "http")
-    .WithEnvironment("ASPNETCORE_ENVIRONMENT", "Development");
+builder.AddProject<Fitnet_Contracts>("fitnet-contracts-microservice")
+    .WithEnvironment("ASPNETCORE_ENVIRONMENT", "Development")
+    .WithReference(fitnetDatabase, "Database__ConnectionString")
+    .WithReference(rabbitmq, "EventBus__ConnectionString")
+    .WaitFor(postgres)
+    .WaitFor(rabbitmq);
 
-builder.Build().Run();
+await builder.Build().RunAsync();

Chapter-3-microservice-extraction/Fitnet.AppHost/Program.cs

@@ -10,24 +10,14 @@ namespace EvolutionaryArchitecture.Fitnet.Contracts.Infrastructure.Database;
 internal static class DatabaseModule
 {
     private const string DatabaseConfigurationSection = "Database";
-    private const string PostgresConnectionName = "fitnet";
 
     internal static IServiceCollection AddDatabase(this IServiceCollection services, IConfiguration configuration)
     {
         services.Configure<DatabaseOptions>(options => configuration.GetSection(DatabaseConfigurationSection).Bind(options));
         services.AddDbContext<ContractsPersistence>((serviceProvider, options) =>
         {
-            // Try to get Aspire connection string first
-            var connectionString = configuration.GetConnectionString(PostgresConnectionName);
-            
-            if (string.IsNullOrEmpty(connectionString))
-            {
-                // Fallback to legacy configuration
-                var databaseOptions = serviceProvider.GetRequiredService<IOptions<DatabaseOptions>>();
-                connectionString = databaseOptions.Value.ConnectionString;
-            }
-            
-            options.UseNpgsql(connectionString);
+            var databaseOptions = serviceProvider.GetRequiredService<IOptions<DatabaseOptions>>();
+            options.UseNpgsql(databaseOptions.Value.ConnectionString);
         });
         services.AddRepositories();