Skip to content

some fixes #281

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
merged 2 commits into from
Oct 11, 2025
Merged

some fixes #281

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
5d2b1a2
some fixes
StuartFerguson Oct 11, 2025
41d2abf
:|
StuartFerguson Oct 11, 2025
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
31 changes: 15 additions & 16 deletions EstateReportingAPI.BusinessLogic/ReportingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,8 @@ public async Task<TodaysSales> GetTodaysFailedSales(Guid estateId, DateTime comp
return response;
}

private async Task<IQueryable<TodayTransaction>> GetTodaysSales(EstateManagementContext context,
Int32 merchantReportingId, Int32 operatorReportingId, CancellationToken cancellationToken){
private IQueryable<TodayTransaction> GetTodaysSales(EstateManagementContext context,
Int32 merchantReportingId, Int32 operatorReportingId){
var salesForDate = (from t in context.TodayTransactions
where t.IsAuthorised && t.TransactionType == "Sale"
&& t.TransactionDate == DateTime.Now.Date
Expand All @@ -359,10 +359,9 @@ private async Task<IQueryable<TodayTransaction>> GetTodaysSales(EstateManagement
return salesForDate;
}

private async Task<IQueryable<TransactionHistory>> GetSalesForDate(EstateManagementContext context,
private IQueryable<TransactionHistory> GetSalesForDate(EstateManagementContext context,
DateTime queryDate,
Int32 merchantReportingId, Int32 operatorReportingId,
CancellationToken cancellationToken)
Int32 merchantReportingId, Int32 operatorReportingId)
{
var salesForDate = (from t in context.TransactionHistory
where t.IsAuthorised && t.TransactionType == "Sale"
Expand All @@ -387,8 +386,8 @@ public async Task<TodaysSales> GetTodaysSales(Guid estateId, Int32 merchantRepor
using ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, estateId.ToString());
await using EstateManagementContext context = resolvedContext.Context;

IQueryable<TodayTransaction> todaysSales = await GetTodaysSales(context, merchantReportingId, operatorReportingId, cancellationToken);
IQueryable<TransactionHistory> comparisonSales = await GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId, cancellationToken);
IQueryable<TodayTransaction> todaysSales = GetTodaysSales(context, merchantReportingId, operatorReportingId);
IQueryable<TransactionHistory> comparisonSales = GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId);

var todaysSalesValue = await todaysSales.SumAsync(t => t.TransactionAmount, cancellationToken);
var todaysSalesCount = await todaysSales.CountAsync(cancellationToken);
Expand All @@ -410,8 +409,8 @@ public async Task<List<TodaysSalesCountByHour>> GetTodaysSalesCountByHour(Guid e
using ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, estateId.ToString());
await using EstateManagementContext context = resolvedContext.Context;

IQueryable<TodayTransaction> todaysSales = await GetTodaysSales(context, merchantReportingId, operatorReportingId, cancellationToken);
IQueryable<TransactionHistory> comparisonSales = await GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId, cancellationToken);
IQueryable<TodayTransaction> todaysSales = GetTodaysSales(context, merchantReportingId, operatorReportingId);
IQueryable<TransactionHistory> comparisonSales = GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId);

// First we need to get a value of todays sales
var todaysSalesByHour = await (from t in todaysSales
Expand Down Expand Up @@ -447,8 +446,8 @@ public async Task<List<TodaysSalesValueByHour>> GetTodaysSalesValueByHour(Guid e
using ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, estateId.ToString());
await using EstateManagementContext context = resolvedContext.Context;

IQueryable<TodayTransaction> todaysSales = await GetTodaysSales(context, merchantReportingId, operatorReportingId, cancellationToken);
IQueryable<TransactionHistory> comparisonSales = await GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId, cancellationToken);
IQueryable<TodayTransaction> todaysSales = GetTodaysSales(context, merchantReportingId, operatorReportingId);
IQueryable<TransactionHistory> comparisonSales = GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId);

// First we need to get a value of todays sales
var todaysSalesByHour = await (from t in todaysSales
Expand Down Expand Up @@ -482,11 +481,11 @@ on today.Hour equals comparison.Hour
return response;
}

