Skip to content

Refactor event access and enhance resilience in handlers #736

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 25, 2025
Merged

Refactor event access and enhance resilience in handlers #736

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions ...ctionProcessor.BusinessLogic.Tests/DomainEventHandlers/DomainEventHandlerResolverTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public void DomainEventHandlerResolver_GetDomainEventHandlers_TransactionHasBeen
String handlerTypeName = "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler, TransactionProcessor.BusinessLogic";
Dictionary<String, String[]> eventHandlerConfiguration = new Dictionary<String, String[]>();

TransactionDomainEvents.TransactionHasBeenCompletedEvent transactionHasBeenCompletedEvent = TestData.TransactionHasBeenCompletedEvent;
TransactionDomainEvents.TransactionHasBeenCompletedEvent transactionHasBeenCompletedEvent = TestData.DomainEvents.TransactionHasBeenCompletedEvent;

eventHandlerConfiguration.Add(transactionHasBeenCompletedEvent.GetType().Name, new String[] { handlerTypeName });

Expand All @@ -67,7 +67,7 @@ public void DomainEventHandlerResolver_GetDomainEventHandlers_TransactionHasBeen
String handlerTypeName = "TransactionProcessor.BusinessLogic.EventHandling.TransactionDomainEventHandler, TransactionProcessor.BusinessLogic";
Dictionary<String, String[]> eventHandlerConfiguration = new Dictionary<String, String[]>();

TransactionDomainEvents.TransactionHasBeenCompletedEvent transactionHasBeenCompletedEvent = TestData.TransactionHasBeenCompletedEvent;
TransactionDomainEvents.TransactionHasBeenCompletedEvent transactionHasBeenCompletedEvent = TestData.DomainEvents.TransactionHasBeenCompletedEvent;

