Skip to content

Allow re-adding previously removed operators to merchants #1494

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 1 commit into from
Jan 31, 2026
Merged

Allow re-adding previously removed operators to merchants #1494

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
28 changes: 28 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 @@ -790,5 +790,33 @@ public void MerchantAggregate_RemoveContract_MerchantDoesNotHaveContract_ErrorTh
result.IsFailed.ShouldBeTrue();
result.Status.ShouldBe(ResultStatus.Invalid);
}

[Fact]
public void MerchantAggregate_RemoveOperator_And_ReAdd_OperatorIsReAdded()
{
MerchantAggregate aggregate = MerchantAggregate.Create(TestData.MerchantId);
aggregate.Create(TestData.EstateId, TestData.MerchantName, TestData.DateMerchantCreated, TestData.AddressModel, TestData.ContactModel,
TestData.SettlementScheduleModel);
aggregate.AssignOperator(TestData.OperatorId, TestData.OperatorName, TestData.OperatorMerchantNumber, TestData.OperatorTerminalNumber);

Result result = aggregate.RemoveOperator(TestData.OperatorId);
result.IsSuccess.ShouldBeTrue();

Merchant merchantModel = aggregate.GetMerchant();
merchantModel.Operators.ShouldHaveSingleItem();
Operator operatorModel = merchantModel.Operators.Single();
operatorModel.OperatorId.ShouldBe(TestData.OperatorId);
operatorModel.Name.ShouldBe(TestData.OperatorName);
operatorModel.MerchantNumber.ShouldBe(TestData.OperatorMerchantNumber);
operatorModel.TerminalNumber.ShouldBe(TestData.OperatorTerminalNumber);
operatorModel.IsDeleted.ShouldBeTrue();

result = aggregate.AssignOperator(TestData.OperatorId, TestData.OperatorName, TestData.OperatorMerchantNumber, TestData.OperatorTerminalNumber);
result.IsSuccess.ShouldBeTrue();
merchantModel = aggregate.GetMerchant();
merchantModel.Operators.ShouldHaveSingleItem();
operatorModel = merchantModel.Operators.Single();
operatorModel.IsDeleted.ShouldBeFalse();
}
}
}
16 changes: 11 additions & 5 deletions TransactionProcessor.Aggregates/MerchantAggregate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -603,7 +603,7 @@ private static Result EnsureMerchantHasSpaceForDevice(this MerchantAggregate agg

private static Result EnsureOperatorHasNotAlreadyBeenAssigned(this MerchantAggregate aggregate,
Guid operatorId) {
if (aggregate.Operators.Any(o => o.Key == operatorId)) {
if (aggregate.Operators.Any(o => o.Key == operatorId && o.Value.IsDeleted == false)) {
return Result.Invalid($"Operator {operatorId} has already been assigned to merchant");
}

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

public static void PlayEvent(this MerchantAggregate aggregate, MerchantDomainEvents.OperatorAssignedToMerchantEvent operatorAssignedToMerchantEvent)
{
Operator @operator = new Operator(operatorAssignedToMerchantEvent.OperatorId, operatorAssignedToMerchantEvent.Name,
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 };
return;
}

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

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

public static void PlayEvent(this MerchantAggregate aggregate, MerchantDomainEvents.OperatorRemovedFromMerchantEvent operatorRemovedFromMerchantEvent){
Expand Down
Loading