schmidt.florian
1282acf82c
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
58 lines
2.6 KiB
C#
58 lines
2.6 KiB
C#
using MeterVault.Core.Normalization;
|
|
using MeterVault.Infrastructure.Import;
|
|
using MeterVault.Infrastructure.Ingestion;
|
|
using MeterVault.Infrastructure.Normalization;
|
|
using MeterVault.Infrastructure.Persistence;
|
|
using Microsoft.EntityFrameworkCore;
|
|
using Microsoft.Extensions.DependencyInjection;
|
|
|
|
namespace MeterVault.Infrastructure;
|
|
|
|
/// <summary>Composition root for the infrastructure layer (persistence, ingestion, import).</summary>
|
|
public static class DependencyInjection
|
|
{
|
|
public static IServiceCollection AddMeterVaultInfrastructure(
|
|
this IServiceCollection services,
|
|
string connectionString)
|
|
{
|
|
// A factory (for per-operation contexts in Blazor components/read services — a shared
|
|
// circuit-scoped DbContext is not thread-safe) plus a scoped context (from the factory)
|
|
// for request/tick-scoped services (API, workers, importers) that inject it directly.
|
|
services.AddDbContextFactory<MeterVaultDbContext>(options =>
|
|
options
|
|
.UseNpgsql(connectionString, npgsql =>
|
|
npgsql.MigrationsAssembly(typeof(MeterVaultDbContext).Assembly.FullName))
|
|
.UseSnakeCaseNamingConvention());
|
|
services.AddScoped<MeterVaultDbContext>(sp =>
|
|
sp.GetRequiredService<IDbContextFactory<MeterVaultDbContext>>().CreateDbContext());
|
|
|
|
services.AddSingleton<INormalizationEngine>(_ => NormalizationEngine.CreateDefault());
|
|
services.AddScoped<NormalizationService>();
|
|
services.AddScoped<CsvImporter>();
|
|
services.AddScoped<ImportService>();
|
|
services.AddScoped<ReferenceDataImporter>();
|
|
services.AddScoped<IngestionService>();
|
|
services.AddScoped<MqttMessageRouter>();
|
|
services.AddScoped<Costing.CostService>();
|
|
services.AddScoped<Dashboard.DashboardService>();
|
|
services.AddScoped<Dashboard.SolarService>();
|
|
services.AddScoped<Dashboard.ConsumableService>();
|
|
services.AddScoped<Dashboard.MeterDetailService>();
|
|
services.AddScoped<Backup.ExportService>();
|
|
|
|
return services;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Registers the live-ingestion background workers (MQTT/Tasmota + Home Assistant). Kept
|
|
/// separate from <see cref="AddMeterVaultInfrastructure"/> so tests can opt out of brokers.
|
|
/// </summary>
|
|
public static IServiceCollection AddMeterVaultIngestion(this IServiceCollection services)
|
|
{
|
|
services.AddHttpClient();
|
|
services.AddHostedService<MqttIngestionWorker>();
|
|
services.AddHostedService<HomeAssistantWorker>();
|
|
return services;
|
|
}
|
|
}
|