eventHandlerConfiguration.Add("RandomEvent", new String[] { handlerTypeName });
Mock<IDomainEventHandler> domainEventHandler = new Mock<IDomainEventHandler>();
Expand All @@ -85,7 +85,7 @@ public void DomainEventHandlerResolver_GetDomainEventHandlers_TransactionHasBeen
{
Dictionary<String, String[]> eventHandlerConfiguration = new Dictionary<String, String[]>();

TransactionDomainEvents.TransactionHasBeenCompletedEvent transactionHasBeenCompletedEvent = TestData.TransactionHasBeenCompletedEvent;
TransactionDomainEvents.TransactionHasBeenCompletedEvent transactionHasBeenCompletedEvent = TestData.DomainEvents.TransactionHasBeenCompletedEvent;
Mock<IDomainEventHandler> domainEventHandler = new Mock<IDomainEventHandler>();

Func<Type, IDomainEventHandler> createDomainEventHandlerFunc = (type) => { return domainEventHandler.Object; };
Expand Down
2 changes: 1 addition & 1 deletion ...ctionProcessor.BusinessLogic.Tests/DomainEventHandlers/MerchantDomainEventHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ public void MerchantDomainEventHandler_SettlementGeneratedEvent_EventIsHandled()
[Fact]
public void MerchantDomainEventHandler_TransactionHasBeenCompletedEvent_EventIsHandled()
{
TransactionDomainEvents.TransactionHasBeenCompletedEvent domainEvent = TestData.TransactionHasBeenCompletedEvent;
TransactionDomainEvents.TransactionHasBeenCompletedEvent domainEvent = TestData.DomainEvents.TransactionHasBeenCompletedEvent;

Should.NotThrow(async () => { await this.DomainEventHandler.Handle(domainEvent, CancellationToken.None); });
}
Expand Down
10 changes: 4 additions & 6 deletions ...ssor.BusinessLogic.Tests/DomainEventHandlers/MerchantSettlementDomainEventHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,24 +35,22 @@ public MerchantSettlementDomainEventHandlerTests()
[Fact]
public async Task MerchantSettlementDomainEventHandler_Handle_MerchantFeeSettledEvent_EventIsHandled()
{
MerchantFeeSettledEvent domainEvent = TestData.DomainEvents.MerchantFeeSettledEvent;
this.Mediator.Setup(m => m.Send(It.IsAny<MerchantStatementCommands.AddSettledFeeToMerchantStatementCommand>(), It.IsAny<CancellationToken>()))
this.Mediator.Setup(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success());

Result result = await this.EventHandler.Handle(domainEvent, CancellationToken.None);
Result result = await this.EventHandler.Handle(TestData.DomainEvents.MerchantFeeSettledEvent, CancellationToken.None);
result.IsSuccess.ShouldBeTrue();
}

[Fact]
public async Task MerchantSettlementDomainEventHandler_Handle_MerchantFeeSettledEvent_Retry_EventIsHandled()
{
MerchantFeeSettledEvent domainEvent = TestData.DomainEvents.MerchantFeeSettledEvent;
this.Mediator.SetupSequence(m => m.Send(It.IsAny<MerchantStatementCommands.AddSettledFeeToMerchantStatementCommand>(), It.IsAny<CancellationToken>()))
this.Mediator.SetupSequence(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>()))
.ThrowsAsync(new WrongExpectedVersionException("Stream1", StreamRevision.None, StreamRevision.None))
.ThrowsAsync(new RpcException(new Status(StatusCode.DeadlineExceeded, "Deadline Exceeded")))
.ReturnsAsync(Result.Success());

Result result = await this.EventHandler.Handle(domainEvent, CancellationToken.None);
Result result = await this.EventHandler.Handle(TestData.DomainEvents.MerchantFeeSettledEvent, CancellationToken.None);
result.IsSuccess.ShouldBeTrue();
}
}
Expand Down
52 changes: 38 additions & 14 deletions ...essor.BusinessLogic.Tests/DomainEventHandlers/MerchantStatementDomainEventHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
using System.Threading;
using System.Threading.Tasks;
using EventStore.Client;
using Grpc.Core;
using MediatR;
using Moq;
using Shared.Logger;
Expand All @@ -15,33 +17,55 @@
{
private Mock<IMediator> Mediator;

private MerchantStatementDomainEventHandler DomainEventHandler;
private MerchantStatementDomainEventHandler EventHandler;

Check warning on line 20 in TransactionProcessor.BusinessLogic.Tests/DomainEventHandlers/MerchantStatementDomainEventHandlerTests.cs

View check run for this annotation

Codacy Production / Codacy Static Code Analysis

TransactionProcessor.BusinessLogic.Tests/DomainEventHandlers/MerchantStatementDomainEventHandlerTests.cs#L20 

Make 'EventHandler' 'readonly'.
public MerchantStatementDomainEventHandlerTests()
{
Logger.Initialise(NullLogger.Instance);
this.Mediator = new Mock<IMediator>();
this.DomainEventHandler = new MerchantStatementDomainEventHandler(this.Mediator.Object);
this.EventHandler = new MerchantStatementDomainEventHandler(this.Mediator.Object);
}

[Fact]
public async Task MerchantStatementDomainEventHandler_Handle_StatementGeneratedEvent_EventIsHandled()
{
this.Mediator.Setup(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success());
Should.NotThrow(async () =>
{
await this.DomainEventHandler.Handle(TestData.DomainEvents.StatementGeneratedEvent, CancellationToken.None);
});
this.Mediator.Verify(m=> m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>()), Times.Once);
this.Mediator.Setup(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success());

Result result = await this.EventHandler.Handle(TestData.DomainEvents.StatementGeneratedEvent, CancellationToken.None);
result.IsSuccess.ShouldBeTrue();
}

[Fact]
public async Task MerchantStatementDomainEventHandler_Handle_StatementGeneratedEvent_Retry_EventIsHandled()
{
this.Mediator.SetupSequence(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>()))
.ThrowsAsync(new WrongExpectedVersionException("Stream1", StreamRevision.None, StreamRevision.None))
.ThrowsAsync(new RpcException(new Status(StatusCode.DeadlineExceeded, "Deadline Exceeded")))
.ReturnsAsync(Result.Success());

Result result = await this.EventHandler.Handle(TestData.DomainEvents.StatementGeneratedEvent, CancellationToken.None);
result.IsSuccess.ShouldBeTrue();
}

