evolutionary-architecture · Copilot · Nov 20, 2025 · Nov 20, 2025 · Nov 20, 2025 · Dec 9, 2025
diff --git a/Chapter-2-modules-separation/README.adoc b/Chapter-2-modules-separation/README.adoc
@@ -138,25 +138,21 @@ to download it from the official Microsoft website.
 
 === Run locally
 
-The Fitnet application requires Docker to run properly.
+The Fitnet application uses .NET Aspire for local development.
 
-There are only 3 steps you need to start the application:
+To run the application locally, follow these steps:
 
-1. Make sure that you are in `/Src` directory. 
-2. Run `docker-compose build` to build the image of the application.
-3. Run `docker-compose up` to start the application. In the meantime it will also start Postgres inside container.
+1. **Ensure Docker is running** on your machine.
+2. **Navigate to the solution root directory** in your terminal.
+3. **Run the AppHost project using the following command:**
 
-The application runs on port `:8080`. Please navigate to http://localhost:8080 in your browser or http://localhost:8080/swagger/index.html to explore the API.
+=== How to run Integration Tests?
+To run the integration tests for the project located in the `Fitnet.IntegrationTests` project, you can use either the command:
 
-That's it! You should now be able to run the application using either one of the above. :thumbsup:
+`dotnet test`
+
+or the `IDE test explorer`. 
+
+These tests are written using `xUnit` and require `Docker` to be running as they use `test containers` package to run PostgresSQL in a Docker container during testing.
 
-=== How to run Integration Tests?
-To run the integration tests go to a module integration tests (`SelectedModule.IntegrationTests`) and run using either the command:
-[source,shell]
-----
-dotnet test
-----
-or the `IDE test Explorer`. 
-
-These tests are written using `xUnit` and require `Docker` to be running as they use `test containers` package to run PostgresSQL in a Docker container during testing. 
 Therefore, make sure to have `Docker` running before executing the integration tests.
diff --git a/...Contracts.Infrastructure/Database/Migrations/20230601184153_MakeSignedAtColumnNullable.cs b/...Contracts.Infrastructure/Database/Migrations/20230601184153_MakeSignedAtColumnNullable.cs
@@ -1,7 +1,7 @@
 #nullable disable
 
 namespace EvolutionaryArchitecture.Fitnet.Contracts.Data.Database.Migrations;
-using System;
+
 using Microsoft.EntityFrameworkCore.Migrations;
 
 [ExcludeFromCodeCoverage]

diff --git a/...Fitnet.Contracts.Infrastructure/Database/Migrations/20230601184328_AddCustomerIdColumn.cs b/...Fitnet.Contracts.Infrastructure/Database/Migrations/20230601184328_AddCustomerIdColumn.cs
@@ -1,7 +1,7 @@
 #nullable disable
 
 namespace EvolutionaryArchitecture.Fitnet.Contracts.Data.Database.Migrations;
-using System;
+
 using Microsoft.EntityFrameworkCore.Migrations;
 
 [ExcludeFromCodeCoverage]

diff --git a/...ture/Database/Migrations/20230624171216_ContractsAddColumnsToSupportContractExpiration.cs b/...ture/Database/Migrations/20230624171216_ContractsAddColumnsToSupportContractExpiration.cs
@@ -1,7 +1,7 @@
 #nullable disable
 
 namespace EvolutionaryArchitecture.Fitnet.Contracts.Data.Database.Migrations;
-using System;
+
 using Microsoft.EntityFrameworkCore.Migrations;
 
 [ExcludeFromCodeCoverage]

diff --git a/Chapter-2-modules-separation/Src/Directory.Packages.props b/Chapter-2-modules-separation/Src/Directory.Packages.props
@@ -3,10 +3,13 @@
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
   <ItemGroup Label="Production">
+    <PackageVersion Include="Aspire.Hosting.AppHost" Version="9.0.0" />
+    <PackageVersion Include="Aspire.Hosting.PostgreSQL" Version="9.0.0" />
     <PackageVersion Include="Dapper" Version="2.1.66" />
     <PackageVersion Include="FluentValidation" Version="12.0.0" />
     <PackageVersion Include="FluentValidation.DependencyInjectionExtensions" Version="12.0.0" />
     <PackageVersion Include="JetBrains.Annotations" Version="2025.2.2" />
+    <PackageVersion Include="KubernetesClient" Version="17.0.14" />
     <PackageVersion Include="MediatR" Version="12.5.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.3.0" />
     <PackageVersion Include="Microsoft.AspNetCore.OpenApi" Version="9.0.9" />

