David/MEGAINFRA-WEBAPP
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(fuel): build rows from the shared variance pass

Browse source 
No behaviour change — deletes the duplicate group/sort/pairwise walk now
that computeFuelLogStatuses does it. computeFuelVariance now has exactly
one caller.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
DEls 2026-08-29 20:04:51 +02:00
parent f966a7315a
commit 2a548e9ebc
1 changed files with 19 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/app/dashboard/fuel/page.tsx
View file

@ -1,6 +1,11 @@
import { pbAdmin } from "@/lib/pb";
import { computeFuelVariance, parseFuelLimit } from "@/lib/fuel-variance";
import { RATE_PER_LITRE } from "@/lib/metrics";
import { parseFuelLimit } from "@/lib/fuel-variance";
import {
computeFuelLogStatuses,
RATE_PER_LITRE,
type AttentionFuelLogLike,
type AttentionVehicleLike,
} from "@/lib/metrics";
import { FuelView, type FuelRow, type VehicleSummary } from "./fuel-view";
export const dynamic = "force-dynamic";
@ -23,21 +28,13 @@ export default async function FuelPage() {
};
}
// Build per-row data + sort each vehicle's logs by date so we can find
// the previous reading for variance computation.
const logsByVehicle = new Map<string, (typeof fuelLogs)[number][]>();
for (const log of fuelLogs) {
const list = logsByVehicle.get(log.vehicle) ?? [];
list.push(log);
logsByVehicle.set(log.vehicle, list);
}
for (const list of logsByVehicle.values()) {
list.sort((a, b) => {
const d = (a.date_logged ?? "").localeCompare(b.date_logged ?? "");
if (d !== 0) return d;
return (a.odo_reading ?? 0) - (b.odo_reading ?? 0);
});
}
// One shared variance pass; index it so the row map is a lookup.
const statusByLogId = new Map(
computeFuelLogStatuses({
vehicles: vehicles as unknown as AttentionVehicleLike[],
fuelLogs: fuelLogs as unknown as AttentionFuelLogLike[],
}).map((s) => [s.logId, s]),
);
const rows: FuelRow[] = fuelLogs.map((log) => {
const veh = log.expand?.vehicle
@ -56,17 +53,11 @@ export default async function FuelPage() {
fuelLimits: "",
};
const peers = logsByVehicle.get(log.vehicle) ?? [];
const idx = peers.findIndex((p) => p.id === log.id);
const previous = idx > 0 ? peers[idx - 1] : undefined;
const { variance, status, limitTarget, limitUnit } = computeFuelVariance(
log.litres,
log.odo_reading,
previous?.odo_reading,
previous?.litres,
vehicleRow.fuelLimits,
);
const st = statusByLogId.get(log.id);
const variance = st?.variance ?? null;
const status = st?.status ?? "no-limit";
const limitTarget = st?.limitTarget ?? null;
const limitUnit = st?.limitUnit ?? null;
return {
id: log.id,