diff --git a/EstateReportingAPI.BusinessLogic/ReportingManager.cs b/EstateReportingAPI.BusinessLogic/ReportingManager.cs index 2f6641a..0f9f12a 100644 --- a/EstateReportingAPI.BusinessLogic/ReportingManager.cs +++ b/EstateReportingAPI.BusinessLogic/ReportingManager.cs @@ -1338,17 +1338,22 @@ public async Task> GetTodaysSettlement(SettlementQuerie // Get the settleed fees summary DatabaseProjections.SettlementGroupProjection summary = await BuildSettlementSummaryQuery(query).SingleOrDefaultAsync(cancellationToken); - return new DatabaseProjections.SettlementGroupProjection { SettledCount = summary.SettledCount, SettledValue = summary.SettledValue, UnSettledCount = summary.UnSettledCount, UnSettledValue = summary.UnSettledValue }; + if (summary == null) + return new DatabaseProjections.SettlementGroupProjection(); + + return new DatabaseProjections.SettlementGroupProjection { SettledCount = summary.SettledCount, SettledValue = summary.SettledValue, UnSettledCount = summary.UnSettledCount, UnSettledValue = summary.UnSettledValue }; } private async Task GetSettlementSummary( IQueryable query, CancellationToken cancellationToken) { - // Get the settleed fees summary DatabaseProjections.SettlementGroupProjection summary = await BuildSettlementSummaryQuery(query).SingleOrDefaultAsync(cancellationToken); + if (summary == null) + return new DatabaseProjections.SettlementGroupProjection(); + return new DatabaseProjections.SettlementGroupProjection { SettledCount = summary.SettledCount,