@mxpicture/tesla-superchargers-mate 0.1.44 → 0.1.46

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mxpicture/tesla-superchargers-mate",
-  "version": "0.1.44",
+  "version": "0.1.46",
   "description": "TeslaMate integration",
   "type": "module",
   "author": "MXPicture",
@@ -49,7 +49,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mxpicture/tesla-superchargers-generated": "^0.1.44",
+    "@mxpicture/tesla-superchargers-generated": "^0.1.46",
     "postgres": "^3.4.9",
     "short-uuid": "^6.0.3",
     "zod": "^4.3.6"

package/sql/reset.sql

@@ -16,11 +16,11 @@ DROP VIEW IF EXISTS pic_cp_inv_prep_v;
 
 DROP VIEW IF EXISTS pic_cp_sc_v;
 
-DROP VIEW IF EXISTS pic_pricebooks_tesla_ui_v;
+DROP VIEW IF EXISTS pic_price_map_ui_v;
 
-DROP VIEW IF EXISTS pic_pricebooks_tesla_condensed_v;
+DROP VIEW IF EXISTS pic_price_map_condensed_v;
 
-DROP VIEW IF EXISTS pic_pricebooks_tesla_v;
+DROP VIEW IF EXISTS pic_price_map_v;
 
 DROP VIEW IF EXISTS pic_chargers_v;
 

package/sql/setup.sql

@@ -151,18 +151,34 @@ END $$;
 ALTER TABLE pic_pricebooks
 ADD COLUMN IF NOT EXISTS fetched_at TIMESTAMPTZ;
 
--- backfill: the current group was confirmed by the charger's last fetch (both
--- carry that fetch's uuid); a superseded group was only ever seen at its own
--- valid_since.
+-- backfill: the current group was confirmed by the charger's last fetch; a
+-- superseded group was only ever seen at its own valid_since. The current
+-- group is the one with the max valid_since — resolving it via
+-- c.last_fetch_uuid = p.last_fetch_uuid (as this first did) silently missed
+-- every charger whose uuid had drifted off its pricebooks, and those fell
+-- through to the fallback below: fetched_at = valid_since, which
+-- pic_price_bound_v then reads as "last confirmed the day the price changed"
+-- and truncates the site's history to that single day.
+-- GREATEST over COALESCE keeps fetched_at >= valid_since even if the charger
+-- row somehow predates its own current group (a zero-day interval would drop
+-- the site from the history views entirely), and covers a NULL c.fetched_at
+-- the same way COALESCE did.
 UPDATE pic_pricebooks p
 SET
-  fetched_at = COALESCE(c.fetched_at, p.valid_since)
+  fetched_at = GREATEST(c.fetched_at, p.valid_since)
 FROM
   pic_chargers c
 WHERE
   c.id = p.pic_chargers_id
-  AND c.last_fetch_uuid = p.last_fetch_uuid
-  AND p.fetched_at IS NULL;
+  AND p.fetched_at IS NULL
+  AND p.valid_since = (
+    SELECT
+      max(cur.valid_since)
+    FROM
+      pic_pricebooks cur
+    WHERE
+      cur.pic_chargers_id = p.pic_chargers_id
+  );
 
 UPDATE pic_pricebooks
 SET
@@ -174,6 +190,35 @@ ALTER TABLE pic_pricebooks
 ALTER COLUMN fetched_at
 SET NOT NULL;
 
