ci / build-test (push) Successful in 2m31s
The dashboards told several stories at once. Overview asked for full calendar years, meter detail for a fixed 12-month window that was really 13, Trends for 24 months with an Apply button, and the energy pages for 60. Each page derived "today" from UTC, so the first hours of a local day belonged to yesterday. A missing tariff, a month nobody measured and a genuine zero all rendered as 0. And a virtual meter -- the one thing the spreadsheet leans on hardest -- was excluded from analysis outright: MeterPeriodService returned null for it and the page offered a flow diagram instead. docs/DASHBOARD_ANALYSIS_CHANGE_BRIEF.md is the work order. Every choice it left open is settled in docs/ANALYSIS_IMPLEMENTATION_NOTE.md as D-01..D-58 plus amendments A-01..A-30; code, tests and release notes cite those ids. The analysis layer Core/Analysis holds the pure rules: period presets resolved once in the instance zone into a local date range and a half-open UTC range, bucket plans, calendar-unit comparisons, coverage runs with a resolution class, normalized quantities and units, the totals policy, the virtual formula parser/validator/evaluator, and the cost calculator. "Now" comes from TimeProvider; services never read the clock. Normalization now writes, in the same transaction as consumption and by diff, per-meter rollups by local day and month plus coverage runs and a rollup state (AnalysisDataWriter). AnalysisReader answers a request from those tables -- month rollups for month and year buckets, day rollups otherwise, at most two partial edge days from consumption -- and CostReader prices the result month by month. Pages, /api/v1 and the CSV export read nothing else. The unused continuous aggregates are dropped. The reader's statement count per request is constant whether it covers one meter or a thousand. On a synthetic 1,000-meter, ten-year instance the brief's target request (100 meters, ten years, monthly) takes 374 ms against a two-second target, and the Overview went from 48,244 SQL statements per load to 205. Missing is not zero Every bucket carries a status -- available, partial, missing, unresolved, invalid, pending -- derived from coverage, never from the amount, with provenance and a reason code beside it. A true zero is a number and a bar on the baseline; an unknown bucket is a gap that says why; a month whose data only exists monthly says so instead of inventing daily detail; a scope with no tariff says "not priced" instead of 0. Rows whose interval closes after now are reported separately rather than counted. Virtual meters are analysis subjects A virtual meter stores a canonical definition -- expression over m<id> references, result kind, unit and cost rule -- validated on save and on read for syntax, unknown or self references, loops and unit/kind rules. It is evaluated on read from its sources' rollups over their joint coverage: a missing source makes the bucket missing, an observed zero is a valid input, a non-finite result is invalid with its dependency path, and the page lists each source's contribution. Topology links are topology only and never rewrite a saved calculation; expression-less meters from older installs are converted once at startup. The editor has Sum, Difference and Advanced modes with a live preview. Totals and the bill Per energy type the totals policy separates use, grid import, export, generation and runtime, marks breakdown meters as breakdowns and virtual meters as views, and never adds across units. The bill follows it: grid import where there is one, separately priced subsections at their own price, feed-in only on export meters, standing charges once per scope per local day, manual costs once on their start day, categories as non-overlapping covers whose composition reconciles to the bill. The seeded demo's yearly totals now match the spreadsheet. Pages and navigation The period lives in the URL and every page reads the same contract, so a link, a reload and the browser's Back button keep it. Shared components carry it: page header with breadcrumbs, period toolbar, theme-aware chart with an accessible table beside it, metric cards, comparison and availability states, attention items that each link to the one action that fixes them. Meter detail leads with an Analysis tab and resolves its tabs by key; the energy page has Overview, History, Flow and Meters; the old cost-only Trends page is a general Analysis page over portfolio, type, category, meter or a meter comparison. Records tabs are paged server-side instead of showing the latest 200. Everything is English and German, light and dark, down to 360px. Some figures change on purpose; docs/RELEASE_NOTES.md lists each one and what the first start after the update does (it rebuilds all analysis data before the web server listens). docs/SDD.md and CLAUDE.md describe the system as it now is. Tests: 1,733 Core and 746 integration, all green, plus an opt-in performance suite with a synthetic 1,000-meter generator.
152 lines
5.9 KiB
C#
152 lines
5.9 KiB
C#
using MeterVault.Core.Domain;
|
|
using MeterVault.Core.Normalization;
|
|
using MeterVault.Core.Parsing;
|
|
using MeterVault.Infrastructure.Import;
|
|
|
|
namespace MeterVault.Integration.Tests.Reconciliation;
|
|
|
|
/// <summary>
|
|
/// Shared helpers for the golden-fixture reconciliation tests. The CSVs are self-oracling: the
|
|
/// same file carries both the input (registers/levels/hours) and the expected output
|
|
/// (Verbrauch / Differenz Tank / Kosten columns). We parse input → normalize → compare against
|
|
/// the sheet's own columns (SDD §0.3, §13). No database is involved.
|
|
/// </summary>
|
|
internal static class ReconciliationSupport
|
|
{
|
|
// Fixture file names (linked into fixtures/ in the test output).
|
|
public const string Electricity = "Energiebilanz - Strom Verbrauch.csv";
|
|
public const string Water = "Energiebilanz - Wasser.csv";
|
|
public const string Oil = "Energiebilanz - Heizöl Verbrauch.csv";
|
|
public const string Costs = "Energiebilanz - Kosten.csv";
|
|
|
|
public static string FixturePath(string fileName) =>
|
|
Path.Combine(AppContext.BaseDirectory, "fixtures", fileName);
|
|
|
|
public static List<string[]> ReadRows(string fileName)
|
|
{
|
|
using var reader = new StreamReader(FixturePath(fileName));
|
|
return CsvImporter.ReadRows(reader);
|
|
}
|
|
|
|
public static StagedImport Stage(MappingProfile profile, string fileName)
|
|
{
|
|
using var reader = new StreamReader(FixturePath(fileName));
|
|
return new CsvImporter().Stage(profile, reader);
|
|
}
|
|
|
|
/// <summary>Normalizes one meter from a staged import using the given config.</summary>
|
|
public static IReadOnlyList<Consumption> Normalize(StagedImport staged, MeterConfig config)
|
|
{
|
|
var engine = NormalizationEngine.CreateDefault();
|
|
var context = new NormalizationContext
|
|
{
|
|
Meter = config,
|
|
Readings = staged.Readings.Where(r => r.MeterId == config.MeterId).ToList(),
|
|
Events = staged.Events.Where(e => e.MeterId == config.MeterId).ToList(),
|
|
};
|
|
|
|
return engine.Normalize(context);
|
|
}
|
|
|
|
/// <summary>Extracts a sheet oracle column keyed by month, using German number parsing.</summary>
|
|
public static Dictionary<DateOnly, double> OracleByMonth(
|
|
IReadOnlyList<string[]> rows, int dateColumn, int valueColumn, int firstDataRow)
|
|
{
|
|
var result = new Dictionary<DateOnly, double>();
|
|
for (var r = firstDataRow; r < rows.Count; r++)
|
|
{
|
|
var row = rows[r];
|
|
if (dateColumn >= row.Length || valueColumn >= row.Length)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (!GermanDate.TryParse(row[dateColumn], out var date))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (GermanNumber.TryParse(row[valueColumn], out var value))
|
|
{
|
|
result[new DateOnly(date.Year, date.Month, 1)] = value;
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
|
|
public static DateOnly MonthKey(DateTimeOffset time) => new(time.Year, time.Month, 1);
|
|
|
|
/// <summary>
|
|
/// Asserts every month present in both computed and oracle agrees within tolerance, and that
|
|
/// a meaningful number of months were actually compared (so an empty result can't pass).
|
|
/// </summary>
|
|
public static void AssertReconciles(
|
|
IReadOnlyDictionary<DateOnly, double> computed,
|
|
IReadOnlyDictionary<DateOnly, double> oracle,
|
|
double tolerance,
|
|
string label,
|
|
int minMatches)
|
|
{
|
|
var matched = 0;
|
|
foreach (var (month, expected) in oracle)
|
|
{
|
|
if (!computed.TryGetValue(month, out var actual))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
matched++;
|
|
Assert.True(
|
|
Math.Abs(actual - expected) <= tolerance,
|
|
$"{label} {month:yyyy-MM}: computed {actual:0.##} vs sheet {expected:0.##} (tol {tolerance}).");
|
|
}
|
|
|
|
Assert.True(matched >= minMatches, $"{label}: only {matched} months reconciled (expected ≥ {minMatches}).");
|
|
}
|
|
|
|
public static Dictionary<DateOnly, double> ByMonth(IReadOnlyList<Consumption> series) =>
|
|
series.GroupBy(c => MonthKey(c.Time)).ToDictionary(g => g.Key, g => g.Sum(c => c.Amount));
|
|
|
|
/// <summary>
|
|
/// Consumption keyed by exact reading date (oil rows are event-dated, sometimes two per month). The
|
|
/// date is the one the closing reading describes (<see cref="Consumption.IntervalEnd"/>), not the
|
|
/// row's stamp: a day-dated row sits at 00:00 UTC, which in these UTC runs is a local midnight, so its
|
|
/// row is stamped one second earlier, inside the day it closes (D-11).
|
|
/// </summary>
|
|
public static Dictionary<DateOnly, double> ByDate(IReadOnlyList<Consumption> series) =>
|
|
series.GroupBy(c => DateOnly.FromDateTime((c.IntervalEnd ?? c.Time).UtcDateTime))
|
|
.ToDictionary(g => g.Key, g => g.Sum(c => c.Amount));
|
|
|
|
/// <summary>
|
|
/// Extracts a sheet oracle column keyed by exact date, optionally transformed. Uses the same
|
|
/// month-end anchoring as the importer so day-dated and month-dated rows align.
|
|
/// </summary>
|
|
public static Dictionary<DateOnly, double> OracleByDate(
|
|
IReadOnlyList<string[]> rows, int dateColumn, int valueColumn, int firstDataRow,
|
|
Func<double, double>? transform = null, bool anchorMonthsToEnd = true)
|
|
{
|
|
var result = new Dictionary<DateOnly, double>();
|
|
for (var r = firstDataRow; r < rows.Count; r++)
|
|
{
|
|
var row = rows[r];
|
|
if (dateColumn >= row.Length || valueColumn >= row.Length)
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (!ImportDate.TryResolve(row[dateColumn], anchorMonthsToEnd, out var date))
|
|
{
|
|
continue;
|
|
}
|
|
|
|
if (GermanNumber.TryParse(row[valueColumn], out var value))
|
|
{
|
|
result[date] = transform is null ? value : transform(value);
|
|
}
|
|
}
|
|
|
|
return result;
|
|
}
|
|
}
|