feat(tariff): Tariff Lab — pure session-pricing simulator
Test rates "in time" (overnight windows, daily caps, overstay) in seconds against any tariff version, instead of waiting hours/days. No real ledger writes. - Extract priceSession() into @parking/shared: the grace/overstay wrapper over computeFee (unpaid -> entry..now; within-grace -> settled 0; grace-expired -> overstay, a fresh period from grace-expiry). PayStation.quote() now calls it so the booth and the lab can never diverge. - API (tariffs.ts, tariff:read, read-only): POST /api/tariff/simulate prices a hypothetical session (active/any version/inline structure) and returns the priceSession outcome + a 30m..3d duration curve (see where the daily cap flattens); GET /api/tariff/simulate/session/:identity prefills from a real ledger session. - UI TariffLab.tsx at Setup -> "Tariff Lab": version picker, entry/asOf times, optional payment+grace, category, and load-a-real-ticket. Admin-gated, available on-site (useful to quote a dispute). - 4 new priceSession unit tests incl. the ticket-1245791632490 overstay-not-zero regression (40 pass). i18n lab.* + nav.tariffLab (sq+en). Verified live via the UI. Wiki: tariff (priceSession + Tariff Lab as-built), log. Claude-Session: https://claude.ai/code/session_01Xcm6ikLgGoCxxHrxtjkk5V
This commit is contained in:
@@ -1,5 +1,5 @@
|
||||
import { desc, eq, ledgerEvents, sessions, subscriptions, tariffVersions, tariffs, type Db } from "@parking/db";
|
||||
import { computeFee, type TariffStructure, type Tender } from "@parking/shared";
|
||||
import { priceSession, type TariffStructure, type Tender } from "@parking/shared";
|
||||
import type { FastifyBaseLogger } from "fastify";
|
||||
import type { EventLog } from "./event-log.js";
|
||||
|
||||
@@ -128,15 +128,6 @@ export class PayStation {
|
||||
const entry = this.#openEntry(identity);
|
||||
if (!entry) throw new NoOpenSessionError(identity);
|
||||
|
||||
// If the latest payment's walk-back grace has expired, this is an overstay: anchor
|
||||
// the new billing period at grace-expiry (paidAt + graceExitMin). Otherwise price
|
||||
// from entry (first payment, or a still-within-grace re-quote of the same stay).
|
||||
const last = this.#lastPayment(identity);
|
||||
const graceExpiryMs =
|
||||
last && last.graceExitMin != null ? Date.parse(last.paidAt) + last.graceExitMin * 60_000 : null;
|
||||
const overstay = graceExpiryMs != null && Date.now() > graceExpiryMs;
|
||||
const periodStart = overstay ? new Date(graceExpiryMs!).toISOString() : entry.occurredAt;
|
||||
|
||||
// The tariff in force is keyed to ENTRY (the version frozen for this session), even
|
||||
// for an overstay period — the customer keeps the rate card they entered under.
|
||||
const tv = this.#tariffVersionFor(entry.occurredAt);
|
||||
@@ -147,13 +138,24 @@ export class PayStation {
|
||||
// both read it from there, so a V2 category tariff yields the same amount at the
|
||||
// booth and at exit. Absent (legacy/V1) ⇒ undefined ⇒ category-agnostic pricing.
|
||||
const category = (entry.payload as { category?: string } | null)?.category;
|
||||
const amountMinor = computeFee(periodStart, new Date().toISOString(), structure, category);
|
||||
|
||||
// Pure pricing shared with the Tariff Lab (priceSession). Only the latest payment
|
||||
// matters for grace/overstay; pass it through. Overstay → fresh period from
|
||||
// grace-expiry; within-grace → settled; unpaid → entry→now running total.
|
||||
const last = this.#lastPayment(identity);
|
||||
const p = priceSession(
|
||||
entry.occurredAt,
|
||||
new Date().toISOString(),
|
||||
structure,
|
||||
last ? [last] : [],
|
||||
category,
|
||||
);
|
||||
return {
|
||||
identity,
|
||||
enteredAt: entry.occurredAt,
|
||||
periodStart,
|
||||
amountMinor,
|
||||
overstay,
|
||||
periodStart: p.periodStart,
|
||||
amountMinor: p.amountMinor,
|
||||
overstay: p.overstay,
|
||||
currency: tv.currency,
|
||||
tariffVersionId: tv.id,
|
||||
graceExitMin: structure.gracePeriodExitMin,
|
||||
|
||||
@@ -1,7 +1,14 @@
|
||||
import { randomUUID } from "node:crypto";
|
||||
import type { FastifyInstance } from "fastify";
|
||||
import { desc, eq, siteConfig, tariffVersions, tariffs, type Db } from "@parking/db";
|
||||
import { isTariffV2, validateTariffStructure, type TariffStructure } from "@parking/shared";
|
||||
import { desc, eq, ledgerEvents, siteConfig, tariffVersions, tariffs, type Db } from "@parking/db";
|
||||
import {
|
||||
computeFee,
|
||||
isTariffV2,
|
||||
priceSession,
|
||||
validateTariffStructure,
|
||||
type SessionPayment,
|
||||
type TariffStructure,
|
||||
} from "@parking/shared";
|
||||
import { requirePermission } from "../auth.js";
|
||||
|
||||
/** Default site timezone for wall-clock tariff windows when none is configured. */
|
||||
@@ -22,6 +29,19 @@ interface PublishBody {
|
||||
|
||||
const SITE_TARIFF_NAME = "Site tariff";
|
||||
|
||||
/** Body for POST /api/tariff/simulate — price a hypothetical session, no ledger write.
|
||||
* Provide a structure source (one of): `tariffVersionId`, inline `structure`, or
|
||||
* neither (uses the active version). */
|
||||
interface SimulateBody {
|
||||
enteredAt: string; // ISO-8601
|
||||
asOf: string; // ISO-8601 (the "now"/exit instant being simulated)
|
||||
payments?: SessionPayment[]; // hypothetical payment history (latest grants grace)
|
||||
category?: string;
|
||||
tariffVersionId?: string;
|
||||
structure?: TariffStructure;
|
||||
currency?: string;
|
||||
}
|
||||
|
||||
export async function tariffRoutes(app: FastifyInstance, db: Db): Promise<void> {
|
||||
// Reading the rate card (pay station / operator UI needs it).
|
||||
const readGuard = requirePermission("tariff:read");
|
||||
@@ -114,4 +134,110 @@ export async function tariffRoutes(app: FastifyInstance, db: Db): Promise<void>
|
||||
return reply.code(201).send(row);
|
||||
},
|
||||
);
|
||||
|
||||
// --- Tariff Lab (simulator) -------------------------------------------------
|
||||
// Price a HYPOTHETICAL session at arbitrary times against any tariff version —
|
||||
// pure, no ledger writes. Lets an admin test rates "in time" (overnight windows,
|
||||
// daily caps, overstay) in seconds instead of waiting hours. Also used to quote a
|
||||
// customer dispute on-site. tariff:read (admins always have it). See tariff.md.
|
||||
app.post<{ Body: SimulateBody }>("/api/tariff/simulate", { preHandler: readGuard }, async (req, reply) => {
|
||||
const b = req.body ?? ({} as SimulateBody);
|
||||
if (!b.enteredAt || !b.asOf) {
|
||||
return reply.code(400).send({ error: "enteredAt and asOf (ISO-8601) required" });
|
||||
}
|
||||
if (!(Date.parse(b.enteredAt) <= Date.parse(b.asOf))) {
|
||||
return reply.code(400).send({ error: "asOf must be at or after enteredAt" });
|
||||
}
|
||||
|
||||
// Resolve the structure: an explicit version id, or the active version, or an
|
||||
// inline structure (preview unpublished edits). A version carries its currency.
|
||||
let structure: TariffStructure | undefined = b.structure;
|
||||
let currency = b.currency ?? null;
|
||||
if (b.tariffVersionId) {
|
||||
const v = db.select().from(tariffVersions).where(eq(tariffVersions.id, b.tariffVersionId)).get();
|
||||
if (!v) return reply.code(404).send({ error: "tariff version not found" });
|
||||
structure = v.structure as unknown as TariffStructure;
|
||||
currency = v.currency;
|
||||
} else if (!structure) {
|
||||
const tariffId = ensureSiteTariff();
|
||||
const nowIso = new Date().toISOString();
|
||||
const active =
|
||||
db
|
||||
.select()
|
||||
.from(tariffVersions)
|
||||
.where(eq(tariffVersions.tariffId, tariffId))
|
||||
.orderBy(desc(tariffVersions.effectiveFrom))
|
||||
.all()
|
||||
.find((v) => v.effectiveFrom <= nowIso) ?? null;
|
||||
if (!active) return reply.code(404).send({ error: "no active tariff to simulate against" });
|
||||
structure = active.structure as unknown as TariffStructure;
|
||||
currency = active.currency;
|
||||
}
|
||||
|
||||
const problems = validateTariffStructure(structure);
|
||||
if (problems.length) return reply.code(400).send({ error: "invalid tariff structure", problems });
|
||||
|
||||
const payments = Array.isArray(b.payments) ? b.payments : [];
|
||||
const pricing = priceSession(b.enteredAt, b.asOf, structure, payments, b.category);
|
||||
|
||||
// A duration curve from entry: handy to SEE where the cap flattens / windows shift.
|
||||
const SAMPLES_MIN = [30, 60, 120, 180, 360, 720, 1440, 2880, 4320];
|
||||
const enteredMs = Date.parse(b.enteredAt);
|
||||
const curve = SAMPLES_MIN.map((min) => ({
|
||||
minutes: min,
|
||||
amountMinor: computeFee(b.enteredAt, new Date(enteredMs + min * 60_000).toISOString(), structure!, b.category),
|
||||
}));
|
||||
|
||||
return { currency, pricing, curve, gracePeriodExitMin: structure.gracePeriodExitMin };
|
||||
});
|
||||
|
||||
// Prefill the lab from a REAL session: fold its ledger into entry + payments so the
|
||||
// admin can re-evaluate an actual ticket (e.g. an overstay) at any chosen `asOf`.
|
||||
app.get<{ Params: { identity: string } }>(
|
||||
"/api/tariff/simulate/session/:identity",
|
||||
{ preHandler: readGuard },
|
||||
async (req, reply) => {
|
||||
const id = (req.params.identity ?? "").trim();
|
||||
if (!id) return reply.code(400).send({ error: "identity required" });
|
||||
const rows = db
|
||||
.select()
|
||||
.from(ledgerEvents)
|
||||
.where(eq(ledgerEvents.identity, id))
|
||||
.orderBy(ledgerEvents.index)
|
||||
.all();
|
||||
const entry = rows.find((r) => r.type === "vehicle_entry");
|
||||
if (!entry) return reply.code(404).send({ error: "no session for identity" });
|
||||
const payments: { paidAt: string; graceExitMin: number | null }[] = [];
|
||||
for (const r of rows) {
|
||||
if (r.type !== "payment") continue;
|
||||
const g = (r.payload as { graceExitMin?: number } | null)?.graceExitMin;
|
||||
payments.push({ paidAt: r.occurredAt, graceExitMin: typeof g === "number" ? g : null });
|
||||
}
|
||||
const exit = rows.find((r) => r.type === "vehicle_exit");
|
||||
const category = (entry.payload as { category?: string } | null)?.category ?? null;
|
||||
return {
|
||||
identity: id,
|
||||
enteredAt: entry.occurredAt,
|
||||
exitedAt: exit?.occurredAt ?? null,
|
||||
payments,
|
||||
category,
|
||||
// The version frozen at entry — the rate card this session actually keeps.
|
||||
tariffVersionId: tariffVersionIdFor(entry.occurredAt),
|
||||
};
|
||||
},
|
||||
);
|
||||
|
||||
/** The tariff version in force at a given instant (latest effectiveFrom ≤ when). */
|
||||
function tariffVersionIdFor(whenIso: string): string | null {
|
||||
const tariffId = ensureSiteTariff();
|
||||
const v =
|
||||
db
|
||||
.select()
|
||||
.from(tariffVersions)
|
||||
.where(eq(tariffVersions.tariffId, tariffId))
|
||||
.orderBy(desc(tariffVersions.effectiveFrom))
|
||||
.all()
|
||||
.find((row) => row.effectiveFrom <= whenIso) ?? null;
|
||||
return v?.id ?? null;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user