Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<ItemGroup>
<PackageVersion Include="AspNetCore.HealthChecks.UI.Client" Version="9.0.0" />
<PackageVersion Include="AspNetCore.HealthChecks.Uris" Version="9.0.0" />
<PackageVersion Include="ClientProxyBase" Version="2026.5.6" />
<PackageVersion Include="ClientProxyBase" Version="2026.6.1" />
<PackageVersion Include="coverlet.collector" Version="10.0.1" />
<PackageVersion Include="coverlet.msbuild" Version="10.0.1" />
<PackageVersion Include="Ductus.FluentDocker" Version="2.85.0" />
Expand Down Expand Up @@ -39,7 +39,7 @@
<PackageVersion Include="SecurityService.Client" Version="2026.4.3-build157" />
<PackageVersion Include="SecurityService.IntegrationTesting.Helpers" Version="2026.4.3-build157" />
<PackageVersion Include="Shared" Version="2026.5.6" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.5.6" />
<PackageVersion Include="Shared.IntegrationTesting" Version="2026.6.1" />
<PackageVersion Include="Shared.Results.Web" Version="2026.5.6" />
<PackageVersion Include="Shouldly" Version="4.3.0" />
<PackageVersion Include="Swashbuckle.AspNetCore" Version="10.2.1" />
Expand All @@ -54,4 +54,4 @@
<PackageVersion Include="xunit.v3" Version="3.2.2" />
<PackageVersion Include="xunit.runner.visualstudio" Version="3.1.5" />
</ItemGroup>
</Project>
</Project>
9 changes: 9 additions & 0 deletions TransactionProcessorACL.BusinessLogic.Tests/MediatorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,8 @@ public MediatorTests()
this.Requests.Add(TestData.GetMerchantContractsQuery);
this.Requests.Add(TestData.GetMerchantQuery);
this.Requests.Add(TestData.GetMerchantScheduleQuery);
this.Requests.Add(TestData.GetMerchantDailyPerformanceSummaryQuery);
this.Requests.Add(TestData.GetMerchantTransactionMixSummaryQuery);
}

[Fact]
Expand Down Expand Up @@ -168,5 +170,12 @@ public async Task<Result<MerchantDailyPerformanceSummaryResponse>> GetMerchantDa
{
return Result.Success(new MerchantDailyPerformanceSummaryResponse());
}

public async Task<Result<MerchantTransactionMixSummaryResponse>> GetMerchantTransactionMixSummary(Guid estateId,
MerchantTransactionMixSummaryRequest request,
CancellationToken cancellationToken)
{
return Result.Success(new MerchantTransactionMixSummaryResponse());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,11 @@ namespace TransactionProcessorACL.BusinesssLogic.Tests
using Shared.General;
using Shouldly;
using Testing;
using TransactionProcessorACL.DataTransferObjects.Requests;
using Xunit;
using static Microsoft.EntityFrameworkCore.DbLoggerCategory.Database;
using RequestTransactionMixBreakdown = TransactionProcessorACL.DataTransferObjects.Requests.TransactionMixBreakdown;
using RequestTransactionMixMeasure = TransactionProcessorACL.DataTransferObjects.Requests.TransactionMixMeasure;

/// <summary>
///
Expand Down Expand Up @@ -196,6 +199,63 @@ public async Task VoucherRequestHandler_RedeemVoucherRequest_Handle_RequestIsHan
});
}

[Fact]
public async Task ReportingRequestHandler_GetMerchantTransactionMixSummaryQuery_Handle_RequestIsHandled()
{
Mock<ITransactionProcessorACLApplicationService> applicationService = new Mock<ITransactionProcessorACLApplicationService>();
applicationService
.Setup(a => a.GetMerchantTransactionMixSummary(It.IsAny<Guid>(),
It.IsAny<MerchantTransactionMixSummaryRequest>(),
It.IsAny<CancellationToken>()))
.ReturnsAsync(new MerchantTransactionMixSummaryResponse());

ReportingRequestHandler requestHandler = new ReportingRequestHandler(applicationService.Object);

ReportingQueries.GetMerchantTransactionMixSummaryQuery query = new(
TestData.EstateId,
new MerchantTransactionMixSummaryRequest
{
MerchantReportingId = 12345,
StartDate = new DateTime(2026, 7, 1),
EndDate = new DateTime(2026, 7, 3),
Breakdown = RequestTransactionMixBreakdown.Product,
Measure = RequestTransactionMixMeasure.Count,
TopN = 5
});

Result<MerchantTransactionMixSummaryResponse> result = await requestHandler.Handle(query, CancellationToken.None);

result.IsSuccess.ShouldBeTrue();
result.Data.ShouldNotBeNull();
}

[Fact]
public async Task ReportingRequestHandler_GetMerchantDailyPerformanceSummaryQuery_Handle_RequestIsHandled()
{
Mock<ITransactionProcessorACLApplicationService> applicationService = new Mock<ITransactionProcessorACLApplicationService>();
applicationService
.Setup(a => a.GetMerchantDailyPerformanceSummary(It.IsAny<Guid>(),
It.IsAny<MerchantDailyPerformanceSummaryRequest>(),
It.IsAny<CancellationToken>()))
.ReturnsAsync(new MerchantDailyPerformanceSummaryResponse());

ReportingRequestHandler requestHandler = new ReportingRequestHandler(applicationService.Object);

ReportingQueries.GetMerchantDailyPerformanceSummaryQuery query = new(
TestData.EstateId,
new MerchantDailyPerformanceSummaryRequest
{
MerchantReportingId = 12345,
StartDate = new DateTime(2026, 7, 1),
EndDate = new DateTime(2026, 7, 1)
});

Result<MerchantDailyPerformanceSummaryResponse> result = await requestHandler.Handle(query, CancellationToken.None);

result.IsSuccess.ShouldBeTrue();
result.Data.ShouldNotBeNull();
}

#endregion
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ namespace TransactionProcessorACL.BusinesssLogic.Tests
using Xunit;
using GetVoucherResponse = Models.GetVoucherResponse;
using RedeemVoucherResponse = Models.RedeemVoucherResponse;
using RequestTransactionMixBreakdown = TransactionProcessorACL.DataTransferObjects.Requests.TransactionMixBreakdown;
using RequestTransactionMixMeasure = TransactionProcessorACL.DataTransferObjects.Requests.TransactionMixMeasure;

public class TransactionProcessorACLApplicationServiceTests
{
Expand Down Expand Up @@ -649,5 +651,52 @@ public async Task TransactionProcessorACLApplicationService_GetMerchantDailyPerf

result.IsFailed.ShouldBeTrue();
}

[Fact]
public async Task TransactionProcessorACLApplicationService_GetMerchantTransactionMixSummary_ReturnedFromEstateReportingClient()
{
MerchantTransactionMixSummaryRequest capturedRequest = null;
estateReportingApiClient
.Setup(v => v.GetMerchantTransactionMixSummary(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<MerchantTransactionMixSummaryRequest>(), It.IsAny<CancellationToken>()))
.Callback<String, Guid, MerchantTransactionMixSummaryRequest, CancellationToken>((_, _, request, _) => capturedRequest = request)
.ReturnsAsync(Result.Success(new MerchantTransactionMixSummaryResponse
{
FromDate = new DateTime(2026, 7, 1),
ToDate = new DateTime(2026, 7, 3),
Breakdown = TransactionProcessorACL.Models.TransactionMixBreakdown.Product,
Measure = TransactionProcessorACL.Models.TransactionMixMeasure.Count,
Items =
[
new TransactionMixSummaryItem
{
Key = "product-1",
Label = "Product 1",
Count = 6,
Value = 42.75M
}
]
}));
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse));

Result<MerchantTransactionMixSummaryResponse> result = await applicationService.GetMerchantTransactionMixSummary(
TestData.EstateId,
new MerchantTransactionMixSummaryRequest
{
MerchantReportingId = 12345,
StartDate = new DateTime(2026, 7, 1),
EndDate = new DateTime(2026, 7, 3),
Breakdown = RequestTransactionMixBreakdown.Product,
Measure = RequestTransactionMixMeasure.Count,
TopN = 5
},
CancellationToken.None);

result.IsSuccess.ShouldBeTrue();
result.Data.ShouldNotBeNull();
result.Data.Items.Count.ShouldBe(1);
capturedRequest.ShouldNotBeNull();
capturedRequest.MerchantReportingId.ShouldBe(12345);
capturedRequest.Breakdown.ShouldBe(RequestTransactionMixBreakdown.Product);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,35 @@ public async Task<Result<MerchantDailyPerformanceSummaryResponse>> GetMerchantDa
}
}

public async Task<Result<MerchantTransactionMixSummaryResponse>> GetMerchantTransactionMixSummary(String accessToken,
Guid estateId,
MerchantTransactionMixSummaryRequest request,
CancellationToken cancellationToken)
{
string requestUri = this.BuildRequestUrl("/api/transactions/transactionmixsummary");

try
{
List<(string headerName, string headerValue)> additionalHeaders =
[
(EstateIdHeaderName, estateId.ToString())
];

Result<MerchantTransactionMixSummaryResponse> result =
await this.Post<MerchantTransactionMixSummaryRequest, MerchantTransactionMixSummaryResponse>(requestUri, request, accessToken, additionalHeaders, cancellationToken);

if (result.IsFailed)
return ResultHelpers.CreateFailure(result);

return result;
}
catch (Exception ex)
{
Exception exception = new($"Error getting merchant transaction mix summary for estate {estateId}.", ex);
return Result.Failure(exception.Message);
}
}

private string BuildRequestUrl(string relativePath)
{
string baseAddress = this.BaseAddressResolver("EstateReportingApi");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,9 @@ Task<Result<MerchantDailyPerformanceSummaryResponse>> GetMerchantDailyPerformanc
Guid estateId,
MerchantDailyPerformanceSummaryRequest request,
CancellationToken cancellationToken);

Task<Result<MerchantTransactionMixSummaryResponse>> GetMerchantTransactionMixSummary(String accessToken,
Guid estateId,
MerchantTransactionMixSummaryRequest request,
CancellationToken cancellationToken);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
using System.Threading;
using System.Threading.Tasks;
using MediatR;
using SimpleResults;
using TransactionProcessorACL.BusinessLogic.Requests;
using TransactionProcessorACL.BusinessLogic.Services;
using TransactionProcessorACL.Models;
using TransactionProcessorACL.DataTransferObjects.Requests;

namespace TransactionProcessorACL.BusinessLogic.RequestHandlers;

public class ReportingRequestHandler :
IRequestHandler<ReportingQueries.GetMerchantDailyPerformanceSummaryQuery, Result<MerchantDailyPerformanceSummaryResponse>>,
IRequestHandler<ReportingQueries.GetMerchantTransactionMixSummaryQuery, Result<MerchantTransactionMixSummaryResponse>>
{
private readonly ITransactionProcessorACLApplicationService ApplicationService;

public ReportingRequestHandler(ITransactionProcessorACLApplicationService applicationService)
{
this.ApplicationService = applicationService;
}

public async Task<Result<MerchantDailyPerformanceSummaryResponse>> Handle(ReportingQueries.GetMerchantDailyPerformanceSummaryQuery request,
CancellationToken cancellationToken)
{
return await this.ApplicationService.GetMerchantDailyPerformanceSummary(request.EstateId, request.Request, cancellationToken);
}

public async Task<Result<MerchantTransactionMixSummaryResponse>> Handle(ReportingQueries.GetMerchantTransactionMixSummaryQuery request,
CancellationToken cancellationToken)
{
return await this.ApplicationService.GetMerchantTransactionMixSummary(request.EstateId, request.Request, cancellationToken);
}
}
20 changes: 20 additions & 0 deletions TransactionProcessorACL.BusinessLogic/Requests/ReportingQueries.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
using System;
using System.Diagnostics.CodeAnalysis;
using MediatR;
using SimpleResults;
using TransactionProcessorACL.DataTransferObjects.Requests;
using TransactionProcessorACL.Models;

namespace TransactionProcessorACL.BusinessLogic.Requests;

[ExcludeFromCodeCoverage]
public record ReportingQueries
{
public record GetMerchantDailyPerformanceSummaryQuery(Guid EstateId,
MerchantDailyPerformanceSummaryRequest Request)
: IRequest<Result<MerchantDailyPerformanceSummaryResponse>>;

public record GetMerchantTransactionMixSummaryQuery(Guid EstateId,
MerchantTransactionMixSummaryRequest Request)
: IRequest<Result<MerchantTransactionMixSummaryResponse>>;
}
Original file line number Diff line number Diff line change
Expand Up @@ -62,8 +62,12 @@ Task<Result<MerchantScheduleResponse>> GetMerchantSchedule(Guid estateId,
Int32 year,
CancellationToken cancellationToken);

Task<Result<MerchantDailyPerformanceSummaryResponse>> GetMerchantDailyPerformanceSummary(Guid estateId,
MerchantDailyPerformanceSummaryRequest request,
CancellationToken cancellationToken);
Task<Result<MerchantDailyPerformanceSummaryResponse>> GetMerchantDailyPerformanceSummary(Guid estateId,
MerchantDailyPerformanceSummaryRequest request,
CancellationToken cancellationToken);

Task<Result<MerchantTransactionMixSummaryResponse>> GetMerchantTransactionMixSummary(Guid estateId,
MerchantTransactionMixSummaryRequest request,
CancellationToken cancellationToken);
}
}
Loading
Loading