Skip to content

Add merchant id to settlement completed event #496

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 2 commits into from
Dec 19, 2023
Merged

Add merchant id to settlement completed event #496

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
04364a9
Add merchant id to settlement completed event
StuartFerguson Dec 19, 2023
2fdacb1
Merge branch 'master' into bug/#495_merchantidmissingfromsettlmentcom…
StuartFerguson Dec 19, 2023
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
3 changes: 2 additions & 1 deletion TransactionProcessor.Settlement.DomainEvents/SettlementAggregateDomainEvents.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,8 @@ public record MerchantFeeSettledEvent(Guid SettlementId,

[ExcludeFromCodeCoverage]
public record SettlementCompletedEvent(Guid SettlementId,
Guid EstateId) : DomainEvent(SettlementId, Guid.NewGuid());
Guid EstateId,
Guid MerchantId) : DomainEvent(SettlementId, Guid.NewGuid());

[ExcludeFromCodeCoverage]
public record SettlementCreatedForDateEvent(Guid SettlementId,
Expand Down
4 changes: 2 additions & 2 deletions TransactionProcessor.SettlementAggregates/SettlementAggregate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public static void ManuallyComplete(this SettlementAggregate aggregate){
if (aggregate.SettlementComplete)
return;

SettlementCompletedEvent pendingSettlementCompletedEvent = new SettlementCompletedEvent(aggregate.AggregateId, aggregate.EstateId);
SettlementCompletedEvent pendingSettlementCompletedEvent = new SettlementCompletedEvent(aggregate.AggregateId, aggregate.EstateId, aggregate.MerchantId);
aggregate.ApplyAndAppend(pendingSettlementCompletedEvent);
}

Expand Down Expand Up @@ -58,7 +58,7 @@ public static void MarkFeeAsSettled(this SettlementAggregate aggregate, Guid mer
if (aggregate.CalculatedFeesPendingSettlement.Any() == false)
{
// Settlement is completed
SettlementCompletedEvent pendingSettlementCompletedEvent = new SettlementCompletedEvent(aggregate.AggregateId, aggregate.EstateId);
SettlementCompletedEvent pendingSettlementCompletedEvent = new SettlementCompletedEvent(aggregate.AggregateId, aggregate.EstateId, aggregate.MerchantId);
aggregate.ApplyAndAppend(pendingSettlementCompletedEvent);
}
}
Expand Down