Skip to content

Client changes missed from last PR #62

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 2 commits into from
Jan 29, 2024
Merged

Client changes missed from last PR #62

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4449784
Client changes missed from last PR
StuartFerguson Jan 29, 2024
8bd46aa
Merge branch 'main' into task/#59_merchantandoperatorfiltering
StuartFerguson Jan 29, 2024
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
20 changes: 10 additions & 10 deletions EstateReportingAPI.Client/EstateReportingApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,10 +368,10 @@ public async Task<List<Operator>> GetOperators(String accessToken, Guid estateId
return response;
}

public async Task<TodaysSales> GetTodaysFailedSales(String accessToken, Guid estateId, String responseCode, DateTime comparisonDate, CancellationToken cancellationToken){
public async Task<TodaysSales> GetTodaysFailedSales(String accessToken, Guid estateId, Guid merchantId, Guid operatorId, String responseCode, DateTime comparisonDate, CancellationToken cancellationToken){
TodaysSales response = null;

String requestUri = this.BuildRequestUrl($"/api/facts/transactions/todaysfailedsales?comparisonDate={comparisonDate.Date:yyyy-MM-dd}&responseCode={responseCode}");
String requestUri = this.BuildRequestUrl($"/api/facts/transactions/todaysfailedsales?comparisonDate={comparisonDate.Date:yyyy-MM-dd}&merchantId={merchantId}&operatorId={operatorId}&responseCode={responseCode}");

try{
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestUri);
Expand All @@ -397,10 +397,10 @@ public async Task<TodaysSales> GetTodaysFailedSales(String accessToken, Guid est
return response;
}

public async Task<TodaysSales> GetTodaysSales(String accessToken, Guid estateId, DateTime comparisonDate, CancellationToken cancellationToken){
public async Task<TodaysSales> GetTodaysSales(String accessToken, Guid estateId,Guid merchantId, Guid operatorId, DateTime comparisonDate, CancellationToken cancellationToken){
TodaysSales response = null;

String requestUri = this.BuildRequestUrl($"/api/facts/transactions/todayssales?comparisonDate={comparisonDate.Date:yyyy-MM-dd}");
String requestUri = this.BuildRequestUrl($"/api/facts/transactions/todayssales?comparisonDate={comparisonDate.Date:yyyy-MM-dd}&merchantId={merchantId}&operatorId={operatorId}");

try{
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestUri);
Expand All @@ -426,10 +426,10 @@ public async Task<TodaysSales> GetTodaysSales(String accessToken, Guid estateId,
return response;
}

public async Task<List<TodaysSalesCountByHour>> GetTodaysSalesCountByHour(String accessToken, Guid estateId, DateTime comparisonDate, CancellationToken cancellationToken){
public async Task<List<TodaysSalesCountByHour>> GetTodaysSalesCountByHour(String accessToken, Guid estateId, Guid merchantId, Guid operatorId, DateTime comparisonDate, CancellationToken cancellationToken){
List<TodaysSalesCountByHour> response = null;

String requestUri = this.BuildRequestUrl($"/api/facts/transactions/todayssales/countbyhour?comparisonDate={comparisonDate.Date:yyyy-MM-dd}");
String requestUri = this.BuildRequestUrl($"/api/facts/transactions/todayssales/countbyhour?comparisonDate={comparisonDate.Date:yyyy-MM-dd}&merchantId={merchantId}&operatorId={operatorId}");

try{
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestUri);
Expand All @@ -455,10 +455,10 @@ public async Task<List<TodaysSalesCountByHour>> GetTodaysSalesCountByHour(String
return response;
}

public async Task<List<TodaysSalesValueByHour>> GetTodaysSalesValueByHour(String accessToken, Guid estateId, DateTime comparisonDate, CancellationToken cancellationToken){
public async Task<List<TodaysSalesValueByHour>> GetTodaysSalesValueByHour(String accessToken, Guid estateId, Guid merchantId, Guid operatorId, DateTime comparisonDate, CancellationToken cancellationToken){
List<TodaysSalesValueByHour> response = null;

String requestUri = this.BuildRequestUrl($"/api/facts/transactions/todayssales/valuebyhour?comparisonDate={comparisonDate.Date:yyyy-MM-dd}");
String requestUri = this.BuildRequestUrl($"/api/facts/transactions/todayssales/valuebyhour?comparisonDate={comparisonDate.Date:yyyy-MM-dd}&merchantId={merchantId}&operatorId={operatorId}");

try{
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestUri);
Expand All @@ -484,10 +484,10 @@ public async Task<List<TodaysSalesValueByHour>> GetTodaysSalesValueByHour(String
return response;
}

public async Task<TodaysSettlement> GetTodaysSettlement(String accessToken, Guid estateId, DateTime comparisonDate, CancellationToken cancellationToken){
public async Task<TodaysSettlement> GetTodaysSettlement(String accessToken, Guid estateId, Guid merchantId, Guid operatorId, DateTime comparisonDate, CancellationToken cancellationToken){
TodaysSettlement response = null;

String requestUri = this.BuildRequestUrl($"/api/facts/settlements/todayssettlement?comparisonDate={comparisonDate.Date:yyyy-MM-dd}");
String requestUri = this.BuildRequestUrl($"/api/facts/settlements/todayssettlement?comparisonDate={comparisonDate.Date:yyyy-MM-dd}&merchantId={merchantId}&operatorId={operatorId}");

try{
HttpRequestMessage request = new HttpRequestMessage(HttpMethod.Get, requestUri);
Expand Down
10 changes: 5 additions & 5 deletions EstateReportingAPI.Client/IEstateReportingApiClient.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ public interface IEstateReportingApiClient{
Task<List<CalendarDate>> GetCalendarDates(String accessToken, Guid estateId, Int32 year, CancellationToken cancellationToken);
Task<List<CalendarYear>> GetCalendarYears(String accessToken, Guid estateId, CancellationToken cancellationToken);
Task<List<ComparisonDate>> GetComparisonDates(String accessToken, Guid estateId, CancellationToken cancellationToken);
Task<TodaysSales> GetTodaysSales(String accessToken, Guid estateId, DateTime comparisonDate, CancellationToken cancellationToken);
Task<List<TodaysSalesCountByHour>> GetTodaysSalesCountByHour(String accessToken, Guid estateId, DateTime comparisonDate, CancellationToken cancellationToken);
Task<List<TodaysSalesValueByHour>> GetTodaysSalesValueByHour(String accessToken, Guid estateId, DateTime comparisonDate, CancellationToken cancellationToken);
Task<TodaysSettlement> GetTodaysSettlement(String accessToken, Guid estateId, DateTime comparisonDate, CancellationToken cancellationToken);
Task<TodaysSales> GetTodaysSales(String accessToken, Guid estateId, Guid merchantId, Guid operatorId, DateTime comparisonDate, CancellationToken cancellationToken);
Task<List<TodaysSalesCountByHour>> GetTodaysSalesCountByHour(String accessToken, Guid estateId, Guid merchantId, Guid operatorId, DateTime comparisonDate, CancellationToken cancellationToken);
Task<List<TodaysSalesValueByHour>> GetTodaysSalesValueByHour(String accessToken, Guid estateId, Guid merchantId, Guid operatorId, DateTime comparisonDate, CancellationToken cancellationToken);
Task<TodaysSettlement> GetTodaysSettlement(String accessToken, Guid estateId, Guid merchantId, Guid operatorId, DateTime comparisonDate, CancellationToken cancellationToken);
Task<MerchantKpi> GetMerchantKpi(String accessToken, Guid estateId, CancellationToken cancellationToken);

Task<TodaysSales> GetTodaysFailedSales(String accessToken, Guid estateId, String responseCode, DateTime comparisonDate, CancellationToken cancellationToken);
Task<TodaysSales> GetTodaysFailedSales(String accessToken, Guid estateId, Guid merchantId, Guid operatorId, String responseCode, DateTime comparisonDate, CancellationToken cancellationToken);

Task<List<TopBottomOperatorData>> GetTopBottomOperatorData(String accessToken, Guid estateId, TopBottom topBottom, Int32 resultCount, CancellationToken cancellationToken);
Task<List<TopBottomMerchantData>> GetTopBottomMerchantData(String accessToken, Guid estateId, TopBottom topBottom, Int32 resultCount, CancellationToken cancellationToken);
Expand Down