Merge pull request #136 from Vulthil/feature/retry-messaging-and-outbox

Commit for clean slate

Author: Vulthil

.github/copilot-instructions.md

@@ -0,0 +1,4 @@
+# Copilot Instructions
+
+## Project Guidelines
+- Use a lazy `Target` pattern from `CreateInstance<T>` when inheriting from `BaseUnitTestCase` (or `BaseUnitTestCase<T>` when accessibility allows) for test classes in this repository.

samples/WebApi/WebApi.Infrastructure/Data/WebApiDbContext.cs

@@ -63,8 +63,10 @@ public WebApiDbContext CreateDbContext(string[] args)
     {
         var optionsBuilder = new DbContextOptionsBuilder<WebApiDbContext>();
 
+#pragma warning disable S2068 // Credentials should not be hard-coded
         optionsBuilder.UseNpgsql("Host=localhost;Port=5432;Database=__dummy__;Username=__dummy__;Password=__dummy__;Pooling=false",
  o => o.ExecutionStrategy(d => new NonRetryingExecutionStrategy(d)));
+#pragma warning restore S2068 // Credentials should not be hard-coded
 
         return new WebApiDbContext(optionsBuilder.Options);
     }

samples/WebApi/WebApi.Infrastructure/DependencyInjection.cs

@@ -43,11 +43,16 @@ public static IHostApplicationBuilder AddRabbitMqMessagingInfrastructure(this IH
 
             x.AddQueue("MainEntityEvents", queue =>
             {
+                queue.UseRetry(r => r.SetIntervals(TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(5), TimeSpan.FromSeconds(5)));
+
+                queue.UseDeadLetterQueue();
+
                 queue.AddRequestConsumer<SideEffectRequestConsumer>();
 
                 queue.AddConsumer<MainEntityCreatedIntegrationEventConsumer>(c =>
                 {
                     c.Bind<MainEntityCreatedIntegrationEvent>("main-entity.created");
+                    c.UseRetry(r => r.Immediate(5));
                 });
                 queue.AddConsumer<MainEntityCreatedIntegrationEventConsumer>(c =>
                 {

samples/WebApi/WebApi.Infrastructure/Migrations/20260225221048_AddOutboxRetryCount.Designer.cs

@@ -0,0 +1,29 @@
+using Microsoft.EntityFrameworkCore.Migrations;
+
+#nullable disable
+
+namespace WebApi.Infrastructure.Migrations
+{
+    /// <inheritdoc />
+    public partial class AddOutboxRetryCount : Migration
+    {
+        /// <inheritdoc />
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<int>(
+                name: "RetryCount",
+                table: "OutboxMessages",
+                type: "integer",
+                nullable: false,
+                defaultValue: 0);
+        }
+
+        /// <inheritdoc />
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "RetryCount",
+                table: "OutboxMessages");
+        }
+    }
+}

samples/WebApi/WebApi.Infrastructure/Migrations/20260225221048_AddOutboxRetryCount.cs

@@ -17,7 +17,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
         {
 #pragma warning disable 612, 618
             modelBuilder
-                .HasAnnotation("ProductVersion", "9.0.5")
+                .HasAnnotation("ProductVersion", "10.0.3")
                 .HasAnnotation("Relational:MaxIdentifierLength", 63);
 
             NpgsqlModelBuilderExtensions.UseIdentityByDefaultColumns(modelBuilder);
@@ -44,6 +44,9 @@ protected override void BuildModel(ModelBuilder modelBuilder)
                     b.Property<DateTimeOffset?>("ProcessedOnUtc")
                         .HasColumnType("timestamp with time zone");
 
+                    b.Property<int>("RetryCount")
+                        .HasColumnType("integer");
+
                     b.Property<string>("Type")
                         .IsRequired()
                         .HasColumnType("text");

samples/WebApi/WebApi.Infrastructure/Migrations/WebApiDbContextModelSnapshot.cs

@@ -20,17 +20,16 @@ internal sealed class PostgreSqlTestContainer(IMessageSink messageSink) : TestDa
     public override DbProviderFactory DbProviderFactory => NpgsqlFactory.Instance;
     public override string ConnectionStringKey => ServiceNames.PostgresSqlServerServiceName;
 }
-   
+
 
 public sealed class RabbitMqTestContainer(IMessageSink messageSink) : TestContainerFixtureWithConnectionString<RabbitMqBuilder, RabbitMqContainer>(messageSink)
 {
-    private readonly RabbitMqBuilder _builder = new RabbitMqBuilder("rabbitmq:4.2.2-management")
+    private readonly RabbitMqBuilder _builder = new RabbitMqBuilder("rabbitmq:4-management")
         .WithUsername("guest")
         .WithPassword("guest");
 
     protected override RabbitMqBuilder Configure() => _builder;
 
     public override string ConnectionStringKey => ServiceNames.RabbitMqServiceName;
     public override string ConnectionString => Container.GetConnectionString();
-
 }

samples/WebApi/WebApi.Tests/Fixtures/PostgreSqlTestContainer.cs

@@ -72,7 +72,7 @@ public async Task Test_Update()
             var outboxMessage = await dbContext.OutboxMessages.Where(o =>
                     EF.Functions.JsonContains(o.Content, json) &&
                     o.ProcessedOnUtc.HasValue &&
-                    o.Type == typeof(MainEntityNameUpdatedEvent).AssemblyQualifiedName)
+                    o.Type == typeof(MainEntityNameUpdatedEvent).FullName)
                 .FirstOrDefaultAsync();
 
             if (outboxMessage is null)
@@ -81,7 +81,7 @@ public async Task Test_Update()
             }
 
             return Result.Success(outboxMessage);
