@mxpicture/tesla-superchargers-mate 0.1.39 → 0.1.41

package/package.json

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

package/sql/reset.sql

@@ -2,6 +2,14 @@
 -- the accumulated price history this project exists to build. Run it only to
 -- start over from scratch; setup.sql alone is idempotent and safe to
 -- (re-)apply after updates.
+DROP VIEW IF EXISTS pic_price_history_v;
+
+DROP VIEW IF EXISTS pic_price_history_key_v;
+
+DROP VIEW IF EXISTS pic_price_bound_v;
+
+DROP VIEW IF EXISTS pic_price_fetch_id_v;
+
 DROP VIEW IF EXISTS pic_cp_inv_v;
 
 DROP VIEW IF EXISTS pic_cp_inv_prep_v;

package/sql/setup.sql

@@ -492,3 +492,163 @@ SELECT
   base.cp_quan || ' kWh (' || base.cp_cost_raw || ' €)' AS cp
 FROM
   pic_cp_inv_prep_v AS base;
+
+-- price history ------------------------------------------------------------------------------
+-- Dropped instead of CREATE OR REPLACE for the same reason as the views above,
+-- and because a bare CREATE VIEW made setup.sql non-idempotent (re-applying it
+-- failed with 42P07 "relation already exists"). Dropped in dependency order.
+DROP VIEW IF EXISTS pic_price_history_v;
+
+DROP VIEW IF EXISTS pic_price_history_key_v;
+
+DROP VIEW IF EXISTS pic_price_bound_v;
+
+DROP VIEW IF EXISTS pic_price_fetch_id_v;
+
+-- One row per pricebook snapshot ("fetch group") per charger, numbered oldest
+-- first so consecutive snapshots can be chained into validity intervals.
+CREATE VIEW pic_price_fetch_id_v AS
+SELECT
+  pic_chargers_id,
+  last_fetch_uuid,
+  min(fetched_at) AS fetched_at,
+  row_number() OVER (
+    PARTITION BY
+      pic_chargers_id
+    ORDER BY
+      (min(fetched_at))
+  ) AS fetch_id,
+  bool_or(is_tou) AS is_tou
+FROM
+  pic_pricebooks
+GROUP BY
+  pic_chargers_id,
+  last_fetch_uuid;
+
+-- Validity interval of each snapshot: [fetched_at, end). Dates are resolved in
+-- the charger's own zone, because start_time/end_time are local wall clock
+-- there; deriving them with date_trunc() instead made the whole view depend on
+-- the *client's* session TimeZone (psql and Grafana disagreed on 60 of 109
+-- snapshots).
+CREATE VIEW pic_price_bound_v AS
+SELECT
+  base.pic_chargers_id,
+  base.last_fetch_uuid AS start_uuid,
+  base.fetch_id AS start_id,
+  base.fetched_at,
+  base.is_tou,
+  c.time_zone,
+  (base.fetched_at AT TIME ZONE c.time_zone)::date AS fetched_date,
+  COALESCE(next.fetched_at, now()) AS "end",
+  -- Exclusive day bound. A superseded snapshot ends on the day its successor
+  -- was fetched (that day already belongs to the successor). The still-open
+  -- snapshot must cover today, so its bound is tomorrow — with "today" the
+  -- chart always stopped one day short of now.
+  CASE
+    WHEN next.fetched_at IS NULL THEN (now() AT TIME ZONE c.time_zone)::date + 1
+    ELSE (next.fetched_at AT TIME ZONE c.time_zone)::date
+  END AS end_date
+FROM
+  pic_price_fetch_id_v base
+  JOIN pic_chargers c ON c.id = base.pic_chargers_id
+  -- The successor is simply the charger's next snapshot. Matching on is_tou as
+  -- well (as this once did) left the interval open whenever a site switched
+  -- between flat and time-of-use pricing, so the superseded price ran to now()
+  -- and overlapped its replacement.
+  LEFT JOIN pic_price_fetch_id_v next ON next.pic_chargers_id = base.pic_chargers_id
+  AND next.fetch_id = (base.fetch_id + 1);
+
+-- Explodes each validity interval into the calendar days it covers. The day
+-- grid is built from plain dates (not timestamptz) so it cannot gain or lose a
+-- day across a DST boundary.
+CREATE VIEW pic_price_history_key_v AS
+WITH
+  span AS (
+    SELECT
+      min(fetched_date) AS min_date,
+      max(end_date) AS max_date
+    FROM
+      pic_price_bound_v
+  ),
+  dates AS (
+    SELECT
+      dd::date AS date
+    FROM
+      span s,
+      generate_series(
+        s.min_date::TIMESTAMP,
+        s.max_date::TIMESTAMP,
+        '1 day'::INTERVAL
+      ) dd
+  )
+SELECT
+  d.date,
+  h.pic_chargers_id,
+  h.start_uuid AS last_fetch_uuid,
+  h.is_tou,
+  h.time_zone,
+  EXTRACT(
+    DOW
+    FROM
+      d.date
+  )::SMALLINT AS day_of_week
+FROM
+  dates d
+  -- inner join: a date no snapshot covers carried only NULLs and was discarded
+  -- downstream anyway
+  JOIN pic_price_bound_v h ON h.fetched_date <= d.date
+  AND h.end_date > d.date;
+
+-- One row per tariff slot per covered day: the point in time a price starts
+-- being charged. A flat-rate charger therefore emits a single point per day (at
+-- 00:00 local) and a time-of-use charger one per slot, so panels must plot this
+-- as a step series and carry the last known value into the window — see
+-- test.sql. timestamp is timestamptz: emitting a naive local wall clock made
+-- Grafana read it as UTC and shift every price change by the charger's offset.
+CREATE VIEW pic_price_history_v AS
+SELECT
+  ((k.date + b.start_time) AT TIME ZONE k.time_zone) AS TIMESTAMP,
+  k.pic_chargers_id,
+  c.location_url_slug,
+  k.last_fetch_uuid,
+  concat(c.name, ' - ', c.common_site_name) AS "name",
+  c.favourite,
+  b.uom,
+  b.days,
+  b.start_time,
+  b.end_time,
+  b.vehicle_make_type,
+  b.fee_type,
+  b.is_member_pricebook,
+  b.is_tou,
+  b.currency_code AS currency_code_original,
+  -- only claim EUR when a converted rate actually exists; rate_base_eur is
+  -- unpopulated today, so hardcoding 'EUR' would relabel a foreign-currency
+  -- rate as euros the moment a non-EUR site is tracked
+  CASE
+    WHEN b.rate_base_eur IS NOT NULL THEN 'EUR'
+    ELSE b.currency_code
+  END AS currency_code,
+  COALESCE(b.rate_base_eur, b.rate_base) AS rate_base,
+  COALESCE(b.rate_tier_1_eur, b.rate_tier_1) AS rate_tier_1,
+  COALESCE(b.rate_tier_2_eur, b.rate_tier_2) AS rate_tier_2
+FROM
+  pic_price_history_key_v AS k
+  INNER JOIN pic_pricebooks AS b ON b.pic_chargers_id = k.pic_chargers_id
+  AND b.last_fetch_uuid = k.last_fetch_uuid
+  AND b.is_tou = k.is_tou
+  INNER JOIN pic_chargers AS c ON c.id = k.pic_chargers_id
+  LEFT JOIN unnest(b.days) AS d ON d = k.day_of_week
+WHERE
+  b.vehicle_make_type = 'TSLA' -- todo remove and do it in grafan directly
+  AND b.fee_type = 'CHARGING' -- todo remove and do it in grafan directly
+  AND (
+    (
+      b.is_tou = TRUE
+      AND d IS NOT NULL
+    )
+    OR (
+      b.is_tou = FALSE
+      AND d IS NULL
+    )
+  );