diff --git a/Chapter-2-modules-separation/Src/Dockerfile b/Chapter-2-modules-separation/Src/Dockerfile
diff --git a/Chapter-2-modules-separation/Src/Fitnet.AppHost/Fitnet.AppHost.csproj b/Chapter-2-modules-separation/Src/Fitnet.AppHost/Fitnet.AppHost.csproj
@@ -0,0 +1,23 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <Sdk Name="Aspire.AppHost.Sdk" Version="9.0.0"/>
+
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <Nullable>enable</Nullable>
+    <IsAspireHost>true</IsAspireHost>
+    <UserSecretsId>a3ef42d8-8e72-4dd1-a8a7-cd43e2c575e8</UserSecretsId>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Aspire.Hosting.AppHost" />
+    <PackageReference Include="Aspire.Hosting.PostgreSQL" />
+    <PackageReference Include="KubernetesClient" />
+    <PackageReference Update="SonarAnalyzer.CSharp" Version="10.15.0.120848" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Fitnet\Fitnet.csproj"/>
+  </ItemGroup>
+
+</Project>
diff --git a/Chapter-2-modules-separation/Src/Fitnet.AppHost/Program.cs b/Chapter-2-modules-separation/Src/Fitnet.AppHost/Program.cs
@@ -0,0 +1,17 @@
+using Projects;
+
+var builder = DistributedApplication.CreateBuilder(args);
+var postgres = builder.AddPostgres("postgres")
+    .WithImage("postgres", "14.3")
+    .WithPgAdmin();
+
+var fitnetDatabase = postgres.AddDatabase("fitnetsdb", "fitnet");
+builder.AddProject<Fitnet>("fitnet")
+    .WithEnvironment("ASPNETCORE_ENVIRONMENT", "Development")
+    .WithReference(fitnetDatabase, "Modules__Passes__ConnectionStrings__Primary")
+    .WithReference(fitnetDatabase, "Modules__Contracts__ConnectionStrings__Primary")
+    .WithReference(fitnetDatabase, "Modules__Reports__ConnectionStrings__Primary")
+    .WithReference(fitnetDatabase, "Modules__Offers__ConnectionStrings__Primary")
+    .WaitFor(postgres);
+
+await builder.Build().RunAsync();
diff --git a/Chapter-2-modules-separation/Src/Fitnet.AppHost/Properties/launchSettings.json b/Chapter-2-modules-separation/Src/Fitnet.AppHost/Properties/launchSettings.json
@@ -0,0 +1,17 @@
+{
+  "$schema": "https://json.schemastore.org/launchsettings.json",
+  "profiles": {
+    "https": {
+      "commandName": "Project",
+      "dotnetRunMessages": true,
+      "launchBrowser": true,
+      "applicationUrl": "https://localhost:17106;http://localhost:15108",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development",
+        "DOTNET_ENVIRONMENT": "Development",
+        "DOTNET_DASHBOARD_OTLP_ENDPOINT_URL": "https://localhost:21130",
+        "DOTNET_RESOURCE_SERVICE_ENDPOINT_URL": "https://localhost:22190"
+      }
+    }
+  }
+}
diff --git a/Chapter-2-modules-separation/Src/Fitnet.AppHost/appsettings.json b/Chapter-2-modules-separation/Src/Fitnet.AppHost/appsettings.json
@@ -0,0 +1,9 @@
+{
+  "Logging": {
+    "LogLevel": {
+      "Default": "Information",
+      "Microsoft.AspNetCore": "Warning",
+      "Aspire.Hosting.Dcp": "Warning"
+    }
+  }
+}
diff --git a/Chapter-2-modules-separation/Src/Fitnet.slnx b/Chapter-2-modules-separation/Src/Fitnet.slnx
@@ -42,5 +42,6 @@
   <Folder Name="/Reports/Tests/">
     <Project Path="Reports\Tests\Fitnet.Reports.IntegrationTests\Fitnet.Reports.IntegrationTests.csproj" Type="Classic C#" />
   </Folder>
+  <Project Path="Fitnet.AppHost/Fitnet.AppHost.csproj" />
   <Project Path="Fitnet\Fitnet.csproj" Type="Classic C#" />
 </Solution>
diff --git a/Chapter-2-modules-separation/Src/Fitnet/.dockerignore b/Chapter-2-modules-separation/Src/Fitnet/.dockerignore
diff --git a/...rc/Offers/Fitnet.Offers.DataAccess/Database/Migrations/20230503180337_CreateOfferTable.cs b/...rc/Offers/Fitnet.Offers.DataAccess/Database/Migrations/20230503180337_CreateOfferTable.cs
@@ -1,7 +1,7 @@
 #nullable disable
 
 namespace SuperSimpleArchitecture.Fitnet.Migrations.OffersPersistenceMigrations;
-using System;
+
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.Migrations;
 

diff --git a/...c/Passes/Fitnet.Passes.DataAccess/Database/Migrations/20230503180338_CreatePassesTable.cs b/...c/Passes/Fitnet.Passes.DataAccess/Database/Migrations/20230503180338_CreatePassesTable.cs
@@ -1,7 +1,7 @@
 #nullable disable
 
 namespace EvolutionaryArchitecture.Fitnet.Passes.DataAccess.Database;
-using System;
+
 using Microsoft.EntityFrameworkCore.Migrations;
 
 [ExcludeFromCodeCoverage]

diff --git a/Chapter-2-modules-separation/Src/docker-compose.yml b/Chapter-2-modules-separation/Src/docker-compose.yml