Skip to content

Allow re-adding removed operators to EstateAggregate #1493

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 removed operators to EstateAggregate #1493

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
22 changes: 22 additions & 0 deletions TransactionProcessor.Aggregates.Tests/EstateAggregateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,5 +219,27 @@ public void EstateAggregate_RemoveOperatorFromEstate_OperatorWithIdNotAlreadyAdd

result.Message.ShouldContain($"Operator not added to this Estate with Id [{TestData.OperatorId}]");
}

[Fact]
public void EstateAggregate_RemoveOperatorFromEstate_ThenReAdd_OperatorAdded()
{
EstateAggregate aggregate = EstateAggregate.Create(TestData.EstateId);
aggregate.Create(TestData.EstateName);
aggregate.AddOperator(TestData.OperatorId);

Estate estate = aggregate.GetEstate();
estate.Operators.ShouldHaveSingleItem();
estate.Operators.Single().IsDeleted.ShouldBeFalse();
aggregate.RemoveOperator(TestData.OperatorId);

estate = aggregate.GetEstate();
estate.Operators.ShouldHaveSingleItem();
estate.Operators.Single().IsDeleted.ShouldBeTrue();
aggregate.AddOperator(TestData.OperatorId);

estate = aggregate.GetEstate();
estate.Operators.ShouldHaveSingleItem();
estate.Operators.Single().IsDeleted.ShouldBeFalse();
}
}
}
24 changes: 14 additions & 10 deletions TransactionProcessor.Aggregates/EstateAggregate.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@ public static Result AddOperator(this EstateAggregate aggregate,
if (result.IsFailed)
return result;

EstateDomainEvents.OperatorAddedToEstateEvent operatorAddedToEstateEvent =
new EstateDomainEvents.OperatorAddedToEstateEvent(aggregate.AggregateId, operatorId);
EstateDomainEvents.OperatorAddedToEstateEvent operatorAddedToEstateEvent = new(aggregate.AggregateId, operatorId);

aggregate.ApplyAndAppend(operatorAddedToEstateEvent);

Expand Down Expand Up @@ -118,13 +117,18 @@ public static void PlayEvent(this EstateAggregate aggregate, EstateDomainEvents.
aggregate.EstateReference = domainEvent.EstateReference;
}

public static void PlayEvent(this EstateAggregate aggregate, EstateDomainEvents.OperatorAddedToEstateEvent domainEvent){
TransactionProcessor.Models.Estate.Operator @operator = new() {
IsDeleted = false,
OperatorId = domainEvent.OperatorId
};
public static void PlayEvent(this EstateAggregate aggregate, EstateDomainEvents.OperatorAddedToEstateEvent domainEvent) {
var @operator = aggregate.Operators.SingleOrDefault(o => o.Key == domainEvent.OperatorId);

aggregate.Operators.Add(domainEvent.OperatorId, @operator);
if (@operator.Value != null){
@operator.Value.IsDeleted = false;
return;
}

aggregate.Operators.Add(domainEvent.OperatorId, new Operator {
IsDeleted = false,
OperatorId = domainEvent.OperatorId
});
}

public static void PlayEvent(this EstateAggregate aggregate, EstateDomainEvents.OperatorRemovedFromEstateEvent domainEvent){
Expand All @@ -140,8 +144,8 @@ private static Result CheckEstateHasBeenCreated(this EstateAggregate aggregate){

private static Result CheckOperatorHasNotAlreadyBeenCreated(this EstateAggregate aggregate,
Guid operatorId) {
Boolean operatorRecordExists = aggregate.Operators.ContainsKey(operatorId);
if (operatorRecordExists == true) {
Boolean operatorRecordExists = aggregate.Operators.Any(o => o.Key == operatorId && o.Value.IsDeleted == false);
if (operatorRecordExists) {
return Result.Invalid($"Duplicate operator details are not allowed, an operator already exists on this estate with Id [{operatorId}]");
}
return Result.Success();
Expand Down
Loading