private async Task<IQueryable<MerchantSettlementFee>> GetSettlementDataForDate(EstateManagementContext context, Int32 merchantReportingId, Int32 operatorReportingId, DateTime queryDate, CancellationToken cancellationToken)
private IQueryable<MerchantSettlementFee> GetSettlementDataForDate(EstateManagementContext context, Int32 merchantReportingId, Int32 operatorReportingId, DateTime queryDate)
{
if (queryDate.Date == DateTime.Today.Date)
{
return await this.GetTodaysSettlement(context, merchantReportingId, operatorReportingId, cancellationToken);
return this.GetTodaysSettlement(context, merchantReportingId, operatorReportingId);
}

var settlementData = (from s in context.Settlements
Expand All @@ -508,7 +507,7 @@ join t in context.TransactionHistory on f.TransactionId equals t.TransactionId
return settlementData.AsQueryable().Select(s => s.Fees);
}

private async Task<IQueryable<MerchantSettlementFee>> GetTodaysSettlement(EstateManagementContext? context, Int32 merchantReportingId, Int32 operatorReportingId, CancellationToken cancellationToken)
private IQueryable<MerchantSettlementFee> GetTodaysSettlement(EstateManagementContext? context, Int32 merchantReportingId, Int32 operatorReportingId)
{
var settlementData = (from s in context.Settlements
join f in context.MerchantSettlementFees on s.SettlementId equals f.SettlementId
Expand All @@ -533,8 +532,8 @@ public async Task<TodaysSettlement> GetTodaysSettlement(Guid estateId, Int32 mer
using ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, estateId.ToString());
await using EstateManagementContext context = resolvedContext.Context;

IQueryable<MerchantSettlementFee> todaySettlementData = await GetTodaysSettlement(context, merchantReportingId, operatorReportingId, cancellationToken);
IQueryable<MerchantSettlementFee> comparisonSettlementData = await GetSettlementDataForDate(context, merchantReportingId, operatorReportingId, comparisonDate, cancellationToken);
IQueryable<MerchantSettlementFee> todaySettlementData = GetTodaysSettlement(context, merchantReportingId, operatorReportingId);
IQueryable<MerchantSettlementFee> comparisonSettlementData = GetSettlementDataForDate(context, merchantReportingId, operatorReportingId, comparisonDate);

var todaySettlement = await (from f in todaySettlementData
group f by f.IsSettled into grouped
Expand Down
4 changes: 1 addition & 3 deletions EstateReportingAPI/Common/ConfigurationReaderConnectionStringRepository.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ public async Task<String> GetConnectionString(String externalIdentifier,
{
String connectionString = string.Empty;
String databaseName = string.Empty;

String databaseEngine = ConfigurationReader.GetValue("AppSettings", "DatabaseEngine");


databaseName = $"{connectionStringIdentifier}{externalIdentifier}";
connectionString = ConfigurationReader.GetConnectionString(connectionStringIdentifier);

Expand Down
2 changes: 1 addition & 1 deletion EstateReportingAPI/Controllers/DimensionsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public DimensionsController(IMediator mediator) {
/// <summary>
/// The controller name
/// </summary>
public const String ControllerName = "dimensions";
private const String ControllerName = "dimensions";

/// <summary>
/// The controller route
Expand Down
4 changes: 2 additions & 2 deletions EstateReportingAPI/Controllers/FactSettlementController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public class FactSettlementsController : ControllerBase
/// <summary>
/// The controller name
/// </summary>
public const String ControllerName = "settlements";
private const String ControllerName = "settlements";

/// <summary>
/// The controller route
Expand Down Expand Up @@ -142,7 +142,7 @@ public async Task<IActionResult> GetUnsettledFees([FromHeader] Guid estateId,
FeesCount = unsettledFee.FeesCount,
FeesValue = unsettledFee.FeesValue
});
};
}

return Result.Success(response).ToActionResultX();
}
Expand Down
2 changes: 1 addition & 1 deletion EstateReportingAPI/Controllers/FactTransactionsController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public class FactTransactionsController : ControllerBase{
/// <summary>
/// The controller name
/// </summary>
public const String ControllerName = "transactions";
private const String ControllerName = "transactions";

/// <summary>
/// The controller route
Expand Down
Loading