feat(drivers): merge two drivers, link a deleted duplicate's series results; refuse one transponder twice in a class (1.89.39)

This commit is contained in:
larssand committed 2026-11-15 18:22:21 +01:00
1 parent 5928ce847b
commit 10b5d0a447
11 files changed
+223 -10

No files matched your search

+60
View File
@@ -0,0 +1,60 @@
import test from "node:test";
import assert from "node:assert/strict";
import { mergeDriverInto, mergeCandidates } from "../src/driver_merge_logic.js";
const state = () => ({
drivers: [{ id: "keep", name: "Mattias Nilsson", transponder: "8486125" }, { id: "dup", name: "Mattias Nilsson", transponder: "8486125" }, { id: "other", name: "Anna" }],
events: [{ id: "r1", raceConfig: { driverIds: ["dup", "other"], checkIn: { dup: { present: true, paid: true } }, teams: [{ id: "t", driverIds: ["dup"] }] } },
{ id: "r2", raceConfig: { driverIds: ["keep", "dup"], checkIn: { keep: { present: true, paid: false }, dup: { present: true, paid: true } } } }],
sessions: [{ id: "a1", driverIds: ["dup", "other"], manualGridIds: ["other", "dup"], carAssignments: { dup: "car1" } }],
resultsBySession: {
a1: { competitors: { driver_dup: { key: "driver_dup", driverId: "dup", driverName: "Mattias Nilsson", laps: 14 } }, passings: [{ driverId: "dup", competitorKey: "driver_dup" }] },
a2: { competitors: { driver_keep: { key: "driver_keep", driverId: "keep", laps: 3 }, driver_dup: { key: "driver_dup", driverId: "dup", laps: 9 } } },
},
series: [{ id: "s", manualResults: { r1: ["other", "dup"] } }],
training: { ledger: [{ driverId: "dup", sourceId: "dup", lapMs: 18000 }] },
activeSessionId: "a1",
});
test("a deleted or duplicate driver's results, laps, heats, entries, check-in, team and series move to the kept driver", () => {
const s = state();
assert.ok(mergeDriverInto(s, "dup", "keep") > 10);
assert.deepEqual(s.drivers.map((driver) => driver.id), ["keep", "other"]);
assert.deepEqual(s.events[0].raceConfig.driverIds, ["keep", "other"]);
assert.deepEqual(s.events[0].raceConfig.teams[0].driverIds, ["keep"]);
assert.deepEqual(s.events[1].raceConfig.driverIds, ["keep"], "entered twice: once");
assert.deepEqual(s.sessions[0].manualGridIds, ["other", "keep"], "the grid slot is kept");
assert.deepEqual(s.sessions[0].carAssignments, { keep: "car1" });
assert.deepEqual(s.resultsBySession.a1.competitors, { driver_keep: { key: "driver_keep", driverId: "keep", driverName: "Mattias Nilsson", laps: 14 } });
assert.deepEqual(s.resultsBySession.a1.passings[0], { driverId: "keep", competitorKey: "driver_keep" });
assert.equal(s.resultsBySession.a2.competitors.driver_keep.laps, 9, "both in one heat: the entry with more laps stays");
assert.equal(Object.keys(s.resultsBySession.a2.competitors).length, 1);
assert.deepEqual(s.series[0].manualResults.r1, ["other", "keep"]);
assert.equal(s.training.ledger[0].driverId, "keep");
assert.equal(s.activeSessionId, "a1", "a session id is not a driver id");
});
test("the old driver may already be deleted - only its results are left; nothing happens without a kept driver", () => {
const s = state();
s.drivers = s.drivers.filter((driver) => driver.id !== "dup");
assert.ok(mergeDriverInto(s, "dup", "keep") > 0);
assert.equal(s.resultsBySession.a1.competitors.driver_keep.laps, 14);
const untouched = state();
assert.equal(mergeDriverInto(untouched, "dup", "missing"), 0);
assert.equal(mergeDriverInto(untouched, "dup", "dup"), 0);
assert.equal(untouched.resultsBySession.a1.competitors.driver_dup.laps, 14);
});
test("merge choices: same name first, no guests, not the driver itself", () => {
const drivers = [{ id: "z", name: "Zed" }, { id: "g", name: "Mattias Nilsson", guestEventId: "e" }, { id: "k", name: "mattias nilsson" }, { id: "a", name: "Anna" }];
assert.deepEqual(mergeCandidates(drivers, { name: "Mattias Nilsson", excludeId: "x" }).map((driver) => driver.id), ["k", "a", "z"]);
});
test("one transponder twice in the same class is refused; the same person in another class, or a guest, is fine", async () => {
const { findSameClassTransponder } = await import("../src/driver_profile_logic.js");
const drivers = [{ id: "m4", name: "Mattias", classId: "4wd", transponder: "8486125" }, { id: "g", classId: "2wd", transponder: "77", guestEventId: "e" }];
assert.equal(findSameClassTransponder(drivers, { transponder: " 8486125 ", classId: "4wd" })?.id, "m4");
assert.equal(findSameClassTransponder(drivers, { transponder: "8486125", classId: "2wd" }), null);
assert.equal(findSameClassTransponder(drivers, { transponder: "8486125", classId: "4wd", excludeDriverId: "m4" }), null);
assert.equal(findSameClassTransponder(drivers, { transponder: "77", classId: "2wd" }), null);
});
+1
View File
@@ -65,3 +65,4 @@ import "./results_autosave.test.js";
import "./check_in.test.js";
import "./my_race.test.js";
import "./session_guard.test.js";
import "./driver_merge.test.js";