11 Commits

Include renames

Author	SHA1	Message	Date
Florian Schmidt	8940ef25c3	Analysis: one selected period, one set of numbers, on every page ... 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.	2026-09-20 10:29:13 +02:00
Florian Schmidt	aacdc28d70	Meters: record events from the UI, and book consumption in the months it accrued in ... Two threads that ended up in the same files. One is navigation: a meter swap that happened today had no click path at all, and most per-meter tasks were reachable only by knowing which admin page owned them. The other is attribution: readings on 1 August and 16 September showed six weeks of water under September and nothing under August. Meter events from the UI Swap, counter reset, tank level, delivery and note are recorded through MeterEventService rather than ad-hoc inserts, so the dialog's verdict and the saved result come from the same Validate call, and every record or delete recomputes the meter inside one transaction. MeterEventRules decides which events a mode offers -- a tank has no register to swap, and Correction is offered nowhere because nothing reads it. A swap is stored as the event at T plus a manual reading of the new register's start value at exactly T. That pairing is the whole trick: the boundary window is (previousReading, reading], so the old register's tail books at T and every later reading counts from the new start. Writing the old final value as the reading at T instead -- the obvious thing -- double counts the tail and then rejects every reading the new register produces. Deleting a swap removes that start reading only while it is still the untouched start value, and only Manual readings can be deleted at all. Navigation The meter page is now the hub: primary entry by mode, a "Record event" menu, and Edit through a shared MeterEditor that also owns tank setup. Other pages link into it with MeterLinks (/meters/{id}?tab=...&action=...), whose action is consumed once after the interactive render and dropped from the address -- the reverse order flashes the dialog and closes it, because a circuit's first location change dismisses every open dialog. The app bar gains a "Find a meter" dialog with the same quick entry. A source that has no usable connector now links to creating (or enabling) one and comes back to the same source dialog with the connector picked and everything typed still there; the draft survives in a circuit-scoped DraftStore, and the way back is a meter id rather than a URL, so the page cannot be made to redirect anywhere else. The connector list shows which meters use each connector, import batches list the meters and categories they wrote to, the meter editor owns the meter's own cost categories, and the dashboard's empty cost panel names the first missing step instead of listing every admin page. Months A reading is an instant, and what it measures accrued over the time since the previous one. Booking the whole delta at the closing reading misfiles it whenever the interval crosses a month boundary, so a plain increase is now divided at local month boundaries in proportion to elapsed time, each share stamped inside its month and marked estimated: the meter recorded a total, not a shape. The parts always sum to the original. Imported monthly tables are the exception that keeps the golden fixtures reconciling. "Mai 2026" carries the register at the end of May but is stamped on the 1st, so the importer -- the only place that still knows whether the date cell named a month or a day -- flags it MonthLabel, and the engine reads it as the end of its month. Inferring that from the stamp instead would catch day-dated rows: a sheet with "01.08.2026" in it is not a monthly table, and reading it as one moves two thirds of July into August. ReadingTimeline is the single ordering built on that: effective time, then stamp. The register normalizers walk it, and so do the decrease guard and the event dialog, which is what stops them disagreeing about which reading is "previous" -- a sheet imported after live readings of the same month used to count that month twice, and a mid-month reading below the month's end value was rejected as a drop. A swap detected in a monthly table applies from the start of that local month, i.e. to the first reading in it, and a recorded start value never counts above the reading it lands on. Every reader buckets in the configured timezone rather than a hardcoded one, and turns a requested date into that zone's local midnight, so the divided shares are read back under the months they were stamped in. The zone id is normalised to its IANA form, because .NET accepts a Windows id that PostgreSQL will not bucket by, and both are checked at startup. Stored consumption is derived, so a rule change reaches a meter only at its next reading -- weeks, for a meter read monthly. NormalizationUpgrade records the revision and zone the stored series was built with and rebuilds everything once at startup when either differs, each meter in its own transaction. A meter that fails is logged, kept in normalization_pending and retried at the next start: one bad series must never keep the application down. What an operator sees once Existing charts change on the first start after the update: months that carried a neighbour's use give it back. Rows of earlier imports from monthly tables are marked as such before anything is recomputed, and if that marking fails nothing is rebuilt or recorded, so the upgrade simply runs again next time rather than shifting every imported month by one. A wizard import whose date format was left on auto-detect is treated as a monthly table when all of its rows sit on the 1st across at least two months -- exactly how those rows were attributed before -- and each such batch is named in the log, because a day-dated sheet always read on the 1st looks identical; revert and re-import it with the day format if that is what it was. Tests: 120 unit and 230 integration, including the reference fixtures, which still reconcile month for month.	2026-09-17 21:09:17 +02:00
schmidt.florian	af786c7b28	Meters: add manual reading entry from the meter-detail Readings tab ... Entering a reading by hand previously meant POST /api/v1/readings with an API key, or a one-row CSV through the import wizard. SourceType.Manual existed in the enum but nothing was behind it. This adds the click path, built for the case it is actually used in: walking to each manual meter with a phone in hand. "Add reading" on the Readings tab opens a dialog prefilled with the meter's last register value and the current local time, both editable: - An on-screen keypad, because a register is read standing at the meter. It behaves like a calculator against the prefill - the first digit replaces it (a fresh register), while backspace edits it in place, which is the common case since only a register's last digits move. - Typed input accepts both separators (last one wins), so a German and an English phone keyboard both do the right thing. ReadingEntry owns that rule and is unit-tested; it deliberately differs from GermanNumber, where a lone dot really is a thousands separator. - A live parsed-value echo plus delta-since-last, which is the net that catches a mistyped digit before it is committed. - Decrease / replaces-existing / future / backdated surfaced before saving, and DST spring-forward gaps refused rather than shifted. The verdict line sits in a fixed-height, no-wrap slot above the keypad. That is load-bearing, not cosmetic: an alert that appears there when the value dips below the last reading moves the keys out from under the user's thumb mid-entry, which is a guaranteed mistype on a phone. The long-form explanation goes below the keypad, where reflow is harmless. Saving goes through IngestionService.IngestByMeterAsync, so the monotonic-decrease guard and inline renormalization apply exactly as for any other ingest. A new optional quality parameter stamps the row ReadingQuality.Manual; null preserves today's behaviour, so a source re-reporting the same timestamp updates the value without silently relabelling a hand-entered or imported reading. Also: the meter-detail tabs now render times in the instance timezone per SDD section 10, instead of raw UTC. Without it a reading entered at 18:00 reads back as 16:00. Side effect is that historic imported monthly rows show 01:00/02:00 rather than 00:00 - correct, if noisier. Claude-Session: https://claude.ai/code/session_01D4x3JbNKCSV4cBR9s7bJmX	2026-08-01 10:25:05 +02:00
schmidt.florian	cedd60ab45	Audit fixes: batch recompute, negative-baseline percentages, key-ring persistence ... Three defects found reviewing the last few commits. Deriving consumption on ingest made the batch reading endpoint quadratic. A recompute rewrites a meter's entire consumption series, and POST /api/v1/readings ran one per reading -- 500 readings for one meter meant 500 full rewrites. IngestByMeterAsync takes renormalize:false and the endpoint normalizes each touched meter once after the batch. Percentage change divided by a possibly negative baseline. A net-export meter going from -100 to -150 exported half again as much and would have been reported as "+50%", reading as more consumption. A non-positive baseline now reports no basis rather than a confident lie. The data-protection key ring had no persistent home outside Docker Compose. The LXC installer now creates /var/lib/metervault/keys at 0700 -- the app would otherwise create it under the default umask, leaving a key ring world-readable -- and the Unraid template maps it, since without that every UI-entered secret was lost whenever the container was recreated. README documents the variable and the trust boundary: keys on disk protect against leaked database content, not against an attacker who already has the host. Claude-Session: https://claude.ai/code/session_01V6joyergfvVLFEizH1hJLd	2026-07-18 19:39:56 +02:00
schmidt.florian	62d102c335	Ingestion: derive consumption on ingest, and poll HA in minutes not seconds ... Live ingestion wrote the raw reading and stopped there. Import, the REST push endpoint and the meter editor all recompute afterwards; the MQTT/Tasmota/HA path was the one that did not, so a polled reading landed in `reading` and every derived figure stayed frozen at the last import. Observed on a GenerationCounter: 45 readings, 44 consumption rows, generation pinned to the register value of the last imported reading. Recompute inline rather than behind a debounce. Normalizing a whole meter is cheap at metering cadence and a background dirty-set worker is machinery this does not yet need; the remark on RenormalizeAsync records when it would. Fixes a latent bug this surfaced in NormalizationService: ExecuteDelete drops the consumption rows in the database but leaves them in the change tracker, so a second recompute on the same context threw an identity conflict on (meter, time, kind). One worker scope ingesting two readings was enough to hit it. Detach the stale entries after the delete. Poll interval is now minutes, default 60, replacing seconds/60. A meter answers "how much this month, what will it cost" — an hourly sample answers that exactly as well as a per-second one, with far less raw volume (SDD §5.5). The `pollSeconds` key no longer binds, so existing sources fall back to the 60 default and move from every-60-seconds to hourly, which is the intent. A source that had deliberately set e.g. 300 seconds also lands on 60 minutes. Two test cleanups now delete consumption before the meter: live ingestion never produced any before, so the FK had nothing to trip on. Claude-Session: https://claude.ai/code/session_01V6joyergfvVLFEizH1hJLd	2026-07-18 18:45:57 +02:00
schmidt.florian	e23df37a3f	Connectors: allow secrets to be entered in the UI, encrypted at rest ... Reference-only secrets (SDD §6.4) meant adding a connector required editing a file on the server and restarting the service. In practice that leads to the token being pasted into the env-var *name* field, which fails with "environment variable '<token>' is not set" and gives no hint what went wrong. Add a second storage form, chosen per connector: type the secret in and it is encrypted via ASP.NET Core data protection before it is stored. The env-var reference stays as an equal alternative — this widens the choice rather than replacing it. Exactly one form survives a save, so a stale secret cannot linger and silently win; EndpointSecret.Resolve is the single resolution path. The guarantee that matters is preserved: no plaintext in the database, so pg_dump and JSON exports carry nothing usable. The trust boundary is stated plainly in §6.4 — the key ring is on disk, so this protects against leaked database content, not an attacker who already has the host, which is the same boundary an env var has. Details worth noting: - Key ring defaults to /var/lib/metervault/keys, outside the app directory, because the LXC updater republishes /opt/metervault on every update. Docker gets a named volume. Overridable via MeterVault__DataProtectionKeyPath. - Undecryptable ciphertext (key ring lost) falls back rather than throwing: an ingestion worker on a timer should degrade, not crash. - The stored secret is never sent to the browser; a blank field means "unchanged", not "cleared". - MQTT usernames are stored as-is — §6.4 covers tokens and passwords, and encrypting a username would only blank the field on every edit. - ExportService drops *_enc values: bound to the originating key ring, so useless where an export would be restored. Expect to re-enter after a restore. - HaConnectionTester now takes a resolved token, so the admin UI can test a token that has been typed but not yet saved. SDD §6.4 and §9 updated to describe both forms rather than contradict the code. Claude-Session: https://claude.ai/code/session_01V6joyergfvVLFEizH1hJLd	2026-07-18 15:41:52 +02:00
schmidt.florian	c0bbaba99f	Ingestion: route MQTT messages only to sources bound to the delivering broker ... MqttMessageRouter matched purely on topic with no endpoint predicate, and RouteAsync was not even passed an endpoint id. Topic filters routinely overlap between brokers — every Tasmota install publishes tele/+/SENSOR — so with two brokers a message on A was ingested by a source bound to B. HA enforced the binding on both workers; MQTT enforced it only at subscribe time. Pass the endpoint id through: MQTTnet's event args carry the topic but not the delivering connection, so CreateClient captures the id in the handler closure. ResolveTopicsAsync drops its `|| EndpointId == null` clause to match, since an unbound source is no longer routed and subscribing its topic everywhere would only invite traffic nothing consumes. That last part would silently kill unbound sources that work today, so a data migration binds them to the single broker when exactly one exists — the case where old and new behaviour coincide. Two or more brokers is left alone: the old behaviour was already ambiguous and a guess could route a meter's data to the wrong broker. HA sources are excluded; they have always required an endpoint, so binding them would activate ingestion never previously running. Claude-Session: https://claude.ai/code/session_01V6joyergfvVLFEizH1hJLd	2026-07-18 11:21:36 +02:00
schmidt.florian	8550ed8d9e	Ingestion: Home Assistant WebSocket push path ... HomeAssistantWebSocketWorker holds a persistent state_changed subscription per HA endpoint that opts in via the connector's WebSocket toggle (HaEndpointConfig.UseWebSocket): auth handshake, subscribe, ingest in real time, capped-backoff reconnect. The REST poll worker skips WS endpoints so each is served once. HaWebSocketProtocol holds the pure handshake/parse logic. Verified by 11 protocol unit tests + a live integration test against an in-process fake HA server. CLAUDE.md updated. Claude-Session: https://claude.ai/code/session_01Kib2MniVFbD95fkgLgBBnB	2026-07-17 11:05:01 +02:00
schmidt.florian	09cd435c2b	Admin write-CRUD, Home Assistant connector config, wiring audit ... Three requested phases. 1) Admin section (SDD §8.7) — MudBlazor inline-dialog CRUD, consistent pattern, delete guards, snackbar feedback, shared Confirm helper: - Energy types: create/edit/delete (blocks delete when meters reference it). - Meters: create/edit/delete; recomputes consumption when mode/baseline changes (NormalizationService over a fresh factory context, in a tx); delete cascades data (consumption+readings are Restrict → removed first). - A meter's ingest sources: manage on the meter-detail Sources tab (add/edit/delete MQTT/Tasmota/HA sources with typed config). - Tariffs: full CRUD (scope/component/value/validity). - Cost categories: CRUD + member management (meter or energy-type members). - Connectors: ingestion_endpoint CRUD (MQTT broker + Home Assistant); secrets referenced by env-var name only, never stored. - Settings: read-only effective-config view (settings are env-driven and reproducible, so an editable form would change nothing — kept honest). PV role is now editable on meters (MeterMeta.SetRole can clear a role). 2) Read Home Assistant — extracted a shared public HaEndpointConfig (was a private record in the worker), added HaConnectionTester (powers the connector "Test connection": checks base URL + env-resolved token, optionally reads one entity). Configuring an HA connector + an HA source on a meter drives the existing REST-poll worker end to end. (WebSocket push stays a future optimization; REST poll already reads HA.) 3) Wiring/placeholder audit — swept every OnClick/Href: all handlers are real, all internal links resolve to real routes, no TODO/stub/placeholder code. Fixed one genuine gap: MainLayout had no drawer toggle, so the nav was unreachable on narrow screens — added a hamburger button. Tests: +6 (MeterMeta.SetRole role-removal; HaConnectionTester fail-closed guard branches with a throwing HttpClientFactory proving no network on bad config); render test now covers all admin routes. 69 Core + 45 Integration = 114 green. Live-verified in Docker: all admin pages 200, drawer toggle present, Settings shows real effective config. Claude-Session: https://claude.ai/code/session_01Lz2RqAsnQhetqWNoCDfexK	2026-07-14 11:22:17 +02:00
schmidt.florian	a6edec2b12	Polish/audit: fix bugs found by 3 subsystem audits ... Correctness/data: - Fix demo cost double-count: reference importer no longer imports the Kosten Strom/Wasser columns for categories that are metered (only Heizung), so Wasser rollup is 70€ not 140€. - Spurious-decrease guard: only a reset/swap in the window (prevReading, thisReading] explains a decrease — an old historical reset no longer permanently disables the guard. - Gate swap auto-detection on MappingProfile.DetectCumulativeSwaps (flag was ignored). - Prorate basePrice by bucket length (day/month/year); guard virtual expressions against NaN/Inf. Concurrency/infra: - Blazor: register a DbContextFactory; CostService/DashboardService and the read pages now use short-lived per-operation contexts (no shared circuit DbContext); guard Trends re-entrancy. - /events: wrap event insert + consumption recompute in one transaction (atomic); 404 (not 500) on unknown meter. - MQTT worker: subscribe to newly-added topics on each tick; move client cleanup into finally. - Migrations: CREATE MATERIALIZED VIEW IF NOT EXISTS + if_not_exists on CAgg/compression/ hypertable calls (re-run-safe after a mid-migration crash). - HA worker: prune stale poll-schedule entries; export: null dangling ImportBatchIds on restore. API/security: - API fail-closed by default: with no keys and AllowAnonymousApi off, /api/v1 returns 401 (protects /export and /import). New MeterVault:AllowAnonymousApi opt-in. - Cap /readings batch at 5000; report ignored (unknown-meter) count; enums as strings in JSON. +4 regression tests (guard window, API closed, /events 404, no demo double-count). 98 tests green; Docker deploy re-verified healthy with the API fail-closed. Claude-Session: https://claude.ai/code/session_01WujdMtMJPbxDpDnMeK22rr	2026-07-13 12:56:51 +02:00
schmidt.florian	4b0cad67df	M3: live ingestion (MQTT/Tasmota + Home Assistant) ... - PayloadExtractor: dot-path value/time extraction (Tasmota ENERGY.Total, bare scalars). - MqttTopicMatcher: standard +/# wildcard matching. - IngestionService: scale/offset, idempotent upsert on (meter_id, time), and a spurious- decrease guard for monotonic registers (allowed only with a reset/swap event) + source last-seen status. - MqttMessageRouter + MqttIngestionWorker (MQTTnet 5): per-endpoint persistent connections, topic subscription, graceful degradation; secrets resolved by env-var reference. - Home Assistant: HaStateClient (REST /api/states parse) + HomeAssistantWorker polling on each source's interval. HA-via-MQTT also works through the MQTT path. - Ingestion workers gated by MeterVault:EnableLiveIngestion (off in tests). 85 tests green (53 Core + 32 integration): Tasmota payload → reading verified end to end. Follow-up (polish): HA WebSocket push (state_changed) as an alternative to REST poll; source-topic index caching in the router. Claude-Session: https://claude.ai/code/session_01WujdMtMJPbxDpDnMeK22rr	2026-07-13 11:45:20 +02:00