Skip to content

Update contract/operator event handling and add unit test #1495

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
StuartFerguson merged 2 commits into from
Feb 1, 2026
Merged

Update contract/operator event handling and add unit test #1495

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
f8bd12c
Update contract/operator event handling and add unit test
StuartFerguson Jan 31, 2026
58028df
fix broken test
StuartFerguson Feb 1, 2026
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
27 changes: 27 additions & 0 deletions TransactionProcessor.Aggregates.Tests/MerchantAggregateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -818,5 +818,32 @@ public void MerchantAggregate_RemoveOperator_And_ReAdd_OperatorIsReAdded()
operatorModel = merchantModel.Operators.Single();
operatorModel.IsDeleted.ShouldBeFalse();
}

[Fact]
public void MerchantAggregate_RemoveContract_And_ReAdd_ContractIsReAdded()
{
MerchantAggregate aggregate = MerchantAggregate.Create(TestData.MerchantId);
aggregate.Create(TestData.EstateId, TestData.MerchantName, TestData.DateMerchantCreated, TestData.AddressModel, TestData.ContactModel,
TestData.SettlementScheduleModel);
aggregate.AddContract(TestData.Aggregates.CreatedContractAggregate());

Result result = aggregate.RemoveContract(TestData.ContractId);
result.IsSuccess.ShouldBeTrue();

Merchant merchantModel = aggregate.GetMerchant();
merchantModel.Contracts.ShouldHaveSingleItem();
Contract contractModel = merchantModel.Contracts.Single();
contractModel.ContractId.ShouldBe(TestData.ContractId);
contractModel.IsDeleted.ShouldBeTrue();

result = aggregate.AddContract(TestData.Aggregates.CreatedContractAggregate());
result.IsSuccess.ShouldBeTrue();

merchantModel = aggregate.GetMerchant();
merchantModel.Contracts.ShouldHaveSingleItem();
contractModel = merchantModel.Contracts.Single();
contractModel.ContractId.ShouldBe(TestData.ContractId);
contractModel.IsDeleted.ShouldBeFalse();
}
}
}
32 changes: 21 additions & 11 deletions TransactionProcessor.Aggregates/MerchantAggregate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,7 +621,7 @@ private static Result EnsureOperatorHasBeenAssigned(this MerchantAggregate aggre

private static Result EnsureContractHasNotAlreadyBeenAdded(this MerchantAggregate aggregate,
Guid contractId) {
if (aggregate.Contracts.ContainsKey(contractId)) {
if (aggregate.Contracts.Any(o => o.Key == contractId && o.Value.IsDeleted == false)) {
return Result.Invalid($"Contract {contractId} has already been assigned to merchant");
}

Expand Down Expand Up @@ -785,19 +785,21 @@ public static void PlayEvent(this MerchantAggregate aggregate, MerchantDomainEve
aggregate.Contacts.Add(contactAddedEvent.ContactId, contact);
}

public static void PlayEvent(this MerchantAggregate aggregate, MerchantDomainEvents.OperatorAssignedToMerchantEvent operatorAssignedToMerchantEvent) {
var @operator = aggregate.Operators.SingleOrDefault(o => o.Key == operatorAssignedToMerchantEvent.OperatorId);

if (@operator.Value != null) {
aggregate.Operators[operatorAssignedToMerchantEvent.OperatorId] = @operator.Value with { IsDeleted = false };
public static void PlayEvent(this MerchantAggregate aggregate, MerchantDomainEvents.OperatorAssignedToMerchantEvent domainEvent) {
if (aggregate.Operators.ContainsKey(domainEvent.OperatorId))
{
KeyValuePair<Guid, Operator> @operator = aggregate.Operators.Single(c => c.Key == domainEvent.OperatorId);
aggregate.Operators[domainEvent.OperatorId] = @operator.Value with
{
IsDeleted = false
};
return;
}
Operator newOperator = new Operator(domainEvent.OperatorId, domainEvent.Name,
domainEvent.MerchantNumber,
domainEvent.TerminalNumber);

Operator newOperator = new Operator(operatorAssignedToMerchantEvent.OperatorId, operatorAssignedToMerchantEvent.Name,
operatorAssignedToMerchantEvent.MerchantNumber,
operatorAssignedToMerchantEvent.TerminalNumber);

aggregate.Operators.Add(operatorAssignedToMerchantEvent.OperatorId, newOperator);
aggregate.Operators.Add(domainEvent.OperatorId, newOperator);
}

public static void PlayEvent(this MerchantAggregate aggregate, MerchantDomainEvents.OperatorRemovedFromMerchantEvent operatorRemovedFromMerchantEvent){
Expand All @@ -822,6 +824,14 @@ public static void PlayEvent(this MerchantAggregate aggregate, MerchantDomainEve
}

public static void PlayEvent(this MerchantAggregate aggregate, MerchantDomainEvents.ContractAddedToMerchantEvent domainEvent){
if (aggregate.Contracts.ContainsKey(domainEvent.ContractId)) {
KeyValuePair<Guid, Contract> contract = aggregate.Contracts.Single(c => c.Key == domainEvent.ContractId);
aggregate.Contracts[domainEvent.ContractId] = contract.Value with
{
IsDeleted = false
};
return;
}
aggregate.Contracts.Add(domainEvent.ContractId, new Contract(domainEvent.ContractId));
}

Expand Down
Loading