+-- repair for databases the uuid-joined backfill above already ran on: it left
+-- every drifted charger's current group at fetched_at = valid_since, and the
+-- guard it used (fetched_at IS NULL) no longer holds, so re-running setup
+-- cannot heal them. Raise those to the charger's last contact — the value the
+-- corrected backfill would have written. Idempotent: after this runs
+-- fetched_at > valid_since, so the row no longer matches; a no-op on a fresh
+-- database (no rows) and on one that was migrated correctly (the current group
+-- already carries the charger's fetched_at). A group whose only contact really
+-- was its own creation is raised to the charger's last fetch too, which is at
+-- worst the same claim the backfill makes; the next successful re-fetch
+-- overwrites it with a real confirmation either way.
+UPDATE pic_pricebooks p
+SET
+  fetched_at = c.fetched_at
+FROM
+  pic_chargers c
+WHERE
+  c.id = p.pic_chargers_id
+  AND p.fetched_at = p.valid_since
+  AND c.fetched_at > p.fetched_at
+  AND p.valid_since = (
+    SELECT
+      max(cur.valid_since)
+    FROM
+      pic_pricebooks cur
+    WHERE
+      cur.pic_chargers_id = p.pic_chargers_id
+  );
+
 CREATE INDEX IF NOT EXISTS pic_pricebooks_loc_idx ON pic_pricebooks (pic_chargers_id);
 
 -- group lookups: current group / group at a point in time. Resolved by
@@ -184,21 +229,20 @@ DROP INDEX IF EXISTS pic_pricebooks_charger_time_idx;
 
 CREATE INDEX IF NOT EXISTS pic_pricebooks_charger_time_idx ON pic_pricebooks (pic_chargers_id, valid_since DESC);
 
--- // todo add currency code for ui/grafana
 -- Dropped instead of CREATE OR REPLACE: these views SELECT p.* / c.* / v.* and
 -- then add more columns, so growing or renaming a column of the upstream
 -- relation (e.g. adding pic_chargers.favourite, or the fetched_at → valid_since
 -- split above) shifts a later column's position — which OR REPLACE rejects
 -- (42P16 "cannot change name of view column"). Views hold no data, so dropping
--- is idempotent. Dropped in dependency order: pic_pricebooks_tesla_ui_v reads
--- the condensed view, which reads pic_pricebooks_tesla_v.
-DROP VIEW IF EXISTS pic_pricebooks_tesla_ui_v;
+-- is idempotent. Dropped in dependency order: pic_price_map_ui_v reads
+-- the condensed view, which reads pic_price_map_v.
+DROP VIEW IF EXISTS pic_price_map_ui_v;
 
-DROP VIEW IF EXISTS pic_pricebooks_tesla_condensed_v;
+DROP VIEW IF EXISTS pic_price_map_condensed_v;
 
-DROP VIEW IF EXISTS pic_pricebooks_tesla_v;
+DROP VIEW IF EXISTS pic_price_map_v;
 
-CREATE VIEW pic_pricebooks_tesla_v AS
+CREATE VIEW pic_price_map_v AS
 SELECT
   *
 FROM
@@ -211,7 +255,7 @@ ORDER BY
   p.is_tou,
   p.start_time;
 
-CREATE VIEW pic_pricebooks_tesla_condensed_v AS
+CREATE VIEW pic_price_map_condensed_v AS
 SELECT
   c.*,
   base.start_time AS base_start_time,
@@ -244,29 +288,29 @@ SELECT
   s5.uom AS s5_uom
 FROM
   pic_chargers_v AS c
-  LEFT JOIN pic_pricebooks_tesla_v base ON base.pic_chargers_id = c.id
+  LEFT JOIN pic_price_map_v base ON base.pic_chargers_id = c.id
   AND base.last_fetch_uuid = c.last_fetch_uuid
   AND base.sort_order IS NULL
-  LEFT JOIN pic_pricebooks_tesla_v s0 ON s0.pic_chargers_id = c.id
+  LEFT JOIN pic_price_map_v s0 ON s0.pic_chargers_id = c.id
   AND s0.last_fetch_uuid = c.last_fetch_uuid
   AND s0.sort_order = 0
-  LEFT JOIN pic_pricebooks_tesla_v s1 ON s1.pic_chargers_id = c.id
+  LEFT JOIN pic_price_map_v s1 ON s1.pic_chargers_id = c.id
   AND s1.last_fetch_uuid = c.last_fetch_uuid
   AND s1.sort_order = 1
-  LEFT JOIN pic_pricebooks_tesla_v s2 ON s2.pic_chargers_id = c.id
+  LEFT JOIN pic_price_map_v s2 ON s2.pic_chargers_id = c.id
   AND s2.last_fetch_uuid = c.last_fetch_uuid
   AND s2.sort_order = 2
-  LEFT JOIN pic_pricebooks_tesla_v s3 ON s3.pic_chargers_id = c.id
+  LEFT JOIN pic_price_map_v s3 ON s3.pic_chargers_id = c.id
   AND s3.last_fetch_uuid = c.last_fetch_uuid
   AND s3.sort_order = 3
-  LEFT JOIN pic_pricebooks_tesla_v s4 ON s4.pic_chargers_id = c.id
+  LEFT JOIN pic_price_map_v s4 ON s4.pic_chargers_id = c.id
   AND s4.last_fetch_uuid = c.last_fetch_uuid
   AND s4.sort_order = 4
-  LEFT JOIN pic_pricebooks_tesla_v s5 ON s5.pic_chargers_id = c.id
+  LEFT JOIN pic_price_map_v s5 ON s5.pic_chargers_id = c.id
   AND s5.last_fetch_uuid = c.last_fetch_uuid
   AND s5.sort_order = 5;
 
-CREATE VIEW pic_pricebooks_tesla_ui_v AS
+CREATE VIEW pic_price_map_ui_v AS
 SELECT
   v.*,
   CASE
@@ -339,7 +383,7 @@ SELECT
     )
   END AS s5_timeslot
 FROM
-  pic_pricebooks_tesla_condensed_v AS v;
+  pic_price_map_condensed_v AS v;
 
 -- charging process states ------------------------------------------------------------------------------
 CREATE TABLE IF NOT EXISTS pic_charging_process_states (
@@ -660,6 +704,10 @@ SELECT
   h.start_uuid AS last_fetch_uuid,
   h.is_tou,
   h.time_zone,
+  -- how far this snapshot is actually known: its successor's valid_since, or
+  -- the last fetch that confirmed it. Carried through so a consumer can stop a
+  -- series where the knowledge stops instead of extending the last value on.
+  h."end" AS valid_until,
   EXTRACT(
     DOW
     FROM
@@ -681,6 +729,10 @@ FROM
 CREATE VIEW pic_price_history_v AS
 SELECT
   ((k.date + b.start_time) AT TIME ZONE k.time_zone) AS TIMESTAMP,
+  -- the instant this row's snapshot stops being known — see
+  -- pic_price_history_key_v. A panel drawing a step series must stop there;
+  -- carrying the last value past it claims a price nobody checked.
+  k.valid_until,
   k.pic_chargers_id,
   c.location_url_slug,
   k.last_fetch_uuid,