[Fact]
public async Task MerchantStatementDomainEventHandler_Handle_TransactionHasBeenCompletedEvent_EventIsHandled()
{
this.Mediator.Setup(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success());
Should.NotThrow(async () =>
{
await this.DomainEventHandler.Handle(TestData.TransactionHasBeenCompletedEvent, CancellationToken.None);
});
this.Mediator.Verify(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>()), Times.Once);
this.Mediator.Setup(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(Result.Success());

Result result = await this.EventHandler.Handle(TestData.DomainEvents.TransactionHasBeenCompletedEvent, CancellationToken.None);
result.IsSuccess.ShouldBeTrue();
}

[Fact]
public async Task MerchantStatementDomainEventHandler_Handle_TransactionHasBeenCompletedEvent_Retry_EventIsHandled()
{
this.Mediator.SetupSequence(m => m.Send(It.IsAny<IRequest<Result>>(), It.IsAny<CancellationToken>()))
.ThrowsAsync(new WrongExpectedVersionException("Stream1", StreamRevision.None, StreamRevision.None))
.ThrowsAsync(new RpcException(new Status(StatusCode.DeadlineExceeded, "Deadline Exceeded")))
.ReturnsAsync(Result.Success());

Result result = await this.EventHandler.Handle(TestData.DomainEvents.TransactionHasBeenCompletedEvent, CancellationToken.None);
result.IsSuccess.ShouldBeTrue();
}
}
2 changes: 1 addition & 1 deletion ...onProcessor.BusinessLogic.Tests/DomainEventHandlers/TransactionDomainEventHandlerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ public async Task TransactionDomainEventHandler_EventPassedIn_EventIsHandled(Typ
DomainEvent domainEvent = eventType.Name switch {
nameof(FloatDomainEvents.FloatCreditPurchasedEvent) => new FloatDomainEvents.FloatCreditPurchasedEvent(TestData.FloatAggregateId, TestData.EstateId, TestData.CreditPurchasedDateTime, TestData.FloatCreditAmount, TestData.FloatCreditCostPrice),
nameof(TransactionDomainEvents.TransactionCostInformationRecordedEvent) => TestData.TransactionCostInformationRecordedEvent,
nameof(TransactionDomainEvents.TransactionHasBeenCompletedEvent) => TestData.TransactionHasBeenCompletedEvent,
nameof(TransactionDomainEvents.TransactionHasBeenCompletedEvent) => TestData.DomainEvents.TransactionHasBeenCompletedEvent,
nameof(TransactionDomainEvents.MerchantFeePendingSettlementAddedToTransactionEvent) => new TransactionDomainEvents.MerchantFeePendingSettlementAddedToTransactionEvent(TestData.TransactionId, TestData.EstateId, TestData.MerchantId, TestData.CalculatedFeeValue, 0, TestData.TransactionFeeId, TestData.TransactionFeeValue, TestData.TransactionFeeCalculateDateTime, TestData.TransactionFeeSettlementDueDate, TestData.TransactionDateTime),
nameof(TransactionDomainEvents.SettledMerchantFeeAddedToTransactionEvent)=> TestData.SettledMerchantFeeAddedToTransactionEvent(TestData.SettlementDate),
nameof(SettlementDomainEvents.MerchantFeeSettledEvent)=> new SettlementDomainEvents.MerchantFeeSettledEvent(TestData.SettlementAggregateId, TestData.EstateId, TestData.MerchantId, TestData.TransactionId, TestData.CalculatedFeeValue, 0, TestData.TransactionFeeId, TestData.TransactionFeeValue, TestData.TransactionFeeCalculateDateTime, TestData.SettlementDate),
Expand Down
35 changes: 20 additions & 15 deletions TransactionProcessor.BusinessLogic/EventHandling/MerchantStatementDomainEventHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
using System.Threading;
using System.Threading.Tasks;
using MediatR;
using MediatR;
using Polly;
using Shared.DomainDrivenDesign.EventSourcing;
using Shared.EventStore.EventHandling;
using SimpleResults;
using System.Threading;
using System.Threading.Tasks;
using TransactionProcessor.BusinessLogic.Common;
using TransactionProcessor.BusinessLogic.Requests;
using TransactionProcessor.DomainEvents;

Expand Down Expand Up @@ -49,22 +51,25 @@ public async Task<Result> Handle(IDomainEvent domainEvent,
/// <param name="cancellationToken">The cancellation token.</param>
private async Task<Result> HandleSpecificDomainEvent(MerchantStatementDomainEvents.StatementGeneratedEvent domainEvent,
CancellationToken cancellationToken) {
MerchantStatementCommands.EmailMerchantStatementCommand command = new(domainEvent.EstateId,
domainEvent.MerchantId, domainEvent.MerchantStatementId);

return await this.Mediator.Send(command, cancellationToken);

IAsyncPolicy<Result> retryPolicy = PolicyFactory.CreatePolicy(2, policyTag: "MerchantStatementDomainEventHandler - StatementGeneratedEvent");

return await retryPolicy.ExecuteAsync(async () => {
MerchantStatementCommands.EmailMerchantStatementCommand command = new(domainEvent.EstateId, domainEvent.MerchantId, domainEvent.MerchantStatementId);

return await this.Mediator.Send(command, cancellationToken);
});
}

private async Task<Result> HandleSpecificDomainEvent(TransactionDomainEvents.TransactionHasBeenCompletedEvent domainEvent,
CancellationToken cancellationToken) {
MerchantStatementCommands.AddTransactionToMerchantStatementCommand command = new(domainEvent.EstateId,
domainEvent.MerchantId,
domainEvent.CompletedDateTime,
domainEvent.TransactionAmount,
domainEvent.IsAuthorised,
domainEvent.TransactionId);

return await this.Mediator.Send(command, cancellationToken);
IAsyncPolicy<Result> retryPolicy = PolicyFactory.CreatePolicy(2, policyTag: "MerchantStatementDomainEventHandler - TransactionHasBeenCompletedEvent");

return await retryPolicy.ExecuteAsync(async () => {
MerchantStatementCommands.AddTransactionToMerchantStatementCommand command = new(domainEvent.EstateId, domainEvent.MerchantId, domainEvent.CompletedDateTime, domainEvent.TransactionAmount, domainEvent.IsAuthorised, domainEvent.TransactionId);

return await this.Mediator.Send(command, cancellationToken);
});
}

#endregion
Expand Down
20 changes: 10 additions & 10 deletions TransactionProcessor.Testing/TestData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1389,16 +1389,6 @@ public static TokenResponse TokenResponse()
TestData.SettlementAggregateId,
TestData.TransactionDateTime);

public static TransactionDomainEvents.TransactionHasBeenCompletedEvent TransactionHasBeenCompletedEvent = new TransactionDomainEvents.TransactionHasBeenCompletedEvent(TestData.TransactionId,
TestData.EstateId,
TestData.MerchantId,
TestData.ResponseCode,
TestData.ResponseMessage,
TestData.IsAuthorised,
TestData.TransactionDateTime,
TestData.TransactionAmount,
TestData.TransactionDateTime);

public static Guid TransactionFeeId = Guid.Parse("B83FCCCE-0D45-4FC2-8952-ED277A124BDB");

public static Guid TransactionFeeId2 = Guid.Parse("CA2D5119-1232-41D6-B6FD-9D84B9B5460C");
Expand Down Expand Up @@ -2574,6 +2564,16 @@ public static Models.Merchant.Merchant MerchantModelWithAddressesContactsDevices

public static class DomainEvents {

public static TransactionDomainEvents.TransactionHasBeenCompletedEvent TransactionHasBeenCompletedEvent => new TransactionDomainEvents.TransactionHasBeenCompletedEvent(TestData.TransactionId,
TestData.EstateId,
TestData.MerchantId,
TestData.ResponseCode,
TestData.ResponseMessage,
TestData.IsAuthorised,
TestData.TransactionDateTime,
TestData.TransactionAmount,
TestData.TransactionDateTime);

public static SettlementDomainEvents.MerchantFeeSettledEvent MerchantFeeSettledEvent => new(SettlementId, EstateId, MerchantId, TransactionId, CalculatedFeeValue, FeeCalculationType, SettledFeeId1, FeeValue, TransactionFeeCalculateDateTime, SettlementDate);

public static MerchantStatementDomainEvents.StatementCreatedEvent StatementCreatedEvent => new MerchantStatementDomainEvents.StatementCreatedEvent(TestData.MerchantStatementId, TestData.EstateId, TestData.MerchantId, TestData.StatementCreateDate);
Expand Down
Loading