Skip to content

Refactor GetTransactionDetailReport to reduce cyclomatic complexity below 50-line limit #473

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 3 commits into from
Feb 27, 2026
Merged

Refactor GetTransactionDetailReport to reduce cyclomatic complexity below 50-line limit #473

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7b0ce0e
Initial plan
Copilot Feb 27, 2026
14ec25f
Refactor GetTransactionDetailReport to reduce method length from 85 t…
Copilot Feb 27, 2026
052c0a7
Merge branch 'main' into copilot/refactor-get-transaction-detail-report
StuartFerguson Feb 27, 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
87 changes: 53 additions & 34 deletions EstateReportingAPI.BusinessLogic/ReportingManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -653,12 +653,26 @@ public async Task<Result<Operator>> GetOperator(OperatorQueries.GetOperatorQuery

public async Task<Result<TransactionDetailReportResponse>> GetTransactionDetailReport(TransactionQueries.TransactionDetailReportQuery request,
CancellationToken cancellationToken) {

TransactionDetailReportResponse response = null;
using ResolvedDbContext<EstateManagementContext>? resolvedContext = this.Resolver.Resolve(EstateManagementDatabaseName, request.EstateId.ToString());
await using EstateManagementContext context = resolvedContext.Context;

var query = from t in context.Transactions
var query = ApplyTransactionDetailFilters(BuildTransactionDetailBaseQuery(context, request.Request), request.Request);
var queryResult = await ExecuteQuerySafeToList(query, cancellationToken, "Error retrieving transaction details report");

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

var queryResults = queryResult.Data;

if (queryResults.Any() == false)
return new TransactionDetailReportResponse { Summary = new TransactionDetailSummary(), Transactions = new List<TransactionDetail>() };

return Result.Success(MapToTransactionDetailResponse(queryResults));
}

private static IQueryable<TransactionDetailQueryResult> BuildTransactionDetailBaseQuery(EstateManagementContext context,
TransactionDetailReportRequest request) {
return from t in context.Transactions
join cp in context.ContractProducts on new { t.ContractProductId, t.ContractId } equals new { cp.ContractProductId, cp.ContractId }
join m in context.Merchants on t.MerchantId equals m.MerchantId
join o in context.Operators on t.OperatorId equals o.OperatorId
Expand All @@ -667,10 +681,10 @@ from msf in msfJoin.DefaultIfEmpty()
// left join Settlements (msf may be null)
join s in context.Settlements on msf.SettlementId equals s.SettlementId into sJoin
from s in sJoin.DefaultIfEmpty()
where t.TransactionType != "Logon" && t.TransactionDate >= request.Request.StartDate && t.TransactionDate <= request.Request.EndDate
select new {
t.TransactionId,
t.TransactionDateTime,
where t.TransactionType != "Logon" && t.TransactionDate >= request.StartDate && t.TransactionDate <= request.EndDate
select new TransactionDetailQueryResult {
TransactionId = t.TransactionId,
TransactionDateTime = t.TransactionDateTime,
MerchantId = m.MerchantId,
MerchantReportingId = m.MerchantReportingId,
MerchantName = m.Name,
Expand All @@ -686,33 +700,21 @@ from s in sJoin.DefaultIfEmpty()
FeeValue = msf != null ? msf.FeeValue : 0m,
SettlementId = s != null ? s.SettlementId : Guid.Empty,
};
}

// Now apply the filters
if (request.Request.Merchants != null && request.Request.Merchants.Any()) {
query = query.Where(q => request.Request.Merchants.Contains(q.MerchantReportingId));
}

if (request.Request.Products != null && request.Request.Products.Any()) {
query = query.Where(q => request.Request.Products.Contains(q.ContractProductReportingId));
}

if (request.Request.Operators != null && request.Request.Operators.Any()) {
query = query.Where(q => request.Request.Operators.Contains(q.OperatorReportingId));
}

var queryResult = await ExecuteQuerySafeToList(query, cancellationToken, "Error retrieving transaction details report");

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

// Ok now enumerate the results
var queryResults = queryResult.Data;

if (queryResults.Any() == false)
return new TransactionDetailReportResponse { Summary = new TransactionDetailSummary(), Transactions = new List<TransactionDetail>() };
private static IQueryable<TransactionDetailQueryResult> ApplyTransactionDetailFilters(IQueryable<TransactionDetailQueryResult> query,
TransactionDetailReportRequest request) {
if (request.Merchants != null && request.Merchants.Any())
query = query.Where(q => request.Merchants.Contains(q.MerchantReportingId));
if (request.Products != null && request.Products.Any())
query = query.Where(q => request.Products.Contains(q.ContractProductReportingId));
if (request.Operators != null && request.Operators.Any())
query = query.Where(q => request.Operators.Contains(q.OperatorReportingId));
return query;
}

// Now to translate the results
response = new TransactionDetailReportResponse {
private static TransactionDetailReportResponse MapToTransactionDetailResponse(List<TransactionDetailQueryResult> queryResults) {
return new TransactionDetailReportResponse {
Transactions = queryResults.Select(q => new TransactionDetail {
Id = q.TransactionId,
DateTime = q.TransactionDateTime,
Expand All @@ -733,8 +735,6 @@ from s in sJoin.DefaultIfEmpty()
}).ToList(),
Summary = new TransactionDetailSummary { TransactionCount = queryResults.Count(), TotalValue = queryResults.Sum(q => q.Value), TotalFees = queryResults.Sum(q => q.FeeValue) }
};

return Result.Success(response);
}

public async Task<Result<TransactionSummaryByMerchantResponse>> GetTransactionSummaryByMerchantReport(TransactionQueries.TransactionSummaryByMerchantQuery request,
Expand Down Expand Up @@ -1386,6 +1386,25 @@ private static List<Contract> BuildContracts(List<ContractBaseData> baseContract
}).ToList();
}

private sealed class TransactionDetailQueryResult {
public Guid TransactionId { get; init; }
public DateTime TransactionDateTime { get; init; }
public Guid MerchantId { get; init; }
public int MerchantReportingId { get; init; }
public string? MerchantName { get; init; }
public Guid OperatorId { get; init; }
public int OperatorReportingId { get; init; }
public string? OperatorName { get; init; }
public string? ProductName { get; init; }
public Guid ContractProductId { get; init; }
public int ContractProductReportingId { get; init; }
public string? TransactionType { get; init; }
public string? Status { get; init; }
public decimal Value { get; init; }
public decimal FeeValue { get; init; }
public Guid SettlementId { get; init; }
}

private sealed class ContractBaseData {
public Guid ContractId { get; init; }
public int ContractReportingId { get; init; }
Expand Down
Loading