Every repository, service, Blazor page/dialog, and test now uses
async/await. Single atomic diff; the codebase does not compile in
intermediate states.
- BaseRepository: LoadListAsync/LoadAsync/SaveAsync return Task<T>;
per-file locks use SemaphoreSlim so waiters can await; Save
serialises to a MemoryStream sync (XmlSerializer has no async
form), then File.WriteAllBytesAsync + sync File.Move.
- RepositoryCache.GetOrLoadAsync takes a Func<Task<List<T>>>.
- All 7 repository interfaces + implementations async.
- All service interfaces + implementations async (except vendor
IFxService and stateless IFxConverter / SettingsService).
- Every Blazor OnInitializedAsync switches to await base.
- Test suite fully async, 42 tests pass.
AccountRepository.EnsureAccountsFile keeps two .GetAwaiter().GetResult()
bridges because it runs from the constructor.
Null-render guard follow-up (folded in):
Blazor now renders the component once with fields at their initial
values while OnInitializedAsync awaits — so fields declared `= null!`
are actually null on that first render and things like
`accounts.GroupBy(...)` throw ArgumentNullException. Fixed across
Transactions, BalanceReport, BalanceSheetReport, ProfitLossReport,
DetailReport, Assets, Spendings, SpendingsOverTime, TransactionDialog,
TransactionSplitDialog, and BookingRuleDialog:
- Collection fields initialise to [] so first-render loops are empty.
- Single-object data fields become nullable; the razor wraps
consumption in `@if (field is null) { <p>Lädt…</p> return; }`.
- <PlotlyChart> guarded behind a null check on config/layout/data so
Plotly.Blazor's @bind doesn't see nulls.
- Header/footer strings initialise to "" instead of null!.
Architectural hygiene on a single-user local Blazor Server app: the
observed win is one File.ReadAllBytesAsync and one
File.WriteAllBytesAsync per Load/Save, and after PR D each file is
loaded at most once per SignalR circuit.
Co-Authored-By: Claude Opus 4.7 <noreply@anthropic.com>
105 lines
4 KiB
C#
105 lines
4 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using Schaad.Accounting.Datasets;
|
|
using Schaad.Accounting.Datasets.Charts;
|
|
using Schaad.Accounting.Interfaces;
|
|
|
|
namespace Schaad.Accounting.Services
|
|
{
|
|
public class ChartService : IChartService
|
|
{
|
|
private readonly ISettingsService settingsService;
|
|
private readonly IViewService viewService;
|
|
|
|
public ChartService(ISettingsService settingsService, IViewService viewService)
|
|
{
|
|
this.settingsService = settingsService;
|
|
this.viewService = viewService;
|
|
}
|
|
|
|
public async Task<IReadOnlyList<DataSerie>> GetExpensesPerMonthAsync()
|
|
{
|
|
var expenseTransactions = (await viewService.GetTransactionViewListAsync())
|
|
.Where(t => t.TargetAccount.Class == ClassIds.Expenses)
|
|
.ToList();
|
|
|
|
var distinctSubClasses = expenseTransactions
|
|
.Select(t => t.TargetAccount.SubClass)
|
|
.Distinct()
|
|
.Count();
|
|
|
|
return distinctSubClasses > 1
|
|
? GetSubClassExpensesPerMonth(expenseTransactions)
|
|
: await GetAccountExpensesPerMonthAsync();
|
|
}
|
|
|
|
private List<DataSerie> GetSubClassExpensesPerMonth(List<TransactionDataset> expenseTransactions)
|
|
{
|
|
var year = settingsService.GetYear();
|
|
var maxMonth = expenseTransactions
|
|
.OrderByDescending(t => t.ValueDate)
|
|
.FirstOrDefault()?.ValueDate.Month ?? 12;
|
|
|
|
var list = new List<DataSerie>();
|
|
foreach (var grp in expenseTransactions.GroupBy(t => t.TargetAccount.SubClass))
|
|
{
|
|
var groupedByMonth = grp
|
|
.GroupBy(t => t.ValueDate.Month)
|
|
.ToDictionary(g => g.Key, g => g.Sum(t => t.Value));
|
|
EnsureEntryForEveryMonth(groupedByMonth, maxMonth);
|
|
|
|
list.Add(new DataSerie(
|
|
Id: grp.Key.ToString(),
|
|
Name: grp.First().TargetAccount.Name,
|
|
X: groupedByMonth.OrderBy(g => g.Key).Select(g => new DateOnly(year, g.Key, 1)).ToList(),
|
|
Y: groupedByMonth.OrderBy(g => g.Key).Select(g => g.Value).ToList()
|
|
));
|
|
}
|
|
return list;
|
|
}
|
|
|
|
private async Task<List<DataSerie>> GetAccountExpensesPerMonthAsync()
|
|
{
|
|
var year = settingsService.GetYear();
|
|
var allTransactions = await viewService.GetTransactionViewListAsync();
|
|
var expenseAccounts = (await viewService.GetAccountViewListAsync()).Where(a => a.Class == ClassIds.Expenses);
|
|
|
|
var list = new List<DataSerie>();
|
|
foreach (var account in expenseAccounts)
|
|
{
|
|
var transactions = allTransactions.Where(t => t.TargetAccountId == account.Id).ToList();
|
|
if (transactions.Count == 0)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
var maxMonth = transactions.Max(t => t.ValueDate.Month);
|
|
var groupedByMonth = transactions
|
|
.GroupBy(t => t.ValueDate.Month)
|
|
.ToDictionary(g => g.Key, g => g.Sum(t => t.Value));
|
|
EnsureEntryForEveryMonth(groupedByMonth, maxMonth);
|
|
|
|
list.Add(new DataSerie(
|
|
Id: account.Id,
|
|
Name: account.Name,
|
|
X: groupedByMonth.OrderBy(g => g.Key).Select(g => new DateOnly(year, g.Key, 1)).ToList(),
|
|
Y: groupedByMonth.OrderBy(g => g.Key).Select(g => g.Value).ToList()
|
|
));
|
|
}
|
|
return list;
|
|
}
|
|
|
|
private static void EnsureEntryForEveryMonth(Dictionary<int, decimal> values, int maxMonth = 12)
|
|
{
|
|
for (int i = 1; i <= maxMonth; i++)
|
|
{
|
|
if (values.ContainsKey(i) == false)
|
|
{
|
|
values.Add(i, 0);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|