Skip to content

Enhance estate management with error handling and tests #866

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
Aug 20, 2025
Merged

Enhance estate management with error handling and tests #866

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
3 changes: 3 additions & 0 deletions TransactionProcessor.BusinessLogic.Tests/Services/EstateDomainServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,9 @@ public async Task EstateDomainService_CreateEstate_EstateIsCreated() {
[Fact]
public async Task EstateDomainService_AddOperatorEstate_OperatorIsAdded()
{
this.AggregateService.Setup(m => m.Get<OperatorAggregate>(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(SimpleResults.Result.Success(TestData.Aggregates.CreatedOperatorAggregate()));

this.AggregateService.Setup(m => m.GetLatest<EstateAggregate>(It.IsAny<Guid>(), It.IsAny<CancellationToken>()))
.ReturnsAsync(SimpleResults.Result.Success(TestData.Aggregates.CreatedEstateAggregate()));
this.AggregateService.Setup(m => m.Save(It.IsAny<EstateAggregate>(), It.IsAny<CancellationToken>())).ReturnsAsync(SimpleResults.Result.Success());
Expand Down
158 changes: 96 additions & 62 deletions TransactionProcessor.BusinessLogic/Services/EstateDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,99 +52,133 @@ public EstateDomainService(Func<IAggregateService> aggregateService,
#endregion

#region Methods

public async Task<Result> CreateEstate(EstateCommands.CreateEstateCommand command,
CancellationToken cancellationToken) {
try {
Result<EstateAggregate> estateResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.GetLatest<EstateAggregate>(command.RequestDto.EstateId, ct), command.RequestDto.EstateId, cancellationToken, false);
if (estateResult.IsFailed)
return ResultHelpers.CreateFailure(estateResult);

private async Task<Result> ApplyUpdates(Action<EstateAggregate> action, Guid estateId, CancellationToken cancellationToken, Boolean isNotFoundError = true)
{
try
{
Result<EstateAggregate> getLatestVersionResult = await this.AggregateService.GetLatest<EstateAggregate>(estateId, cancellationToken);
Result<EstateAggregate> estateAggregateResult =
DomainServiceHelper.HandleGetAggregateResult(getLatestVersionResult, estateId, isNotFoundError);
if (estateAggregateResult.IsFailed)
return ResultHelpers.CreateFailure(estateAggregateResult);

EstateAggregate estateAggregate = estateAggregateResult.Data;
EstateAggregate estateAggregate = estateResult.Data;

action(estateAggregate);
estateAggregate.Create(command.RequestDto.EstateName);
estateAggregate.GenerateReference();

Result saveResult = await this.AggregateService.Save(estateAggregate, cancellationToken);
if (saveResult.IsFailed)
return ResultHelpers.CreateFailure(saveResult);

return Result.Success();
}
catch (Exception ex)
{
catch (Exception ex) {
return Result.Failure(ex.GetExceptionMessages());
}
}


public async Task<Result> CreateEstate(EstateCommands.CreateEstateCommand command, CancellationToken cancellationToken)
public async Task<Result> AddOperatorToEstate(EstateCommands.AddOperatorToEstateCommand command, CancellationToken cancellationToken)
{
Result result = await ApplyUpdates((estateAggregate) => {
estateAggregate.Create(command.RequestDto.EstateName);
estateAggregate.GenerateReference();
}, command.RequestDto.EstateId, cancellationToken, false);
try
{
Result<OperatorAggregate> operatorResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.Get<OperatorAggregate>(command.RequestDto.OperatorId, ct), command.RequestDto.OperatorId, cancellationToken);
if (operatorResult.IsFailed)
return ResultHelpers.CreateFailure(operatorResult);

return result;
}
Result<EstateAggregate> estateResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.GetLatest<EstateAggregate>(command.EstateId, ct), command.EstateId, cancellationToken);
if (estateResult.IsFailed)
return ResultHelpers.CreateFailure(estateResult);

EstateAggregate estateAggregate = estateResult.Data;

public async Task<Result> AddOperatorToEstate(EstateCommands.AddOperatorToEstateCommand command, CancellationToken cancellationToken)
{
Result result = await ApplyUpdates((estateAggregate) => {
estateAggregate.AddOperator(command.RequestDto.OperatorId);
}, command.EstateId, cancellationToken);

return result;
Result saveResult = await this.AggregateService.Save(estateAggregate, cancellationToken);
if (saveResult.IsFailed)
return ResultHelpers.CreateFailure(saveResult);

return Result.Success();
}
catch (Exception ex)
{
return Result.Failure(ex.GetExceptionMessages());
}
}

public async Task<Result> CreateEstateUser(EstateCommands.CreateEstateUserCommand command, CancellationToken cancellationToken)
{
CreateUserRequest createUserRequest = new CreateUserRequest
try
{
EmailAddress = command.RequestDto.EmailAddress,
FamilyName = command.RequestDto.FamilyName,
GivenName = command.RequestDto.GivenName,
MiddleName = command.RequestDto.MiddleName,
Password = command.RequestDto.Password,
PhoneNumber = "123456", // Is this really needed :|
Roles = new List<String>(),
Claims = new Dictionary<String, String>()
};

// Check if role has been overridden
String estateRoleName = Environment.GetEnvironmentVariable("EstateRoleName");
createUserRequest.Roles.Add(String.IsNullOrEmpty(estateRoleName) ? "Estate" : estateRoleName);
createUserRequest.Claims.Add("estateId", command.EstateId.ToString());

Result createUserResult = await this.SecurityServiceClient.CreateUser(createUserRequest, cancellationToken);
if (createUserResult.IsFailed)
return ResultHelpers.CreateFailure(createUserResult);

Result<List<UserDetails>> userDetailsResult = await this.SecurityServiceClient.GetUsers(createUserRequest.EmailAddress, cancellationToken);
if (userDetailsResult.IsFailed)
return ResultHelpers.CreateFailure(userDetailsResult);

UserDetails user = userDetailsResult.Data.SingleOrDefault();
if (user == null)
return Result.Failure($"Unable to get user details for username {createUserRequest.EmailAddress}");

Result result = await ApplyUpdates((estateAggregate) => {
// Add the user to the aggregate
CreateUserRequest createUserRequest = new CreateUserRequest
{
EmailAddress = command.RequestDto.EmailAddress,
FamilyName = command.RequestDto.FamilyName,
GivenName = command.RequestDto.GivenName,
MiddleName = command.RequestDto.MiddleName,
Password = command.RequestDto.Password,
PhoneNumber = "123456", // Is this really needed :|
Roles = new List<String>(),
Claims = new Dictionary<String, String>()
};

// Check if role has been overridden
String estateRoleName = Environment.GetEnvironmentVariable("EstateRoleName");
createUserRequest.Roles.Add(String.IsNullOrEmpty(estateRoleName) ? "Estate" : estateRoleName);
createUserRequest.Claims.Add("estateId", command.EstateId.ToString());

Result createUserResult = await this.SecurityServiceClient.CreateUser(createUserRequest, cancellationToken);
if (createUserResult.IsFailed)
return ResultHelpers.CreateFailure(createUserResult);

Result<List<UserDetails>> userDetailsResult = await this.SecurityServiceClient.GetUsers(createUserRequest.EmailAddress, cancellationToken);
if (userDetailsResult.IsFailed)
return ResultHelpers.CreateFailure(userDetailsResult);

UserDetails user = userDetailsResult.Data.SingleOrDefault();
if (user == null)
return Result.Failure($"Unable to get user details for username {createUserRequest.EmailAddress}");

Result<EstateAggregate> estateResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.GetLatest<EstateAggregate>(command.EstateId, ct), command.EstateId, cancellationToken);
if (estateResult.IsFailed)
return ResultHelpers.CreateFailure(estateResult);

EstateAggregate estateAggregate = estateResult.Data;

estateAggregate.AddSecurityUser(user.UserId, command.RequestDto.EmailAddress);
}, command.EstateId, cancellationToken);

return result;
Result saveResult = await this.AggregateService.Save(estateAggregate, cancellationToken);
if (saveResult.IsFailed)
return ResultHelpers.CreateFailure(saveResult);

return Result.Success();
}
catch (Exception ex)
{
return Result.Failure(ex.GetExceptionMessages());
}
}

public async Task<Result> RemoveOperatorFromEstate(EstateCommands.RemoveOperatorFromEstateCommand command, CancellationToken cancellationToken)
{
Result result = await ApplyUpdates((estateAggregate) => {
try
{
Result<EstateAggregate> estateResult = await DomainServiceHelper.GetAggregateOrFailure(ct => this.AggregateService.GetLatest<EstateAggregate>(command.EstateId, ct), command.EstateId, cancellationToken);
if (estateResult.IsFailed)
return ResultHelpers.CreateFailure(estateResult);

EstateAggregate estateAggregate = estateResult.Data;

estateAggregate.RemoveOperator(command.OperatorId);
}, command.EstateId, cancellationToken);

return result;
Result saveResult = await this.AggregateService.Save(estateAggregate, cancellationToken);
if (saveResult.IsFailed)
return ResultHelpers.CreateFailure(saveResult);

return Result.Success();
}
catch (Exception ex)
{
return Result.Failure(ex.GetExceptionMessages());
}
}

#endregion
Expand Down
Loading