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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,16 @@
[JsonProperty("date")]
public DateTime Date { get; set; }
[JsonProperty("description")]
public String Description { get; set; }

Check warning on line 12 in EstateManagmentUI.BusinessLogic/BackendAPI/DataTransferObjects/DataTransferObjects.cs

View workflow job for this annotation

GitHub Actions / Build and Unit Test

Non-nullable property 'Description' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.
}

public class MerchantKpi
{
[JsonProperty("merchants_with_sale_in_last_hour")]
public Int32 MerchantsWithSaleInLastHour { get; set; }
[JsonProperty("merchants_with_no_sale_today")]
public Int32 MerchantsWithNoSaleToday { get; set; }
[JsonProperty("merchants_with_no_sale_in_last7_days")]
public Int32 MerchantsWithNoSaleInLast7Days { get; set; }
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ namespace EstateManagementUI.BusinessLogic.BackendAPI
public interface IEstateReportingApiClient
{
Task<Result<List<ComparisonDate>>> GetComparisonDates(String accessToken, Guid estateId, CancellationToken cancellationToken);
Task<Result<MerchantKpi>> GetMerchantKpi(String accessToken, Guid estateId, CancellationToken cancellationToken);
}

public class EstateReportingApiClient : ClientProxyBase.ClientProxyBase, IEstateReportingApiClient {
Expand All @@ -24,7 +25,7 @@ public EstateReportingApiClient(Func<String, String> baseAddressResolver,
public async Task<Result<List<ComparisonDate>>> GetComparisonDates(String accessToken,
Guid estateId,
CancellationToken cancellationToken) {
String requestUri = this.BuildRequestUrl("/api/dimensions/calendar/comparisondates");
String requestUri = this.BuildRequestUrl("/api/calendars/comparisondates");

try
{
Expand All @@ -48,6 +49,31 @@ public async Task<Result<List<ComparisonDate>>> GetComparisonDates(String access
}
}

public async Task<Result<MerchantKpi>> GetMerchantKpi(String accessToken, Guid estateId, CancellationToken cancellationToken)
{
String requestUri = this.BuildRequestUrl("/api/merchants/kpis");

try
{
List<(String headerName, String headerValue)> additionalHeaders = [
(EstateIdHeaderName, estateId.ToString())
];
Result<MerchantKpi>? result = await this.SendHttpGetRequest<MerchantKpi>(requestUri, accessToken, additionalHeaders, cancellationToken);

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

return result;
}
catch (Exception ex)
{
// An exception has occurred, add some additional information to the message
Exception exception = new Exception($"Error getting merchant kpis for estate {estateId}.", ex);

return Result.Failure(exception.Message);
}
}

private String BuildRequestUrl(String route)
{
String baseAddress = this.BaseAddressResolver("EstateReportingApi");
Expand Down
10 changes: 10 additions & 0 deletions EstateManagmentUI.BusinessLogic/Client/APIModelFactory.cs
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,14 @@ public static List<ComparisonDateModel> ConvertFrom(List<ComparisonDate> apiResu

return comparisonDates;
}

public static MerchantKpiModel ConvertFrom(MerchantKpi apiResult) {
MerchantKpiModel model = new MerchantKpiModel {
MerchantsWithNoSaleInLast7Days = apiResult.MerchantsWithNoSaleInLast7Days,
MerchantsWithNoSaleToday = apiResult.MerchantsWithNoSaleToday,
MerchantsWithSaleInLastHour = apiResult.MerchantsWithSaleInLastHour
};

return model;
}
}
27 changes: 27 additions & 0 deletions EstateManagmentUI.BusinessLogic/Client/MerchantMethods.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
using EstateManagementUI.BusinessLogic.Models;
using Shared.Results;
using SimpleResults;

namespace EstateManagementUI.BusinessLogic.Client
{
public partial interface IApiClient
{
Task<Result<MerchantKpiModel>> GetMerchantKpi(String accessToken, Guid actionId, Guid estateId, CancellationToken cancellationToken);
}

public partial class ApiClient : IApiClient {
public async Task<Result<MerchantKpiModel>> GetMerchantKpi(String accessToken,
Guid actionId,
Guid estateId,
CancellationToken cancellationToken) {
var apiResult = await this.EstateReportingApiClient.GetMerchantKpi(accessToken, estateId, cancellationToken);

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

MerchantKpiModel merchantKpiModel = APIModelFactory.ConvertFrom(apiResult.Data);

return Result.Success(merchantKpiModel);
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
using SimpleResults;
using System.Threading.Tasks;
using SecurityService.Client;
using SecurityService.DataTransferObjects.Responses;
using Shared.Results;

namespace EstateManagementUI.BusinessLogic.RequestHandlers
Expand Down Expand Up @@ -261,10 +262,11 @@ public class DashboardRequestHandler : IRequestHandler<Queries.GetTodaysSalesQue
IRequestHandler<Queries.GetTransactionDetailQuery, Result<List<TransactionDetailModel>>>
{
private readonly IApiClient ApiClient;
private readonly ISecurityServiceClient SecurityServiceClient;

public DashboardRequestHandler(IApiClient apiClient)
{
public DashboardRequestHandler(IApiClient apiClient, ISecurityServiceClient securityServiceClient) {
this.ApiClient = apiClient;
this.SecurityServiceClient = securityServiceClient;
}

// Implementations similar to above handlers returning stub data
Expand All @@ -290,7 +292,14 @@ public async Task<Result<List<TodaysSalesValueByHourModel>>> Handle(Queries.GetT

public async Task<Result<MerchantKpiModel>> Handle(Queries.GetMerchantKpiQuery request,
CancellationToken cancellationToken) {
return Result.Success(StubTestData.GetMockMerchantKpi());

// Get a token here
Result<TokenResponse>? token = await this.SecurityServiceClient.GetToken("serviceClient", "d192cbc46d834d0da90e8a9d50ded543", cancellationToken);
if (token.IsFailed)
return ResultHelpers.CreateFailure(token);

return await this.ApiClient.GetMerchantKpi(token.Data.AccessToken, request.CorrelationId.Value, request.EstateId, cancellationToken);

}

public async Task<Result<TodaysSalesModel>> Handle(Queries.GetTodaysFailedSalesQuery request,
Expand Down
Loading