From 5d2b1a250e6ad8c2b5b03ef89b2827f3d49f0c14 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Sat, 11 Oct 2025 12:18:03 +0100 Subject: [PATCH 1/2] some fixes --- .../ReportingManager.cs | 25 +++++++++---------- ...urationReaderConnectionStringRepository.cs | 4 +-- .../Controllers/DimensionsController.cs | 2 +- .../Controllers/FactSettlementController.cs | 4 +-- .../Controllers/FactTransactionsController.cs | 2 +- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/EstateReportingAPI.BusinessLogic/ReportingManager.cs b/EstateReportingAPI.BusinessLogic/ReportingManager.cs index dac94ae..b1e6dd0 100644 --- a/EstateReportingAPI.BusinessLogic/ReportingManager.cs +++ b/EstateReportingAPI.BusinessLogic/ReportingManager.cs @@ -339,8 +339,8 @@ public async Task GetTodaysFailedSales(Guid estateId, DateTime comp return response; } - private async Task> GetTodaysSales(EstateManagementContext context, - Int32 merchantReportingId, Int32 operatorReportingId, CancellationToken cancellationToken){ + private IQueryable 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 @@ -359,10 +359,9 @@ private async Task> GetTodaysSales(EstateManagement return salesForDate; } - private async Task> GetSalesForDate(EstateManagementContext context, + private IQueryable 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" @@ -387,8 +386,8 @@ public async Task GetTodaysSales(Guid estateId, Int32 merchantRepor using ResolvedDbContext? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, estateId.ToString()); await using EstateManagementContext context = resolvedContext.Context; - IQueryable todaysSales = await GetTodaysSales(context, merchantReportingId, operatorReportingId, cancellationToken); - IQueryable comparisonSales = await GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId, cancellationToken); + IQueryable todaysSales = GetTodaysSales(context, merchantReportingId, operatorReportingId); + IQueryable comparisonSales = GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId); var todaysSalesValue = await todaysSales.SumAsync(t => t.TransactionAmount, cancellationToken); var todaysSalesCount = await todaysSales.CountAsync(cancellationToken); @@ -410,8 +409,8 @@ public async Task> GetTodaysSalesCountByHour(Guid e using ResolvedDbContext? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, estateId.ToString()); await using EstateManagementContext context = resolvedContext.Context; - IQueryable todaysSales = await GetTodaysSales(context, merchantReportingId, operatorReportingId, cancellationToken); - IQueryable comparisonSales = await GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId, cancellationToken); + IQueryable todaysSales = GetTodaysSales(context, merchantReportingId, operatorReportingId); + IQueryable comparisonSales = GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId); // First we need to get a value of todays sales var todaysSalesByHour = await (from t in todaysSales @@ -447,8 +446,8 @@ public async Task> GetTodaysSalesValueByHour(Guid e using ResolvedDbContext? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, estateId.ToString()); await using EstateManagementContext context = resolvedContext.Context; - IQueryable todaysSales = await GetTodaysSales(context, merchantReportingId, operatorReportingId, cancellationToken); - IQueryable comparisonSales = await GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId, cancellationToken); + IQueryable todaysSales = GetTodaysSales(context, merchantReportingId, operatorReportingId); + IQueryable comparisonSales = GetSalesForDate(context, comparisonDate, merchantReportingId, operatorReportingId); // First we need to get a value of todays sales var todaysSalesByHour = await (from t in todaysSales @@ -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> GetTodaysSettlement(EstateManagementContext? context, Int32 merchantReportingId, Int32 operatorReportingId, CancellationToken cancellationToken) + private IQueryable 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 @@ -533,7 +532,7 @@ public async Task GetTodaysSettlement(Guid estateId, Int32 mer using ResolvedDbContext? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, estateId.ToString()); await using EstateManagementContext context = resolvedContext.Context; - IQueryable todaySettlementData = await GetTodaysSettlement(context, merchantReportingId, operatorReportingId, cancellationToken); + IQueryable todaySettlementData = GetTodaysSettlement(context, merchantReportingId, operatorReportingId); IQueryable comparisonSettlementData = await GetSettlementDataForDate(context, merchantReportingId, operatorReportingId, comparisonDate, cancellationToken); var todaySettlement = await (from f in todaySettlementData diff --git a/EstateReportingAPI/Common/ConfigurationReaderConnectionStringRepository.cs b/EstateReportingAPI/Common/ConfigurationReaderConnectionStringRepository.cs index b8ee7ee..5a2f2bc 100644 --- a/EstateReportingAPI/Common/ConfigurationReaderConnectionStringRepository.cs +++ b/EstateReportingAPI/Common/ConfigurationReaderConnectionStringRepository.cs @@ -32,9 +32,7 @@ public async Task GetConnectionString(String externalIdentifier, { String connectionString = string.Empty; String databaseName = string.Empty; - - String databaseEngine = ConfigurationReader.GetValue("AppSettings", "DatabaseEngine"); - + databaseName = $"{connectionStringIdentifier}{externalIdentifier}"; connectionString = ConfigurationReader.GetConnectionString(connectionStringIdentifier); diff --git a/EstateReportingAPI/Controllers/DimensionsController.cs b/EstateReportingAPI/Controllers/DimensionsController.cs index d75af0e..5fd8151 100644 --- a/EstateReportingAPI/Controllers/DimensionsController.cs +++ b/EstateReportingAPI/Controllers/DimensionsController.cs @@ -30,7 +30,7 @@ public DimensionsController(IMediator mediator) { /// /// The controller name /// - public const String ControllerName = "dimensions"; + private const String ControllerName = "dimensions"; /// /// The controller route diff --git a/EstateReportingAPI/Controllers/FactSettlementController.cs b/EstateReportingAPI/Controllers/FactSettlementController.cs index 8f60169..d1036f3 100644 --- a/EstateReportingAPI/Controllers/FactSettlementController.cs +++ b/EstateReportingAPI/Controllers/FactSettlementController.cs @@ -28,7 +28,7 @@ public class FactSettlementsController : ControllerBase /// /// The controller name /// - public const String ControllerName = "settlements"; + private const String ControllerName = "settlements"; /// /// The controller route @@ -142,7 +142,7 @@ public async Task GetUnsettledFees([FromHeader] Guid estateId, FeesCount = unsettledFee.FeesCount, FeesValue = unsettledFee.FeesValue }); - }; + } return Result.Success(response).ToActionResultX(); } diff --git a/EstateReportingAPI/Controllers/FactTransactionsController.cs b/EstateReportingAPI/Controllers/FactTransactionsController.cs index 38b29db..ce8f824 100644 --- a/EstateReportingAPI/Controllers/FactTransactionsController.cs +++ b/EstateReportingAPI/Controllers/FactTransactionsController.cs @@ -32,7 +32,7 @@ public class FactTransactionsController : ControllerBase{ /// /// The controller name /// - public const String ControllerName = "transactions"; + private const String ControllerName = "transactions"; /// /// The controller route From 41d2abfed2730a401480f7a7c9283012ca28f8b4 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Sat, 11 Oct 2025 12:20:51 +0100 Subject: [PATCH 2/2] :| --- EstateReportingAPI.BusinessLogic/ReportingManager.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/EstateReportingAPI.BusinessLogic/ReportingManager.cs b/EstateReportingAPI.BusinessLogic/ReportingManager.cs index b1e6dd0..950b8b1 100644 --- a/EstateReportingAPI.BusinessLogic/ReportingManager.cs +++ b/EstateReportingAPI.BusinessLogic/ReportingManager.cs @@ -481,11 +481,11 @@ on today.Hour equals comparison.Hour return response; } - private async Task> GetSettlementDataForDate(EstateManagementContext context, Int32 merchantReportingId, Int32 operatorReportingId, DateTime queryDate, CancellationToken cancellationToken) + private IQueryable 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 @@ -533,7 +533,7 @@ public async Task GetTodaysSettlement(Guid estateId, Int32 mer await using EstateManagementContext context = resolvedContext.Context; IQueryable todaySettlementData = GetTodaysSettlement(context, merchantReportingId, operatorReportingId); - IQueryable comparisonSettlementData = await GetSettlementDataForDate(context, merchantReportingId, operatorReportingId, comparisonDate, cancellationToken); + IQueryable comparisonSettlementData = GetSettlementDataForDate(context, merchantReportingId, operatorReportingId, comparisonDate); var todaySettlement = await (from f in todaySettlementData group f by f.IsSettled into grouped