feat(houseofrc): create a race from a House of RC event and its entries (1.80.0)

This commit is contained in:
larssand committed 2026-11-08 11:52:57 +01:00
1 parent 42df6a786f
commit 9c1f5713e6
18 files changed
+444 -21

No files matched your search

+58
View File
@@ -64,3 +64,61 @@ export async function runHouseOfRcSmoke({ evaluate, navigate, savedState, waitFo
await patchState({ drivers: current.drivers.filter((driver) => !driver.id.startsWith("hor_")) });
}
}
// Race wizard → "Fetch from House of RC": pick an event, choose our class, the entered drivers
// fill the wizard; the created event remembers the House of RC event for the results later.
export async function runHouseOfRcEventSmoke({ evaluate, navigate, savedState, waitFor, base }) {
try {
await navigate("race_setup", "raceWizardStepForm");
await evaluate(`(() => {
const realFetch = window.fetch;
window.fetch = async (url, options) => {
const json = (data) => new Response(JSON.stringify(data), { status: 200, headers: { "Content-Type": "application/json" } });
if (String(url).includes("/api/houseofrc/events")) return json({ ok: true, events: [{ id: 2251, name: "HoR Deltävling 2", start: "2026-12-05T07:00:00Z", city: "Sundsvall", country: "SE", url: "https://houseofrc.com/events/2251" }] });
if (String(url).includes("/api/houseofrc/entries")) return json({ ok: true, event: { id: 2251, name: "HoR Deltävling 2", start: "2026-12-05T07:00:00Z", city: "Sundsvall", url: "https://houseofrc.com/events/2251" }, entries: [
{ houseOfRcId: 901, name: "HoR Anna", number: 7, club: "Sundsvall RC", car: "XRAY X12" },
{ houseOfRcId: 902, name: "HoR Bo", number: null, club: "", car: "" },
{ houseOfRcId: 903, name: "HoR Skipped", number: null, club: "", car: "" },
] });
return realFetch(url, options);
};
})()`);
await evaluate(`document.getElementById("raceWizardHouseOfRc").click()`);
await waitFor(async () => evaluate(`Boolean(document.querySelector("[data-hor-event]"))`), "the event list");
await evaluate(`document.querySelector('[data-hor-event="2251"]').click()`);
await waitFor(async () => evaluate(`Boolean(document.querySelector("[data-hor-apply]"))`), "the entries");
const statuses = await evaluate(`[...document.querySelectorAll("#houseOfRcEventOverlay tbody .pill")].map((pill) => pill.textContent.trim())`);
assert.equal(statuses.length, 3);
await evaluate(`(() => {
const select = document.querySelector("[data-hor-class]");
select.value = "test_class"; select.dispatchEvent(new Event("change", { bubbles: true }));
})()`);
await evaluate(`(() => { document.querySelector('[data-hor-entry="2"]').checked = false; document.querySelector("[data-hor-apply]").click(); })()`);
await waitFor(async () => (await savedState()).drivers.some((driver) => driver.name === "HoR Anna"), "new drivers saved");
const drivers = (await savedState()).drivers;
const anna = drivers.find((driver) => driver.name === "HoR Anna");
assert.deepEqual([anna.classId, anna.club, anna.brand, anna.houseOfRcId], ["test_class", "Sundsvall RC", "XRAY X12", "901"]);
assert.equal(drivers.some((driver) => driver.name === "HoR Skipped"), false, "an unticked entry is not created");
const ticked = await evaluate(`[...document.querySelectorAll(".wizard-participant:checked")].map((box) => box.value)`);
const ids = drivers.filter((driver) => ["HoR Anna", "HoR Bo"].includes(driver.name)).map((driver) => driver.id);
assert.deepEqual([...ticked].sort(), [...ids].sort(), "the wizard is on Participants with exactly the entered drivers");
await evaluate(`document.getElementById("raceWizardNext").click()`);
await evaluate(`document.getElementById("raceWizardNext").click()`);
await evaluate(`document.getElementById("raceWizardCreate").click()`);
await waitFor(async () => (await savedState()).events.some((event) => event.name === "HoR Deltävling 2"), "the race is created");
const event = (await savedState()).events.find((item) => item.name === "HoR Deltävling 2");
assert.deepEqual([event.date, event.classId, event.houseOfRc?.eventId], ["2026-12-05", "test_class", 2251]);
assert.deepEqual([...event.raceConfig.driverIds].sort(), [...ids].sort());
console.log("PASS House of RC event import: pick an event and class, entered drivers fill the race wizard, the race keeps the House of RC event id");
} finally {
await evaluate(`document.getElementById("houseOfRcEventOverlay")?.remove()`).catch(() => {});
const current = await savedState();
const eventIds = current.events.filter((event) => event.name === "HoR Deltävling 2").map((event) => event.id);
Object.assign(current, {
drivers: current.drivers.filter((driver) => !String(driver.name).startsWith("HoR ")),
events: current.events.filter((event) => !eventIds.includes(event.id)),
sessions: current.sessions.filter((session) => !eventIds.includes(session.eventId)),
});
await fetch(base + "/api/state", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(current) });
}
}
+2 -1
View File
@@ -22,7 +22,7 @@ import { runProfileClassSmoke } from "./browser_profile_class.js";
import { runDecoderClockSmoke } from "./browser_decoder_clock.js";
import { runCorrectionsScopeSmoke } from "./browser_corrections_scope.js";
import { runDriversPageSmoke } from "./browser_drivers_page.js";
import { runHouseOfRcSmoke } from "./browser_houseofrc.js";
import { runHouseOfRcSmoke, runHouseOfRcEventSmoke } from "./browser_houseofrc.js";
import { runSeriesSmoke } from "./browser_series.js";
import { runTrainingSourceSmoke } from "./browser_training_source.js";
import { runDecoderUrlSmoke } from "./browser_decoder_url.js";
@@ -183,6 +183,7 @@ try {
await runCorrectionsScopeSmoke({ evaluate, navigate, savedState, waitFor, base });
await runDriversPageSmoke({ evaluate, navigate, savedState, waitFor, base });
await runHouseOfRcSmoke({ evaluate, navigate, savedState, waitFor, base });
await runHouseOfRcEventSmoke({ evaluate, navigate, savedState, waitFor, base });
await runSeriesSmoke({ evaluate, navigate, savedState, waitFor, base, dialogs });
await runTrainingSourceSmoke({ evaluate, navigate, savedState, waitFor, base });
await runDecoderUrlSmoke({ evaluate, navigate, savedState, waitFor, base });
+32 -4
View File
@@ -6,22 +6,25 @@ const members = {
"1001": { id: 68, name: "Anna Andersson", brand: "Associated", model: "B7" },
"1002": { id: 70, name: "Bo Berg", brand: "Xray", model: "XB4" },
"1003": { id: 71, name: "Cecilia Carlsson", brand: "", model: "" },
"1004": { id: 68, name: "Anders Larsson", brand: "", model: "Xray XB4 2025" },
};
const drivers = () => [
{ id: "a", name: "1001", transponder: "1001", brand: "" },
{ id: "b", name: "Bosse", transponder: "1002", brand: "Team Berg" },
{ id: "c", name: "cecilia carlsson", transponder: "1003", brand: "" },
{ id: "d", name: "Dan", transponder: "9999", brand: "" },
{ id: "e", name: "anders larsson", transponder: "1004", brand: "" },
{ id: "g", name: "", transponder: "1001", brand: "", guestEventId: "e1" },
];
test("House of RC plan: only matched drivers, pre-ticked only where our field is empty or just the transponder number", () => {
const plan = planHouseOfRcDriverUpdates(drivers(), members);
assert.deepEqual(plan.map((row) => row.driverId), ["a", "b", "c"], "unknown transponders and sponsor guests are left out");
const [a, b, c] = plan;
assert.deepEqual(plan.map((row) => row.driverId), ["a", "b", "c", "e"], "unknown transponders and sponsor guests are left out");
const [a, b, c, e] = plan;
assert.deepEqual([a.nameDiffers, a.nameDefault, a.brandDiffers, a.brandDefault], [true, true, true, true]);
assert.deepEqual([b.nameDiffers, b.nameDefault, b.brandDiffers, b.brandDefault], [true, false, true, false], "an existing name or brand is never pre-ticked");
assert.deepEqual([c.nameDiffers, c.brandDiffers], [false, false], "same name ignoring case and spaces; no brand from HoR");
assert.deepEqual([c.nameDiffers, c.nameDefault, c.brandDiffers], [true, true, false], "only case/spacing differs: offered and pre-ticked; no brand from HoR");
assert.deepEqual([e.nameDefault, e.brandDefault, e.member.brand], [true, true, "Xray XB4 2025"], "no brand object: the model name is the make");
});
test("House of RC apply: writes only the ticked fields and links drivers whose name matches", () => {
@@ -32,5 +35,30 @@ test("House of RC apply: writes only the ticked fields and links drivers whose n
assert.deepEqual([byId.b.name, byId.b.brand, byId.b.houseOfRcId], ["Bosse", "Xray", undefined], "name kept, so not linked (could be a borrowed transponder)");
assert.deepEqual([byId.c.name, byId.c.houseOfRcId], ["cecilia carlsson", "71"], "same person: linked without renaming");
assert.equal(byId.g.name, "", "sponsor guests untouched");
assert.equal(changed, 3);
assert.equal(changed, 4, "c and e are linked by name even without ticks");
});
test("House of RC entries: linked, same name, other class and new drivers", async () => {
const { planHouseOfRcEntries, applyHouseOfRcEntries } = await import("../src/houseofrc_logic.js");
const register = [
{ id: "d1", name: "Anna Andersson", classId: "2wd", transponder: "111", houseOfRcId: "5" },
{ id: "d2", name: "Bo Berg", classId: "2wd", transponder: "222" },
{ id: "d3", name: "Cid Ceder", classId: "4wd", transponder: "333", houseOfRcId: "7", profileId: "p3", club: "ÖRC" },
];
const entries = [
{ houseOfRcId: 5, name: "Anna A.", club: "ÖRC", car: "Xray XB2" },
{ houseOfRcId: 6, name: "bo berg", club: "", car: "" },
{ houseOfRcId: 7, name: "Cid Ceder", club: "ÖRC", car: "Associated B7" },
{ houseOfRcId: 8, name: "Dan Ny", club: "Sundsvall RC", car: "Mugen MSB1" },
];
const plan = planHouseOfRcEntries(entries, register, "2wd");
assert.deepEqual(plan.map((row) => row.status), ["linked", "name", "copy", "new"]);
let n = 0;
const ids = applyHouseOfRcEntries(register, plan, { classId: "2wd", selected: new Set([0, 1, 2, 3]), makeDriver: (fields) => ({ id: `new${++n}`, ...fields }) });
assert.deepEqual(ids, ["d1", "d2", "new1", "new2"], "existing drivers reused, the others created, in entry order");
assert.equal(register.find((d) => d.id === "d2").houseOfRcId, "6", "same name gets linked");
const cid = register.find((d) => d.id === "new1");
assert.deepEqual([cid.classId, cid.transponder, cid.profileId, cid.brand], ["2wd", "333", "p3", "Associated B7"], "other class: same person, profile and transponder, car from the entry");
const dan = register.find((d) => d.id === "new2");
assert.deepEqual([dan.name, dan.transponder, dan.club, dan.houseOfRcId], ["Dan Ny", "", "Sundsvall RC", "8"]);
});
+21 -1
View File
@@ -733,7 +733,19 @@ test("House of RC: the key is stored server-side only, never returned, and the t
const mock = createServer((req, res) => {
seen.push({ url: req.url, auth: req.headers.authorization });
const ok = req.headers.authorization === "Bearer hrc_test_secret_key_1234";
res.writeHead(ok ? 200 : 401, { "Content-Type": "application/json" });
const missing = ok && req.url.startsWith("/v1/events/") && req.url !== "/v1/events/2251";
res.writeHead(!ok ? 401 : missing ? 404 : 200, { "Content-Type": "application/json" });
if (missing) return res.end(JSON.stringify({ message: "Not found." }));
if (ok && req.url.startsWith("/v1/events?")) {
return res.end(JSON.stringify({ data: [
{ id: 2251, name: "Deltävling 2 Sundsvall", type: "race", status: "live", start: "2026-12-05T07:00:00Z", city: "Sundsvall", country: "SE", web_url: "https://houseofrc.com/events/2251" },
{ id: 3001, name: "Winter Cup", type: "race", status: null, start: "2026-12-06T07:00:00Z", city: "Oslo", country: "NO" },
], links: { next: null }, meta: {} }));
}
if (ok && req.url === "/v1/events/2251") return res.end(JSON.stringify({ data: { id: 2251, name: "Deltävling 2 Sundsvall", type: "race", start: "2026-12-05T07:00:00Z", city: "Sundsvall", country: "SE", web_url: "https://houseofrc.com/events/2251" } }));
if (ok && req.url === "/results?event_id=2251") {
return res.end(JSON.stringify([{ user_id: 68, name: "Anna Andersson", firstname: "Anna", lastname: "Andersson", number: 7, points: 0, club: "Östersunds RC", country: "Sweden", product: "X12", brand1: "XRAY" }]));
}
if (ok && req.url.startsWith("/timing/users")) {
// Newest owner first; an unknown number is simply missing.
return res.end(JSON.stringify([
@@ -772,6 +784,14 @@ test("House of RC: the key is stored server-side only, never returned, and the t
const lookup = await (await post("/api/houseofrc/transponders", { transponders: ["1234567", "7654321", "1234567", "bad value"] })).json();
assert.equal(seen.at(-1).url, "/timing/users?transponders=1234567%2C7654321", "deduplicated, invalid numbers dropped");
assert.deepEqual(lookup.members, { 1234567: { id: 5, name: "Bo Berg", model: "B7", brand: "Associated" } }, "the newest owner wins");
const events = await (await post("/api/houseofrc/events", { from: "2026-12-01T00:00:00Z", to: "2026-12-31T23:59:59Z", country: "se" })).json();
assert.deepEqual(events.events.map((event) => event.id), [2251], "filtered to the chosen country");
assert.match(seen.at(-1).url, /^\/v1\/events\?start_from=2026-12-01.*sort=start&per_page=100&page=1$/);
const entries = await (await post("/api/houseofrc/entries", { eventId: "https://houseofrc.com/events/2251" })).json();
assert.equal(entries.event.name, "Deltävling 2 Sundsvall");
assert.deepEqual(entries.entries, [{ houseOfRcId: 68, name: "Anna Andersson", number: 7, club: "Östersunds RC", country: "Sweden", car: "XRAY X12", brand: "XRAY", points: 0 }], "a pasted link works; car = make + model");
assert.equal((await post("/api/houseofrc/entries", { eventId: "nonsense" })).status, 400);
assert.equal((await (await post("/api/houseofrc/entries", { eventId: "999" })).json()).error, "event_not_found");
const keyFile = join(dataDir, "houseofrc.json");
assert.equal(statSync(keyFile).mode & 0o777, 0o600, "only the server user can read the key file");