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.
157 lines
6.2 KiB
C#
157 lines
6.2 KiB
C#
using MeterVault.Core.Domain;
|
||
using MeterVault.Core.Normalization;
|
||
using MeterVault.Infrastructure.Costing;
|
||
using MeterVault.Infrastructure.Import;
|
||
using MeterVault.Infrastructure.Normalization;
|
||
using MeterVault.Infrastructure.Persistence;
|
||
using Microsoft.EntityFrameworkCore;
|
||
using static MeterVault.Integration.Tests.Reconciliation.ReconciliationSupport;
|
||
|
||
namespace MeterVault.Integration.Tests.Costing;
|
||
|
||
/// <summary>
|
||
/// Reconciles the cost engine against the Wasser sheet's Kosten column (consumption × €/m³) and
|
||
/// checks category rollups and the monthly consumption rollups that replaced the continuous
|
||
/// aggregates (SDD §7.5, D-17).
|
||
/// </summary>
|
||
[Collection("Timescale")]
|
||
public sealed class CostReconciliationTests(TimescaleFixture fx)
|
||
{
|
||
private static readonly DateTimeOffset From = new(2022, 11, 1, 0, 0, 0, TimeSpan.Zero);
|
||
private static readonly DateTimeOffset To = new(2024, 1, 1, 0, 0, 0, TimeSpan.Zero);
|
||
|
||
[Fact]
|
||
public async Task Water_cost_matches_the_sheet()
|
||
{
|
||
await using var db = fx.CreateContext();
|
||
var meterId = await ImportWaterAsync(db);
|
||
|
||
db.Tariffs.Add(new Tariff
|
||
{
|
||
ScopeType = TariffScope.Meter,
|
||
ScopeId = meterId,
|
||
Component = TariffComponent.UnitPrice,
|
||
Value = 5.00,
|
||
Unit = "EUR/m3",
|
||
ValidFrom = new DateOnly(2022, 11, 1),
|
||
});
|
||
await db.SaveChangesAsync();
|
||
|
||
var costs = await new CostService(fx).GetMeterCostsAsync(meterId, From, To);
|
||
var computed = costs.ToDictionary(c => c.Period, c => c.Cost);
|
||
var oracle = OracleByMonth(ReadRows(Water), dateColumn: 0, valueColumn: 4, firstDataRow: 1); // Kosten
|
||
|
||
AssertReconciles(computed, oracle, tolerance: 0.02, "water cost", minMatches: 10);
|
||
|
||
await CleanupAsync(db, meterId);
|
||
}
|
||
|
||
[Fact]
|
||
public async Task Category_rollup_includes_meter_costs()
|
||
{
|
||
await using var db = fx.CreateContext();
|
||
var meterId = await ImportWaterAsync(db);
|
||
var wasserCategory = await db.CostCategories.FirstAsync(c => c.Name == "Wasser");
|
||
|
||
db.Tariffs.Add(new Tariff
|
||
{
|
||
ScopeType = TariffScope.Meter,
|
||
ScopeId = meterId,
|
||
Component = TariffComponent.UnitPrice,
|
||
Value = 5.00,
|
||
Unit = "EUR/m3",
|
||
ValidFrom = new DateOnly(2022, 11, 1),
|
||
});
|
||
db.CostCategoryMembers.Add(new CostCategoryMember { CategoryId = wasserCategory.Id, MeterId = meterId });
|
||
await db.SaveChangesAsync();
|
||
|
||
var rollup = await new CostService(fx).GetCategoryCostsAsync(wasserCategory.Id, From, To);
|
||
var dec2022 = rollup.Single(r => r.Period == new DateOnly(2022, 12, 1));
|
||
|
||
Assert.Equal(70d, dec2022.Cost, 2); // Dez 2022: 14 m³ × 5,00 €
|
||
|
||
await db.CostCategoryMembers.Where(m => m.MeterId == meterId).ExecuteDeleteAsync();
|
||
await CleanupAsync(db, meterId);
|
||
}
|
||
|
||
[Fact]
|
||
public async Task Monthly_rollup_equals_the_consumption_it_sums()
|
||
{
|
||
// D-17: the rollup written with the import, in the normalizer's zone (UTC here), is what month and year
|
||
// reads use — no refresh step, no lag, and the same total the consumption rows add up to.
|
||
await using var db = fx.CreateContext();
|
||
var meterId = await ImportWaterAsync(db);
|
||
|
||
var months = await db.ConsumptionRollupMonths.AsNoTracking()
|
||
.Where(r => r.MeterId == meterId)
|
||
.ToDictionaryAsync(r => r.Month, r => r.Amount);
|
||
var rows = await db.Consumption.AsNoTracking().Where(c => c.MeterId == meterId).ToListAsync();
|
||
var byMonth = rows
|
||
.GroupBy(c => new DateOnly(c.Time.UtcDateTime.Year, c.Time.UtcDateTime.Month, 1))
|
||
.ToDictionary(g => g.Key, g => g.Sum(c => c.Amount));
|
||
|
||
Assert.Equal(14d, months[new DateOnly(2022, 12, 1)], 6); // Dez 2022 consumption
|
||
Assert.Equal(byMonth.Keys.Order(), months.Keys.Order());
|
||
Assert.All(byMonth, m => Assert.Equal(m.Value, months[m.Key], 9));
|
||
|
||
// The day table holds the same December, on the day the month row is filed.
|
||
var decemberDays = await db.ConsumptionRollups.AsNoTracking()
|
||
.Where(r => r.MeterId == meterId && r.Day >= new DateOnly(2022, 12, 1) && r.Day < new DateOnly(2023, 1, 1))
|
||
.SumAsync(r => r.Amount);
|
||
Assert.Equal(14d, decemberDays, 6);
|
||
|
||
await CleanupAsync(db, meterId);
|
||
}
|
||
|
||
private static async Task<int> ImportWaterAsync(MeterVaultDbContext db)
|
||
{
|
||
await DatabaseSeeder.SeedAsync(db);
|
||
var waterType = await db.EnergyTypes.FirstAsync(t => t.Key == "water");
|
||
var meter = new Meter
|
||
{
|
||
Name = $"cost-water-{Guid.NewGuid():N}",
|
||
EnergyTypeId = waterType.Id,
|
||
Mode = MeterMode.CumulativeCounter,
|
||
Unit = "m3",
|
||
InitialBaseline = 820,
|
||
};
|
||
db.Meters.Add(meter);
|
||
await db.SaveChangesAsync();
|
||
|
||
var profile = new MappingProfile
|
||
{
|
||
Name = "cost-water",
|
||
DateColumn = 0,
|
||
DateKind = DateKind.MonthName,
|
||
FirstDataRowIndex = 1,
|
||
DetectCumulativeSwaps = true,
|
||
Columns =
|
||
[
|
||
new ColumnMapping
|
||
{
|
||
Index = 1, Role = MappingRole.Reading, MeterId = meter.Id, Unit = "m3", SwapConsumptionColumn = 2,
|
||
},
|
||
],
|
||
};
|
||
|
||
StagedImport staged;
|
||
using (var reader = new StreamReader(FixturePath(Water)))
|
||
{
|
||
staged = new CsvImporter().Stage(profile, reader);
|
||
}
|
||
|
||
var service = new ImportService(db, new NormalizationService(db, NormalizationEngine.CreateDefault()));
|
||
await service.CommitAsync(staged, "Wasser.csv", null);
|
||
return meter.Id;
|
||
}
|
||
|
||
private static async Task CleanupAsync(MeterVaultDbContext db, int meterId)
|
||
{
|
||
await db.Consumption.Where(c => c.MeterId == meterId).ExecuteDeleteAsync();
|
||
await db.Readings.Where(r => r.MeterId == meterId).ExecuteDeleteAsync();
|
||
await db.MeterEvents.Where(e => e.MeterId == meterId).ExecuteDeleteAsync();
|
||
await db.Tariffs.Where(t => t.ScopeId == meterId && t.ScopeType == TariffScope.Meter).ExecuteDeleteAsync();
|
||
await db.Meters.Where(m => m.Id == meterId).ExecuteDeleteAsync();
|
||
}
|
||
}
|