Skip to content

validate merchant for building statements #1480

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
Dec 24, 2025
Merged

validate merchant for building statements #1480

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
16 changes: 16 additions & 0 deletions TransactionProcessor.BusinessLogic.Tests/Services/MerchantStatementDomainServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,22 @@ public async Task MerchantStatementDomainService_BuildStatement_GetMerchantFaile
result.IsFailed.ShouldBeTrue();
}

[Fact]
public async Task MerchantStatementDomainService_BuildStatement_MerchantNotCreated_StatementIsNotBuilt()
{
this.AggregateService.Setup(a => a.GetLatest<MerchantStatementAggregate>(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.Aggregates.GeneratedMerchantStatementAggregate()));
this.AggregateService.Setup(a => a.Save<MerchantStatementAggregate>(It.IsAny<MerchantStatementAggregate>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success);

this.AggregateService.Setup(a => a.GetLatest<MerchantStatementForDateAggregate>(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.Aggregates.MerchantStatementForDateAggregateWithTransactionAndFee()));

this.AggregateService.Setup(a => a.Get<MerchantAggregate>(It.IsAny<Guid>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.Aggregates.EmptyMerchantAggregate()));

this.StatementBuilder.Setup(s => s.GetStatementHtml(It.IsAny<MerchantStatementAggregate>(), It.IsAny<Merchant>(), It.IsAny<CancellationToken>())).ReturnsAsync("<html></html>");

Result result = await this.DomainService.BuildStatement(TestData.Commands.BuildMerchantStatementCommand, CancellationToken.None);
result.IsFailed.ShouldBeTrue();
}

[Fact]
public async Task MerchantStatementDomainService_BuildStatement_SaveFailed_StatementIsNotBuilt()
{
Expand Down
6 changes: 6 additions & 0 deletions TransactionProcessor.BusinessLogic/Services/MerchantStatementDomainService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -262,8 +262,14 @@ public async Task<Result> BuildStatement(MerchantStatementCommands.BuildMerchant
if (getMerchantResult.IsFailed)
return ResultHelpers.CreateFailure(getMerchantResult);

if (getMerchantResult.Data.IsCreated == false)
return Result.Invalid("Merchant must be created to build a statement");

Merchant merchantModel = getMerchantResult.Data.GetMerchant();

if (merchantModel.Addresses.Any() == false)
return Result.Invalid("Merchant must have an address to build a statement");

Result<String> htmlResult = await this.StatementBuilder.GetStatementHtml(merchantStatementAggregate, merchantModel, cancellationToken);
if (htmlResult.IsFailed)
return ResultHelpers.CreateFailure(htmlResult);
Expand Down
2 changes: 0 additions & 2 deletions TransactionProcessor.BusinessLogic/Services/StatementBuilder.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,6 @@ public async Task<Result<String>> GetStatementHtml(MerchantStatementAggregate st
Merchant merchant,
CancellationToken cancellationToken)
{
// TODO: Check merchant and addresses exist

IDirectoryInfo path = this.FileSystem.Directory.GetParent(Assembly.GetExecutingAssembly().Location);
MerchantStatement statementHeader = statementAggregate.GetStatement();

Expand Down
Loading