-        });
+        }, cancellationToken: CancellationToken);
 
         outboxMessageResult.IsSuccess.ShouldBeTrue();
     }

samples/WebApi/WebApi.Tests/MainEntityIntegrationTests.cs

@@ -38,7 +38,7 @@ public async Task TestCreate()
             }
 
             return queryResult;
-        });
+        }, cancellationToken: CancellationToken);
 
         // Assert
         result.IsSuccess.ShouldBeTrue();

samples/WebApi/WebApi.Tests/SideEffectIntegrationTests.cs

@@ -10,14 +10,15 @@ public static class Polling
     public static async Task<Result<T>> WaitAsync<T>(
         TimeSpan timeout,
         Func<Task<Result<T>>> func,
-        TimeSpan? timerTick = null)
+        TimeSpan? timerTick = null,
+        CancellationToken cancellationToken = default)
     {
         timerTick ??= TimeSpan.FromSeconds(1);
         using var timer = new PeriodicTimer(timerTick.Value);
 
         DateTime endTimeUtc = DateTime.UtcNow.Add(timeout);
         while (DateTime.UtcNow < endTimeUtc &&
-               await timer.WaitForNextTickAsync())
+               await timer.WaitForNextTickAsync(cancellationToken))
         {
             Result<T> result = await func();
 
@@ -29,4 +30,28 @@ await timer.WaitForNextTickAsync())
 
         return Result.Failure<T>(Timeout);
     }
+
+    public static async Task<Result> WaitAsync(
+        TimeSpan timeout,
+        Func<Task<Result>> func,
+        TimeSpan? timerTick = null,
+        CancellationToken cancellationToken = default)
+    {
+        timerTick ??= TimeSpan.FromSeconds(1);
+        using var timer = new PeriodicTimer(timerTick.Value);
+
+        DateTime endTimeUtc = DateTime.UtcNow.Add(timeout);
+        while (DateTime.UtcNow < endTimeUtc &&
+               await timer.WaitForNextTickAsync(cancellationToken))
+        {
+            Result result = await func();
+
+            if (result.IsSuccess)
+            {
+                return result;
+            }
+        }
+
+        return Result.Failure(Timeout);
+    }
 }