diff --git a/.github/workflows/coverage.yml b/.github/workflows/coverage.yml index a6d074a..3317d70 100644 --- a/.github/workflows/coverage.yml +++ b/.github/workflows/coverage.yml @@ -56,7 +56,7 @@ jobs: - name: Post Coverage Comment if: github.event_name == 'pull_request' - uses: marocchino/sticky-pull-request-comment@v2 + uses: marocchino/sticky-pull-request-comment@v3 with: path: coverage_report/SummaryGithub.md diff --git a/src/DannyGoodacre.Cqrs.Testing/DannyGoodacre.Cqrs.Testing.csproj b/src/DannyGoodacre.Cqrs.Testing/DannyGoodacre.Cqrs.Testing.csproj index daf99ae..f5f52c2 100644 --- a/src/DannyGoodacre.Cqrs.Testing/DannyGoodacre.Cqrs.Testing.csproj +++ b/src/DannyGoodacre.Cqrs.Testing/DannyGoodacre.Cqrs.Testing.csproj @@ -3,7 +3,7 @@ net10.0 DannyGoodacre.Cqrs.Testing - 0.6.0 + 0.7.0 Danny Goodacre Testing abstractions and base classes for verifying implementations of DannyGoodacre.Cqrs. https://github.com/dannygoodacre/DannyGoodacre.Core diff --git a/src/DannyGoodacre.Cqrs/CommandHandlerBase.cs b/src/DannyGoodacre.Cqrs/CommandHandlerBase.cs index 099aa2f..294b568 100644 --- a/src/DannyGoodacre.Cqrs/CommandHandlerBase.cs +++ b/src/DannyGoodacre.Cqrs/CommandHandlerBase.cs @@ -45,7 +45,7 @@ protected virtual void Validate(ValidationState validationState, TCommand comman /// The command to validate and process. /// A to observe while performing the operation. /// A indicating the outcome of the operation. - public async virtual Task ExecuteAsync(TCommand command, CancellationToken cancellationToken = default) + protected async virtual Task ExecuteAsync(TCommand command, CancellationToken cancellationToken = default) { var validationState = new ValidationState(); diff --git a/src/DannyGoodacre.Cqrs/DannyGoodacre.Cqrs.csproj b/src/DannyGoodacre.Cqrs/DannyGoodacre.Cqrs.csproj index 6a39e5b..57a2a63 100644 --- a/src/DannyGoodacre.Cqrs/DannyGoodacre.Cqrs.csproj +++ b/src/DannyGoodacre.Cqrs/DannyGoodacre.Cqrs.csproj @@ -3,7 +3,7 @@ net10.0 DannyGoodacre.Cqrs - 0.6.0 + 0.7.0 Danny Goodacre A lightweight CQRS and clean architecture foundation library including state and transaction control. https://github.com/dannygoodacre/DannyGoodacre.Core diff --git a/src/DannyGoodacre.Cqrs/QueryHandler.cs b/src/DannyGoodacre.Cqrs/QueryHandler.cs index f6bb4d3..acd0124 100644 --- a/src/DannyGoodacre.Cqrs/QueryHandler.cs +++ b/src/DannyGoodacre.Cqrs/QueryHandler.cs @@ -38,7 +38,7 @@ protected virtual void Validate(ValidationState validationState, TQuery queryReq /// The query to validate and process. /// A to observe while performing the operation. /// A indicating the outcome of the operation. - public async Task> ExecuteAsync(TQuery query, CancellationToken cancellationToken = default) + protected async Task> ExecuteAsync(TQuery query, CancellationToken cancellationToken = default) { var validationState = new ValidationState(); diff --git a/src/DannyGoodacre.Cqrs/StateCommandHandlerBase.cs b/src/DannyGoodacre.Cqrs/StateCommandHandlerBase.cs index 80da3fb..85d278b 100644 --- a/src/DannyGoodacre.Cqrs/StateCommandHandlerBase.cs +++ b/src/DannyGoodacre.Cqrs/StateCommandHandlerBase.cs @@ -15,7 +15,7 @@ internal StateCommandHandlerBase(ILogger logger, IStateUnit stateUnit) : base(lo private IStateUnit StateUnit { get; } - public async override Task ExecuteAsync(TCommand command, CancellationToken cancellationToken = default) + protected async override Task ExecuteAsync(TCommand command, CancellationToken cancellationToken = default) { try { diff --git a/src/DannyGoodacre.Cqrs/TransactionCommandHandlerBase.cs b/src/DannyGoodacre.Cqrs/TransactionCommandHandlerBase.cs index b464bf0..b875e75 100644 --- a/src/DannyGoodacre.Cqrs/TransactionCommandHandlerBase.cs +++ b/src/DannyGoodacre.Cqrs/TransactionCommandHandlerBase.cs @@ -34,7 +34,7 @@ internal TransactionCommandHandlerBase(ILogger logger, ITransactionUnit transact /// protected virtual int ExpectedChanges { get; set; } = -1; - public async override Task ExecuteAsync(TCommand command, CancellationToken cancellationToken = default) + protected async override Task ExecuteAsync(TCommand command, CancellationToken cancellationToken = default) { await using ITransaction transaction = await TransactionUnit.BeginTransactionAsync(cancellationToken); diff --git a/src/DannyGoodacre.Primitives/DannyGoodacre.Primitives.csproj b/src/DannyGoodacre.Primitives/DannyGoodacre.Primitives.csproj index 4c0ac93..194e81b 100644 --- a/src/DannyGoodacre.Primitives/DannyGoodacre.Primitives.csproj +++ b/src/DannyGoodacre.Primitives/DannyGoodacre.Primitives.csproj @@ -3,7 +3,7 @@ net10.0 DannyGoodacre.Primitives - 0.6.0 + 0.7.0 Danny Goodacre A lightweight primitives library providing Result types and a structured validation state for method responses. https://github.com/dannygoodacre/DannyGoodacre.Core diff --git a/src/DannyGoodacre.Testing/DannyGoodacre.Testing.csproj b/src/DannyGoodacre.Testing/DannyGoodacre.Testing.csproj index d70955c..5997e10 100644 --- a/src/DannyGoodacre.Testing/DannyGoodacre.Testing.csproj +++ b/src/DannyGoodacre.Testing/DannyGoodacre.Testing.csproj @@ -3,7 +3,7 @@ net10.0 DannyGoodacre.Testing - 0.6.0 + 0.7.0 Danny Goodacre A lightweight testing foundation library. https://github.com/dannygoodacre/DannyGoodacre.Core diff --git a/tests/DannyGoodacre.Cqrs.Tests/CommandHandlerTests.cs b/tests/DannyGoodacre.Cqrs.Tests/CommandHandlerTests.cs index 0543236..ebff622 100644 --- a/tests/DannyGoodacre.Cqrs.Tests/CommandHandlerTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/CommandHandlerTests.cs @@ -19,6 +19,9 @@ protected override void Validate(ValidationState validationState, TestCommand co protected override Task InternalExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) => _testInternalExecuteAsync(command, cancellationToken); + + public Task TestExecuteAsync(TestCommand command, CancellationToken cancellationToken) + => ExecuteAsync(command, cancellationToken); } private const string TestName = "Test Command Handler"; @@ -31,7 +34,7 @@ protected override Task InternalExecuteAsync(TestCommand command, Cancel protected override string CommandName => TestName; - protected override Task Act() => CommandHandler.ExecuteAsync(_testCommand, TestCancellationToken); + protected override Task Act() => CommandHandler.TestExecuteAsync(_testCommand, TestCancellationToken); [SetUp] public void SetUp() diff --git a/tests/DannyGoodacre.Cqrs.Tests/QueryHandlerTests.cs b/tests/DannyGoodacre.Cqrs.Tests/QueryHandlerTests.cs index 7d24a62..d60a1c5 100644 --- a/tests/DannyGoodacre.Cqrs.Tests/QueryHandlerTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/QueryHandlerTests.cs @@ -17,8 +17,11 @@ public sealed class TestQueryHandler(ILogger logger) : QueryHandler _testValidate(validationState, query); - protected override Task> InternalExecuteAsync(TestQuery query, CancellationToken cancellationToken) + protected override Task> InternalExecuteAsync(TestQuery query, CancellationToken cancellationToken = default) => _testInternalExecuteAsync(query, cancellationToken); + + public Task> TestExecuteAsync(TestQuery query, CancellationToken cancellationToken = default) + => ExecuteAsync(query, cancellationToken); } private const string TestName = "Test Query Handler"; @@ -33,7 +36,7 @@ protected override Task> InternalExecuteAsync(TestQuery query, Cance protected override string QueryName => TestName; - protected override Task> Act() => QueryHandler.ExecuteAsync(_testQuery, CancellationToken); + protected override Task> Act() => QueryHandler.TestExecuteAsync(_testQuery, CancellationToken); [SetUp] public void SetUp() diff --git a/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerTests.cs b/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerTests.cs index fe567ef..917544f 100644 --- a/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerTests.cs @@ -20,6 +20,9 @@ protected override void Validate(ValidationState validationState, TestCommand co protected override Task InternalExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) => _testInternalExecuteAsync(command, cancellationToken); + + public Task TestExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) + => ExecuteAsync(command, cancellationToken); } private const string TestName = "Test State Command Handler"; @@ -32,7 +35,7 @@ protected override Task InternalExecuteAsync(TestCommand command, Cancel protected override string CommandName => TestName; - protected override Task Act() => CommandHandler.ExecuteAsync(_testCommand, TestCancellationToken); + protected override Task Act() => CommandHandler.TestExecuteAsync(_testCommand, TestCancellationToken); [SetUp] public void SetUp() diff --git a/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerWithReturnValueTests.cs b/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerWithReturnValueTests.cs index ec94bfd..8bc33c2 100644 --- a/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerWithReturnValueTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/StateCommandHandlerWithReturnValueTests.cs @@ -20,6 +20,9 @@ protected override void Validate(ValidationState validationState, TestCommand co protected override Task> InternalExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) => _testInternalExecuteAsync(command, cancellationToken); + + public Task> TestExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) + => ExecuteAsync(command, cancellationToken); } private const string TestName = "Test State Command Handler"; @@ -34,7 +37,7 @@ protected override Task> InternalExecuteAsync(TestCommand command, C protected override string CommandName => TestName; - protected override Task> Act() => CommandHandler.ExecuteAsync(_testCommand, TestCancellationToken); + protected override Task> Act() => CommandHandler.TestExecuteAsync(_testCommand, TestCancellationToken); [SetUp] public void SetUp() diff --git a/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerTests.cs b/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerTests.cs index 54f93b0..7fe9b57 100644 --- a/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerTests.cs @@ -20,6 +20,9 @@ public sealed class TestTransactionCommandHandler(ILogger logger, ITransactionUn protected override Task InternalExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) => _internalExecuteAsync(command, cancellationToken); + + public Task TestExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) + => ExecuteAsync(command, cancellationToken); } private const string TestName = "Test Transaction Command Handler"; @@ -34,7 +37,7 @@ protected override Task InternalExecuteAsync(TestCommand command, Cancel protected override string CommandName => TestName; - protected override Task Act() => CommandHandler.ExecuteAsync(_testCommand, TestCancellationToken); + protected override Task Act() => CommandHandler.TestExecuteAsync(_testCommand, TestCancellationToken); protected override int TestActualChanges => _testActualChanges; diff --git a/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerWithReturnValueTests.cs b/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerWithReturnValueTests.cs index c296322..6f18129 100644 --- a/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerWithReturnValueTests.cs +++ b/tests/DannyGoodacre.Cqrs.Tests/TransactionCommandHandlerWithReturnValueTests.cs @@ -20,6 +20,9 @@ public sealed class TestTransactionCommandHandler(ILogger logger, ITransactionUn protected override Task> InternalExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) => _internalExecuteAsync(command, cancellationToken); + + public Task> TestExecuteAsync(TestCommand command, CancellationToken cancellationToken = default) + => ExecuteAsync(command, cancellationToken); } private const string TestName = "Test Transaction Command Handler"; @@ -36,7 +39,7 @@ protected override Task> InternalExecuteAsync(TestCommand command, C protected override string CommandName => TestName; - protected override Task> Act() => CommandHandler.ExecuteAsync(_testCommand, TestCancellationToken); + protected override Task> Act() => CommandHandler.TestExecuteAsync(_testCommand, TestCancellationToken); protected override int TestActualChanges => _testActualChanges;