Skip to content

Reduce GetTodaysFailedSales cyclomatic complexity by extracting failed-sales query builders #513

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
Mar 17, 2026
Merged

Reduce GetTodaysFailedSales cyclomatic complexity by extracting failed-sales query builders #513

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9eb913
Initial plan
Copilot Mar 17, 2026
edaf2be
refactor failed sales queries to reduce complexity
Copilot Mar 17, 2026
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
27 changes: 21 additions & 6 deletions EstateReportingAPI.BusinessLogic/ReportingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,8 +368,8 @@ public async Task<Result<TodaysSales>> GetTodaysFailedSales(TransactionQueries.T
using ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, request.EstateId.ToString());
await using EstateManagementContext context = resolvedContext.Context;

var todaysSalesQuery = (from t in context.TodayTransactions where t.IsAuthorised == false && t.TransactionType == "Sale" && t.ResponseCode == request.ResponseCode select t.TransactionAmount);
var comparisonSalesQuery = (from t in context.TransactionHistory where t.IsAuthorised == false && t.TransactionType == "Sale" && t.TransactionDate == request.ComparisonDate && t.TransactionTime <= DateTime.Now.TimeOfDay && t.ResponseCode == request.ResponseCode select t.TransactionAmount);
IQueryable<Decimal> todaysSalesQuery = this.BuildTodaysFailedSalesQuery(context, request.ResponseCode);
IQueryable<Decimal> comparisonSalesQuery = this.BuildComparisonFailedSalesQuery(context, request.ComparisonDate, request.ResponseCode);

var todaysSalesQueryResult = await ExecuteQuerySafeToList(todaysSalesQuery, cancellationToken, "Error retrieving todays failed sales");
if (todaysSalesQueryResult.IsFailed)
Expand Down Expand Up @@ -1357,15 +1357,30 @@ private IQueryable<TodayTransaction> BuildTodaySalesQuery(EstateManagementContex
return from t in context.TodayTransactions where t.IsAuthorised && t.TransactionType == "Sale" && t.TransactionDate == DateTime.Now.Date && t.TransactionTime <= DateTime.Now.TimeOfDay select t;
}

private IQueryable<Decimal> BuildTodaysFailedSalesQuery(EstateManagementContext context,
String responseCode) {
return from t in context.TodayTransactions
where t.IsAuthorised == false && t.TransactionType == "Sale" && t.ResponseCode == responseCode
select t.TransactionAmount;
}

private IQueryable<TransactionHistory> BuildComparisonSalesQuery(EstateManagementContext context,
DateTime comparisonDate) {
DateTime comparisonDate) {
return from t in context.TransactionHistory where t.IsAuthorised && t.TransactionType == "Sale" && t.TransactionDate == comparisonDate && t.TransactionTime <= DateTime.Now.TimeOfDay select t;
}

private IQueryable<Decimal> BuildComparisonFailedSalesQuery(EstateManagementContext context,
DateTime comparisonDate,
String responseCode) {
return from t in context.TransactionHistory
where t.IsAuthorised == false && t.TransactionType == "Sale" && t.TransactionDate == comparisonDate && t.TransactionTime <= DateTime.Now.TimeOfDay && t.ResponseCode == responseCode
select t.TransactionAmount;
}

private static async Task<Result<List<ContractProductData>>> LoadProductsAsync(EstateManagementContext context,
List<Guid> contractIds,
CancellationToken cancellationToken,
string stepName) {
List<Guid> contractIds,
CancellationToken cancellationToken,
string stepName) {
var query = context.ContractProducts.Where(cp => contractIds.Contains(cp.ContractId)).Select(cp => new ContractProductData {
ContractProductId = cp.ContractProductId,
ContractProductReportingId = cp.ContractProductReportingId,
Expand Down
Loading