SDD §8 panels (PV/oil/meter-detail) + fix reference-data-in-Docker

Complete the SDD §8 dashboard views that were deferred at the M5 boundary, and fix a shipping bug that left the Docker demo empty. Bug: "Load reference data" created meters/tank/tariffs but imported zero readings in Docker. Root cause: sampledata/ was excluded by .dockerignore and never copied into the build stage, so the App csproj's linked Content glob resolved to nothing at publish time; ReferenceDataImporter then silently skipped the missing CSVs after already writing its marker meter, leaving the DB permanently "loaded" but empty. - .dockerignore: stop excluding sampledata/ - Dockerfile: COPY sampledata/ into the build stage - ReferenceDataImporter: fail-fast (validate CSVs exist before the marker meter) and throw instead of silently skipping a missing file - Program.cs + MeterVaultOptions: opt-in MeterVault__SeedReferenceData (compose METERVAULT_SEED=true) for a one-command populated demo New SDD §8 panels (read models in Infrastructure/Dashboard, Blazor pages): - §8.4 Solar/PV (/solar): generation from GenerationCounter meters; self-consumption / autarky % / self-consumption % / savings derived from meters tagged total_load & grid_import via Meter.Meta role config (MeterRoles/MeterMeta) — nothing hardcoded by name. - §8.5 Oil/consumable (/consumables): tank level (cm→L calibrated), fill gauge, deliveries log, burner runtime, effective L/h (fixed/empirical), forecast-to-empty, tariff cost, monthly series. - §8.6 Meter detail (/meters/{id}): raw readings, normalized consumption, source status, tariff timeline, events, measured-vs-estimated markers. - Reusable SeriesChart component; nav links; Meters list rows link to detail. Tests: MeterMetaTests (Core, +10); DashboardRenderTests extended to assert the three panel services compute real figures and the new routes render (108 total, all green). Live-verified in Docker: seed imports 302 readings / 347 consumption rows; panels render (generation 16,481 kWh, oil 3,967 L) cross-checking the DB. Claude-Session: https://claude.ai/code/session_01Lz2RqAsnQhetqWNoCDfexK
2026-07-14 09:52:11 +02:00
parent 39da00d486
commit 1282acf82c
24 changed files with 1327 additions and 7 deletions
@@ -0,0 +1,116 @@
+using Dapper;
+using MeterVault.Core.Costing;
+using MeterVault.Core.Domain;
+using MeterVault.Infrastructure.Persistence;
+using Microsoft.EntityFrameworkCore;
+
+namespace MeterVault.Infrastructure.Dashboard;
+
+/// <summary>
+/// Read model for the PV / solar panel (SDD §8.4). Generation comes from every
+/// <see cref="MeterMode.GenerationCounter"/> meter; self-consumption / autarky / savings are derived
+/// from the meters tagged <see cref="MeterRoles.TotalLoad"/> and <see cref="MeterRoles.GridImport"/>
+/// — so nothing is hardcoded by meter name. Reads only the aggregated consumption hypertable
+/// (monthly, Europe/Berlin) via Dapper; safe from a Blazor circuit via a DbContext factory.
+/// </summary>
+public sealed class SolarService(IDbContextFactory<MeterVaultDbContext> contextFactory)
+{
+    private readonly IDbContextFactory<MeterVaultDbContext> _contextFactory = contextFactory;
+
+    public async Task<SolarSummary> GetSummaryAsync(DateOnly from, DateOnly to, CancellationToken cancellationToken = default)
+    {
+        await using var db = await _contextFactory.CreateDbContextAsync(cancellationToken).ConfigureAwait(false);
+
+        var meters = await db.Meters.AsNoTracking().ToListAsync(cancellationToken).ConfigureAwait(false);
+        var generationMeters = meters.Where(m => m.Mode == MeterMode.GenerationCounter).ToList();
+        var loadMeter = meters.FirstOrDefault(m => MeterMeta.Role(m.Meta) == MeterRoles.TotalLoad);
+        var gridMeter = meters.FirstOrDefault(m => MeterMeta.Role(m.Meta) == MeterRoles.GridImport);
+
+        var fromUtc = ToUtc(from);
+        var toUtc = ToUtc(to);
+
+        // Monthly generation per generation meter.
+        var genByMeter = new Dictionary<int, IReadOnlyDictionary<DateOnly, double>>();
+        foreach (var meter in generationMeters)
+        {
+            genByMeter[meter.Id] = await MonthlyAsync(db, meter.Id, fromUtc, toUtc, cancellationToken).ConfigureAwait(false);
+        }
+
+        var loadByMonth = loadMeter is null
+            ? null
+            : await MonthlyAsync(db, loadMeter.Id, fromUtc, toUtc, cancellationToken).ConfigureAwait(false);
+        var gridByMonth = gridMeter is null
+            ? null
+            : await MonthlyAsync(db, gridMeter.Id, fromUtc, toUtc, cancellationToken).ConfigureAwait(false);
+
+        var tariffs = gridMeter is null
+            ? []
+            : await db.Tariffs.AsNoTracking().ToListAsync(cancellationToken).ConfigureAwait(false);
+
+        // Union of all months that carry any data.
+        var periods = new SortedSet<DateOnly>();
+        foreach (var series in genByMeter.Values)
+        {
+            periods.UnionWith(series.Keys);
+        }
+
+        if (loadByMonth is not null)
+        {
+            periods.UnionWith(loadByMonth.Keys);
+        }
+
+        var months = new List<SolarMonth>();
+        foreach (var period in periods)
+        {
+            var generation = genByMeter.Values.Sum(s => s.GetValueOrDefault(period));
+
+            double? load = loadByMonth?.GetValueOrDefault(period);
+            double? grid = gridByMonth?.GetValueOrDefault(period);
+            double? self = load is not null && grid is not null ? load - grid : null;
+
+            double? savings = null;
+            if (self is { } selfValue && gridMeter is not null)
+            {
+                var price = TariffResolver.ResolveValue(
+                    tariffs, TariffComponent.UnitPrice, gridMeter.Id, gridMeter.EnergyTypeId,
+                    new DateOnly(period.Year, period.Month, 15));
+                savings = selfValue * price;
+            }
+
+            months.Add(new SolarMonth(period, generation, self, grid, load, savings));
+        }
+
+        var meterRows = generationMeters
+            .Select(m => new GenerationMeterRow(m.Id, m.Name, genByMeter[m.Id].Values.Sum()))
+            .OrderByDescending(r => r.Generation)
+            .ToList();
+
+        var totalGeneration = meterRows.Sum(r => r.Generation);
+        double? totalLoad = loadByMonth?.Values.Sum();
+        double? totalGrid = gridByMonth?.Values.Sum();
+        double? totalSelf = totalLoad is not null && totalGrid is not null ? totalLoad - totalGrid : null;
+        double? autarky = totalSelf is not null && totalLoad is > 0 ? totalSelf / totalLoad : null;
+        double? selfRatio = totalSelf is not null && totalGeneration > 0 ? totalSelf / totalGeneration : null;
+        double? totalSavings = months.Any(m => m.Savings is not null) ? months.Sum(m => m.Savings ?? 0) : null;
+
+        return new SolarSummary(
+            totalGeneration, totalLoad, totalGrid, totalSelf, autarky, selfRatio, totalSavings, meterRows, months);
+    }
+
+    private static async Task<IReadOnlyDictionary<DateOnly, double>> MonthlyAsync(
+        MeterVaultDbContext db, int meterId, DateTimeOffset from, DateTimeOffset to, CancellationToken cancellationToken)
+    {
+        const string sql =
+            "SELECT (time_bucket(INTERVAL '1 month', \"time\", 'Europe/Berlin') AT TIME ZONE 'Europe/Berlin')::date AS period, " +
+            "sum(amount) AS amount " +
+            "FROM consumption WHERE meter_id = @meterId AND \"time\" >= @from AND \"time\" < @to " +
+            "GROUP BY period";
+
+        var connection = db.Database.GetDbConnection();
+        var command = new CommandDefinition(sql, new { meterId, from, to }, cancellationToken: cancellationToken);
+        var rows = await connection.QueryAsync<(DateOnly Period, double Amount)>(command).ConfigureAwait(false);
+        return rows.ToDictionary(r => r.Period, r => r.Amount);
+    }
+
+    private static DateTimeOffset ToUtc(DateOnly date) => new(date.Year, date.Month, date.Day, 0, 0, 0, TimeSpan.Zero);
+}