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>
110 lines
3.8 KiB
C#
110 lines
3.8 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.IO;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using Microsoft.Extensions.Logging;
|
|
using Schaad.Accounting.Interfaces;
|
|
using Schaad.Accounting.Models;
|
|
|
|
namespace Schaad.Accounting.Repositories
|
|
{
|
|
public class AccountRepository : BaseRepository, IAccountRepository
|
|
{
|
|
private readonly string ACCOUNTS = "Accounts.xml";
|
|
|
|
public AccountRepository(ISettingsService settingsService, RepositoryCache cache, ILogger<AccountRepository> logger)
|
|
: base(settingsService, cache, logger)
|
|
{
|
|
EnsureAccountsFile();
|
|
}
|
|
|
|
public Task<List<Account>> GetAccountListAsync() => LoadListAsync<Account>(ACCOUNTS);
|
|
|
|
public async Task SaveAccountAsync(Account account)
|
|
{
|
|
if (string.IsNullOrEmpty(account.Currency))
|
|
{
|
|
account.Currency = "CHF";
|
|
}
|
|
|
|
var accounts = await GetAccountListAsync();
|
|
var idx = accounts.FindIndex(a => a.Id == account.Id);
|
|
if (idx >= 0)
|
|
{
|
|
accounts[idx] = account;
|
|
}
|
|
else
|
|
{
|
|
account.Id = Guid.NewGuid().ToString();
|
|
accounts.Add(account);
|
|
}
|
|
await SaveAsync(accounts, ACCOUNTS);
|
|
}
|
|
|
|
public async Task<Account> GetAccountAsync(string id)
|
|
{
|
|
var accounts = await GetAccountListAsync();
|
|
return accounts.FirstOrDefault(t => t.Id == id);
|
|
}
|
|
|
|
public async Task DeleteAccountAsync(string id)
|
|
{
|
|
var accounts = await GetAccountListAsync();
|
|
accounts.RemoveAll(t => t.Id == id);
|
|
await SaveAsync(accounts, ACCOUNTS);
|
|
}
|
|
|
|
public async Task<Account> GetAccountForBankAccountNumberAsync(string bankAccountNumber)
|
|
{
|
|
var accounts = await GetAccountListAsync();
|
|
return accounts.SingleOrDefault(t => t.BankAccountNumber == bankAccountNumber);
|
|
}
|
|
|
|
public async Task SaveBankAccountBalanceAsync(string bankAccountNumber, decimal accountBalance)
|
|
{
|
|
var account = await GetAccountForBankAccountNumberAsync(bankAccountNumber);
|
|
account.LastBankBalance = accountBalance;
|
|
await SaveAccountAsync(account);
|
|
}
|
|
|
|
private void EnsureAccountsFile()
|
|
{
|
|
string filePath = Path.Combine(settingsService.GetDbPath(), ACCOUNTS);
|
|
if (File.Exists(filePath))
|
|
{
|
|
return;
|
|
}
|
|
|
|
var lastYearFile = Path.Combine(settingsService.GetLastYearDbPath(), ACCOUNTS);
|
|
if (File.Exists(lastYearFile))
|
|
{
|
|
File.Copy(lastYearFile, filePath);
|
|
}
|
|
|
|
// Year rollover: seed start balances from the previous year's closing values.
|
|
// Bank accounts start at the last known bank balance; cash accounts start at zero.
|
|
// Uses the sync GetAwaiter().GetResult() bridge because this runs from the
|
|
// constructor; the file was just copied so the underlying I/O is local.
|
|
var accounts = GetAccountListAsync().GetAwaiter().GetResult();
|
|
var modified = false;
|
|
foreach (var account in accounts.Where(a => a.Class == ClassIds.Activa))
|
|
{
|
|
if (account.LastBankBalance > 0)
|
|
{
|
|
account.StartBalance = account.LastBankBalance;
|
|
modified = true;
|
|
}
|
|
else if (account.Number < 1010)
|
|
{
|
|
account.StartBalance = 0;
|
|
modified = true;
|
|
}
|
|
}
|
|
if (modified)
|
|
{
|
|
SaveAsync(accounts, ACCOUNTS).GetAwaiter().GetResult();
|
|
}
|
|
}
|
|
}
|
|
}
|