Merge pull request #3 from U2UTraining/ConvertToTUnit

Convert to TUnit

Author: PeterHimschoot

Directory.Packages.props

@@ -63,6 +63,7 @@
     <PackageVersion Include="coverlet.collector" Version="8.0.0" />
     <PackageVersion Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.3" />
     <PackageVersion Include="TUnit" Version="1.18.37" />
+    <PackageVersion Include="Imposter" Version="0.1.9" />
   </ItemGroup>
   <ItemGroup>
     <!-- Test Containers -->

ModularMonolith.slnx

@@ -26,11 +26,7 @@
     <Project Path="src/ModularMonolith.Smtp4Dev.Hosting/ModularMonolith.Smtp4Dev.Hosting.csproj" />
   </Folder>
   <Folder Name="/tests/">
-    <Project Path="tests/BoardGames.Tests/BoardGames.Tests.csproj" Id="83b35844-8523-45c5-a4f3-87b361732d87" />
-    <Project Path="tests/EFCore.Tests/EFCore.Tests.csproj" Id="6dce8182-cf90-478a-8960-e1bf3e2e4d08">
-      <Build Solution="Debug|*" Project="false" />
-    </Project>
+    <Project Path="tests/ModularMonolith.APIs.Tests/ModularMonolith.APIs.Tests.csproj" Id="ea3bb2c1-cd40-4502-a06b-821a9a702d3d" />
     <Project Path="tests/ModularMonolith.Architecture.Tests/ModularMonolith.Architecture.Tests.csproj" Id="e92113b3-4fe2-408f-b859-19c6988d9205" />
-    <Project Path="tests/Common.Specifications.Tests/Common.Specifications.Tests.csproj" Id="3cfbaf2c-2114-44d7-9268-b643856eefa4" />
   </Folder>
 </Solution>

src/ModularMonolith.APIs/BoundedContexts/BoardGames/EndPoints/ApplyMegaDiscount.cs

@@ -1,11 +1,15 @@
-namespace ModularMonolith.APIs.BoundedContexts.BoardGames.EndPoints;
+using Microsoft.EntityFrameworkCore.Storage;
+
+namespace ModularMonolith.APIs.BoundedContexts.BoardGames.EndPoints;
 
 [Register(
   lifetime: ServiceLifetime.Scoped
 , methodNameHint: "AddBoardGameServices")]
 public sealed class ApplyMegaDiscount(
   BoardGamesDb db
-, IIntegrationEventPublisher integrationEventPublisher)
+, [FromKeyedServices(nameof(BoardGamesDb))] IOutboxSignal outboxSignal
+//, IIntegrationEventPublisher integrationEventPublisher
+)
 {
   public async Task<Results<Ok, BadRequest>> ExecuteAsync(
     decimal factor
@@ -19,20 +23,41 @@ decimal factor
     //}
     //await SaveChangesAsync(cancellationToken);
 
-    // ✅ Use Set-based update (no materialization)
-    await db.BoardGames.ExecuteUpdateAsync(s =>
-      s.SetProperty(bg => bg.Price.Amount,
-                    bg => bg.Price.Amount * factor)
-    , cancellationToken
-    )
-    .ConfigureAwait(false);
-    // Now we need to update the entities that are in memory
-    // We can do this using an Integration Event
-    await integrationEventPublisher.PublishIntegrationEventAsync(
-      new GamesHaveChangedIntegrationEvent(
-        EventId: Guid.NewGuid()
-      ), cancellationToken
-    ).ConfigureAwait(false);
+    IExecutionStrategy strategy = db.Database.CreateExecutionStrategy();
+    
+    await strategy.ExecuteAsync(async () =>
+    {
+      using IDbContextTransaction tx = await db.Database
+        .BeginTransactionAsync(cancellationToken)
+        .ConfigureAwait(false);
+      
+      try
+      {
+        // ✅ Use Set-based update (no materialization)
+        await db.BoardGames.ExecuteUpdateAsync(s =>
+          s.SetProperty(bg => bg.Price.Amount,
+                        bg => bg.Price.Amount * factor)
+        , cancellationToken
+        )
+        .ConfigureAwait(false);
+        
+        // Now we need to update the entities that are in memory
+        // We can do this using an Integration Event
+        GamesHaveChangedIntegrationEvent @event =
+          new GamesHaveChangedIntegrationEvent(
+            EventId: Guid.NewGuid()
+          );
+        await db.SaveChangesAsync(@event, outboxSignal, cancellationToken)
+          .ConfigureAwait(false);
+
+        await tx.CommitAsync(cancellationToken);
+      }
+      catch
+      {
+        await tx.RollbackAsync(cancellationToken).ConfigureAwait(false);
+        throw; // Re-throw to allow the execution strategy to retry
+      }
+    });
 
     return TypedResults.Ok();
   }

src/ModularMonolith.BlazorApp/Components/BoardGames/GamesHaveChangedIntegrationEventHandler.cs

@@ -0,0 +1,22 @@
+using ModularMonolith.APIs.BoundedContexts.BoardGames.IntegrationEvents;
+using ModularMonolith.APIs.BoundedContexts.Common.IntegrationEvents;
+
+namespace ModularMonolith.BlazorApp.Components.BoardGames;
+
+public class GamesHaveChangedIntegrationEventHandler(
+  State _state
+, IToastService _toastService
+)
+: IIntegrationEventHandler<GamesHaveChangedIntegrationEvent>
+{
+  public async ValueTask HandleAsync(
+    GamesHaveChangedIntegrationEvent @event
+  , CancellationToken cancellationToken)
+  {
+    if (_state.CurrentPage is BoardGamesPage boardGamesPage)
+    {
+      _toastService.ShowInfo(title: $"Prices have been updated");
+    }
+    await ValueTask.CompletedTask;
+  }
+}

src/ModularMonolith.BlazorApp/Program.cs

@@ -41,7 +41,8 @@ private static async Task Main(string[] args)
     builder.Services.AddScoped<U2UBlazorIntegrationEventProcessor>();
     builder.Services.AddScoped<IIntegrationEventHandler<CurrencyHasChangedIntegrationEvent>, ClientCurrencyHasChangedIntegrationEventHandler>();
     builder.Services.AddSingleton<IntegrationEventsMetrics>();
-    builder.Services.AddScoped< IIntegrationEventHandler<BoardGameSelectedForShoppingBasketIntegrationEvent>, BoardGameSelectedForShoppingBasketIntegrationEventHandler>();
+    builder.Services.AddScoped<IIntegrationEventHandler<BoardGameSelectedForShoppingBasketIntegrationEvent>, BoardGameSelectedForShoppingBasketIntegrationEventHandler>();
+    builder.Services.AddScoped<IIntegrationEventHandler<GamesHaveChangedIntegrationEvent>, GamesHaveChangedIntegrationEventHandler>();
 
     // API Services -- DO NOT FORGET TRAILING SLASH! --
     builder.Services.AddHttpClient<CurrencyClient>(client =>