Add Aspire connection string support for PostgreSQL and RabbitMQ, update README

Co-authored-by: kamilbaczek <74410956+kamilbaczek@users.noreply.github.com>

Author: Copilot

Chapter-3-microservice-extraction/Fitnet.Contracts/Src/Fitnet.Contracts.Infrastructure/Database/DatabaseModule.cs

@@ -10,14 +10,24 @@ 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) =>
         {
-            var databaseOptions = serviceProvider.GetRequiredService<IOptions<DatabaseOptions>>();
-            options.UseNpgsql(databaseOptions.Value.ConnectionString);
+            // 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);
         });
         services.AddRepositories();
 

Chapter-3-microservice-extraction/Fitnet/Src/Offers/Fitnet.Offers.DataAccess/Database/DatabaseModule.cs

@@ -9,14 +9,24 @@ namespace EvolutionaryArchitecture.Fitnet.Offers.DataAccess.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>(_ => configuration.GetSection(DatabaseConfigurationSection));
         services.AddDbContext<OffersPersistence>((serviceProvider, options) =>
         {
-            var databaseOptions = serviceProvider.GetRequiredService<IOptions<DatabaseOptions>>();
-            options.UseNpgsql(databaseOptions.Value.ConnectionString);
+            // 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);
         });
 
         return services;

Chapter-3-microservice-extraction/Fitnet/Src/Passes/Fitnet.Passes.DataAccess/Database/DatabaseModule.cs

@@ -9,14 +9,24 @@ namespace EvolutionaryArchitecture.Fitnet.Passes.DataAccess.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>(_ => configuration.GetSection(DatabaseConfigurationSection));
         services.AddDbContext<PassesPersistence>((serviceProvider, options) =>
         {
-            var databaseOptions = serviceProvider.GetRequiredService<IOptions<DatabaseOptions>>();
-            options.UseNpgsql(databaseOptions.Value.ConnectionString);
+            // 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);
         });
 
         return services;

Chapter-3-microservice-extraction/Fitnet/Src/Reports/Fitnet.Reports/DataAccess/DatabaseConnectionFactory.cs

@@ -1,12 +1,20 @@
 namespace EvolutionaryArchitecture.Fitnet.Reports.DataAccess;
 
+using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Options;
 using System.Data;
 using Npgsql;
 
-internal sealed class DatabaseConnectionFactory(IOptions<DatabaseOptions> databaseOptions) : IDatabaseConnectionFactory
+internal sealed class DatabaseConnectionFactory : IDatabaseConnectionFactory
 {
+    private readonly string _connectionString;
     private NpgsqlConnection? _connection;
+    
+    public DatabaseConnectionFactory(IOptions<DatabaseOptions> databaseOptions, IConfiguration configuration)
+    {
+        // Try to get Aspire connection string first
+        _connectionString = configuration.GetConnectionString("fitnet") ?? databaseOptions.Value.ConnectionString ?? throw new InvalidOperationException("Database connection string is not configured");
+    }
 
     public IDbConnection Create()
     {
@@ -15,7 +23,7 @@ public IDbConnection Create()
             return _connection;
         }
 
-        _connection = new NpgsqlConnection(databaseOptions.Value.ConnectionString);
+        _connection = new NpgsqlConnection(_connectionString);
         _connection.Open();
 
         return _connection;

Chapter-3-microservice-extraction/README.adoc

@@ -160,6 +160,56 @@ The `Contracts` microservice runs on port `:8081`. Please navigate to http://loc
 
 That's it! You should now be able to run the application using either one of the above. :thumbsup:
 
+=== Run with .NET Aspire (Recommended)
+
+.NET Aspire provides a modern way to run and orchestrate distributed applications with built-in observability, service discovery, and resilience. This is the recommended approach for local development.
+
+==== Requirements
+- .NET SDK 9.0 or higher
+- Docker (for PostgreSQL and RabbitMQ containers)
+
+==== Steps to run
+
+1. Create you own personal access token in Github (it is needed to be able to download our GH Packages for `Common`). Instruction how to do it you can find https://www.educative.io/answers/how-to-create-a-personal-access-token-for-github-access[here]. Your PAT must have only one value of `read:packages`.
+
+2. Configure NuGet credentials as described in the "Building and debugging code in Rider IDE" section below.
+
+3. Navigate to the AppHost directory:
+[source,shell]
+----
+cd Fitnet.AppHost
+----
+
+4. Run the Aspire AppHost:
+[source,shell]
+----
+dotnet run
+----
+
+The Aspire Dashboard will automatically open in your browser, showing:
+
+- **Services**: All running services (Fitnet modular monolith and Contracts microservice)
+- **Resources**: PostgreSQL database and RabbitMQ message broker
+- **Traces**: Distributed tracing across all services
+- **Metrics**: Performance metrics for each service
+- **Logs**: Consolidated logs from all services
+
+The applications will be available at:
+
+- Fitnet modular monolith: http://localhost:8080 or http://localhost:8080/swagger/index.html
+- Contracts microservice: http://localhost:8081 or http://localhost:8081/swagger/index.html
+- Aspire Dashboard: The URL will be displayed in the console when you run the AppHost
+
+==== Benefits of using Aspire
+
+- **Automatic orchestration**: PostgreSQL and RabbitMQ are automatically started as Docker containers
+- **Service discovery**: Services can discover each other automatically
+- **Observability**: Built-in distributed tracing, metrics, and log aggregation
+- **Connection strings**: Automatically injected into services
+- **Health checks**: Monitor the health of all services and dependencies
+- **Resilience**: HTTP clients are configured with retry policies and circuit breakers
+
+
 === Building and debugging code in Rider IDE
 
 Before you build or debug code in `Rider` or `Visual Studio` IDE, you first have to provide your user name and previously generated PAT for artifactory to download packages for `Common` which is a part of this repository. When you load the solution, your IDE should request the credentials: