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
8 changes: 8 additions & 0 deletions TransactionProcessorACL.BusinessLogic.Tests/MediatorTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ namespace TransactionProcessorACL.BusinessLogic.Tests
{
using System.Threading;
using Microsoft.Extensions.DependencyInjection;
using TransactionProcessorACL.DataTransferObjects.Requests;
using Models;
using Services;

Expand Down Expand Up @@ -160,5 +161,12 @@ public async Task<Result<MerchantScheduleResponse>> GetMerchantSchedule(Guid est
CancellationToken cancellationToken) {
return Result.Success(new MerchantScheduleResponse());
}

public async Task<Result<MerchantDailyPerformanceSummaryResponse>> GetMerchantDailyPerformanceSummary(Guid estateId,
MerchantDailyPerformanceSummaryRequest request,
CancellationToken cancellationToken)
{
return Result.Success(new MerchantDailyPerformanceSummaryResponse());
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ namespace TransactionProcessorACL.BusinesssLogic.Tests
using System.Threading;
using System.Threading.Tasks;
using BusinessLogic.Services;
using TransactionProcessorACL.BusinessLogic.BackendAPI;
using Microsoft.Extensions.Configuration;
using Models;
using Moq;
Expand All @@ -14,6 +15,7 @@ namespace TransactionProcessorACL.BusinesssLogic.Tests
using Shared.Logger;
using Shouldly;
using Testing;
using TransactionProcessorACL.DataTransferObjects.Requests;
using TransactionProcessor.Client;
using TransactionProcessor.DataTransferObjects;
using Xunit;
Expand All @@ -30,8 +32,9 @@ public TransactionProcessorACLApplicationServiceTests()

transactionProcessorClient = new Mock<ITransactionProcessorClient>();
securityServiceClient = new Mock<ISecurityServiceClient>();
estateReportingApiClient = new Mock<IEstateReportingApiClient>();
applicationService =
new TransactionProcessorACLApplicationService(transactionProcessorClient.Object, securityServiceClient.Object);
new TransactionProcessorACLApplicationService(transactionProcessorClient.Object, securityServiceClient.Object, estateReportingApiClient.Object);
}

private void SetupMemoryConfiguration()
Expand All @@ -47,6 +50,8 @@ private void SetupMemoryConfiguration()

private Mock<ISecurityServiceClient> securityServiceClient;

private Mock<IEstateReportingApiClient> estateReportingApiClient;

private ITransactionProcessorACLApplicationService applicationService;
[Fact]
public async Task TransactionProcessorACLApplicationService_ProcessLogonTransaction_TransactionIsSuccessful()
Expand Down Expand Up @@ -587,5 +592,62 @@ public async Task TransactionProcessorACLApplicationService_GetMerchantSchedule_
var merchantScheduleResponse = await applicationService.GetMerchantSchedule(TestData.EstateId, TestData.MerchantId, TestData.ScheduleYear, CancellationToken.None);
merchantScheduleResponse.IsFailed.ShouldBeTrue();
}

[Fact]
public async Task TransactionProcessorACLApplicationService_GetMerchantDailyPerformanceSummary_ReturnedFromEstateReportingClient()
{
MerchantDailyPerformanceSummaryRequest capturedRequest = null;
estateReportingApiClient
.Setup(v => v.GetMerchantDailyPerformanceSummary(It.IsAny<String>(), It.IsAny<Guid>(), It.IsAny<MerchantDailyPerformanceSummaryRequest>(), It.IsAny<CancellationToken>()))
.Callback<String, Guid, MerchantDailyPerformanceSummaryRequest, CancellationToken>((_, _, request, _) => capturedRequest = request)
.ReturnsAsync(Result.Success(new MerchantDailyPerformanceSummaryResponse
{
Metrics =
[
new MetricItem
{
Title = "Total Sales Count",
Value = 6,
Description = "All sales transactions in the range",
Category = 0
}
]
}));
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Success(TestData.TokenResponse));

Result<MerchantDailyPerformanceSummaryResponse> result = await applicationService.GetMerchantDailyPerformanceSummary(
TestData.EstateId,
new MerchantDailyPerformanceSummaryRequest
{
MerchantReportingId = 12345,
StartDate = new DateTime(2026, 7, 1),
EndDate = new DateTime(2026, 7, 1)
},
CancellationToken.None);

result.IsSuccess.ShouldBeTrue();
result.Data.ShouldNotBeNull();
result.Data.Metrics.Count.ShouldBe(1);
capturedRequest.ShouldNotBeNull();
capturedRequest.MerchantReportingId.ShouldBe(12345);
}

[Fact]
public async Task TransactionProcessorACLApplicationService_GetMerchantDailyPerformanceSummary_GetTokenFailed_ResultIsFailed()
{
securityServiceClient.Setup(s => s.GetToken(It.IsAny<String>(), It.IsAny<String>(), It.IsAny<CancellationToken>())).ReturnsAsync(Result.Failure());

Result<MerchantDailyPerformanceSummaryResponse> result = await applicationService.GetMerchantDailyPerformanceSummary(
TestData.EstateId,
new MerchantDailyPerformanceSummaryRequest
{
MerchantReportingId = 12345,
StartDate = new DateTime(2026, 7, 1),
EndDate = new DateTime(2026, 7, 1)
},
CancellationToken.None);

result.IsFailed.ShouldBeTrue();
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
using System;
using System.Collections.Generic;
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using ClientProxyBase;
using Shared.General;
using Shared.Results;
using SimpleResults;
using TransactionProcessorACL.DataTransferObjects.Requests;
using TransactionProcessorACL.Models;

namespace TransactionProcessorACL.BusinessLogic.BackendAPI;

public class EstateReportingApiClient : ClientProxyBase.ClientProxyBase, IEstateReportingApiClient
{
private readonly Func<string, string> BaseAddressResolver;
private const string EstateIdHeaderName = "EstateId";

public EstateReportingApiClient(Func<string, string> baseAddressResolver,
HttpClient httpClient,
Func<object, string> serialise,
Func<string, Type, object> deserialise) : base(httpClient, serialise, deserialise)
{
this.BaseAddressResolver = baseAddressResolver;
}

public async Task<Result<MerchantDailyPerformanceSummaryResponse>> GetMerchantDailyPerformanceSummary(String accessToken,
Guid estateId,
MerchantDailyPerformanceSummaryRequest request,
CancellationToken cancellationToken)
{
string requestUri = this.BuildRequestUrl("/api/transactions/merchantdailyperformancesummary");

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

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

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

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

private string BuildRequestUrl(string relativePath)
{
string baseAddress = this.BaseAddressResolver("EstateReportingApi");
return $"{baseAddress.TrimEnd('/')}{relativePath}";
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using System;
using System.Threading;
using System.Threading.Tasks;
using SimpleResults;
using TransactionProcessorACL.DataTransferObjects.Requests;
using TransactionProcessorACL.Models;

namespace TransactionProcessorACL.BusinessLogic.BackendAPI;

public interface IEstateReportingApiClient
{
Task<Result<MerchantDailyPerformanceSummaryResponse>> GetMerchantDailyPerformanceSummary(String accessToken,
Guid estateId,
MerchantDailyPerformanceSummaryRequest request,
CancellationToken cancellationToken);
}
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ namespace TransactionProcessorACL.BusinessLogic.Services
using System.Threading;
using System.Threading.Tasks;
using Shared.General;
using TransactionProcessorACL.DataTransferObjects.Requests;
using TransactionProcessor.DataTransferObjects;
using TransactionProcessorACL.Models;
using GetVoucherResponse = Models.GetVoucherResponse;
Expand Down Expand Up @@ -60,5 +61,9 @@ Task<Result<MerchantScheduleResponse>> GetMerchantSchedule(Guid estateId,
Guid merchantId,
Int32 year,
CancellationToken cancellationToken);

Task<Result<MerchantDailyPerformanceSummaryResponse>> GetMerchantDailyPerformanceSummary(Guid estateId,
MerchantDailyPerformanceSummaryRequest request,
CancellationToken cancellationToken);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@ namespace TransactionProcessorACL.BusinessLogic.Services
using System.Net.Http;
using System.Threading;
using System.Threading.Tasks;
using TransactionProcessorACL.BusinessLogic.BackendAPI;
using TransactionProcessorACL.DataTransferObjects.Requests;
using Models;
using SecurityService.Client;
using Shared.General;
Expand Down Expand Up @@ -38,6 +40,11 @@ public class TransactionProcessorACLApplicationService : ITransactionProcessorAC
/// </summary>
private readonly ITransactionProcessorClient TransactionProcessorClient;

/// <summary>
/// The estate reporting client
/// </summary>
private readonly IEstateReportingApiClient? EstateReportingApiClient;

#endregion

#region Constructors
Expand All @@ -48,10 +55,12 @@ public class TransactionProcessorACLApplicationService : ITransactionProcessorAC
/// <param name="transactionProcessorClient">The transaction processor client.</param>
/// <param name="securityServiceClient">The security service client.</param>
public TransactionProcessorACLApplicationService(ITransactionProcessorClient transactionProcessorClient,
ISecurityServiceClient securityServiceClient)
ISecurityServiceClient securityServiceClient,
IEstateReportingApiClient? estateReportingApiClient = null)
{
this.TransactionProcessorClient = transactionProcessorClient;
this.SecurityServiceClient = securityServiceClient;
this.EstateReportingApiClient = estateReportingApiClient;
}

#endregion
Expand Down Expand Up @@ -416,6 +425,24 @@ public async Task<Result<MerchantScheduleResponse>> GetMerchantSchedule(Guid est
return Result.Success(merchantScheduleResponse);
}

public async Task<Result<MerchantDailyPerformanceSummaryResponse>> GetMerchantDailyPerformanceSummary(Guid estateId,
MerchantDailyPerformanceSummaryRequest request,
CancellationToken cancellationToken)
{
if (this.EstateReportingApiClient == null)
{
return Result.Failure("Estate reporting client is not configured");
}

Result<TokenResponse> accessTokenResult = await this.GetAccessToken(cancellationToken);
if (accessTokenResult.IsFailed) {
return ResultHelpers.CreateFailure(accessTokenResult);
}

TokenResponse accessToken = accessTokenResult.Data;
return await this.EstateReportingApiClient.GetMerchantDailyPerformanceSummary(accessToken.AccessToken, estateId, request, cancellationToken);
}

private static ProcessReconciliationResponse CreateProcessReconciliationResponse(ReconciliationResponse reconciliationResponse)
{
return new ProcessReconciliationResponse
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

<ItemGroup>
<ProjectReference Include="..\TransactionProcessorACL.Models\TransactionProcessorACL.Models.csproj" />
<ProjectReference Include="..\TransactionProcessorACL.DataTransferObjects\TransactionProcessorACL.DataTransferObjects.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
using System;
using System.Diagnostics.CodeAnalysis;

namespace TransactionProcessorACL.DataTransferObjects.Requests;

[ExcludeFromCodeCoverage]
public class MerchantDailyPerformanceSummaryRequest
{
public int MerchantReportingId { get; set; }

public DateTime StartDate { get; set; }

public DateTime EndDate { get; set; }
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
using System;
using System.Collections.Generic;

namespace TransactionProcessorACL.Models;

public class MerchantDailyPerformanceSummaryResponse
{
public List<MetricItem> Metrics { get; set; } = [];

public List<DrillDownTransaction> DrillDownTransactions { get; set; } = [];
}

public class MetricItem
{
public string Title { get; set; }

public decimal Value { get; set; }

public string Description { get; set; }

public int Category { get; set; }
}

public class DrillDownTransaction
{
public string Reference { get; set; }

public string Product { get; set; }

public string Status { get; set; }

public decimal Amount { get; set; }

public DateTime TransactionDateTime { get; set; }
}
2 changes: 2 additions & 0 deletions TransactionProcessorACL.Testing/TestData.cs
Original file line number Diff line number Diff line change
Expand Up @@ -189,6 +189,7 @@ public class TestData
["AppSettings:MinimumSupportedApplicationVersion"] = "1.0.5",
["AppSettings:SecurityService"] = "http://192.168.1.133:5001",
["AppSettings:TransactionProcessorApi"] = "http://192.168.1.133:5002",
["AppSettings:EstateReportingApi"] = "http://192.168.1.133:5011",
["AppSettings:ClientId"] = "ClientId",
["AppSettings:ClientSecret"] = "secret",
["SecurityConfiguration:Authority"] = "https://127.0.0.1",
Expand All @@ -202,6 +203,7 @@ public class TestData
["AppSettings:MinimumSupportedApplicationVersion"] = "1.0.5",
["AppSettings:SecurityService"] = "http://192.168.1.133:5001",
["AppSettings:TransactionProcessorApi"] = "http://192.168.1.133:5002",
["AppSettings:EstateReportingApi"] = "http://192.168.1.133:5011",
["AppSettings:ClientId"] = "ClientId",
["AppSettings:ClientSecret"] = "secret",
["SecurityConfiguration:Authority"] = "https://127.0.0.1",
Expand Down
Loading
Loading