diff --git a/CHANGELOG.md b/CHANGELOG.md index 09da1d5..c2772b6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,16 @@ The application version is maintained in `package.json` and displayed in the adm No changes recorded yet. +## 1.89.39 + +### Added + +- Merge two drivers: Drivers → edit a driver → "Merge with another driver" moves every heat, lap, result, entry, team, check-in, series point and training lap to the driver you keep and removes the duplicate. In a series, a row whose driver has been deleted (results left on a removed duplicate, so the person showed on two rows) gets "🔗 Link to driver", which merges it the same way. Only the Race Controller Master can merge, since it changes results. + +### Fixed + +- The same transponder can no longer be put on two drivers in one class (one person's two cars entered as two drivers) - the decoder can't tell their laps apart. The same person in another class is still fine. + ## 1.89.38 ### Fixed diff --git a/package-lock.json b/package-lock.json index e9350e1..4baa9fd 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "rc-racecore", - "version": "1.89.38", + "version": "1.89.39", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "rc-racecore", - "version": "1.89.38", + "version": "1.89.39", "hasInstallScript": true, "dependencies": { "better-sqlite3": "^12.11.1", diff --git a/package.json b/package.json index 5b07791..7facac8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rc-racecore", - "version": "1.89.38", + "version": "1.89.39", "private": true, "description": "RC RaceCore live timing and race control with AMMC ingest and SQLite persistence", "engines": { diff --git a/src/app.js b/src/app.js index c678301..c60f6ee 100644 --- a/src/app.js +++ b/src/app.js @@ -42,6 +42,7 @@ import { renderDashboardView, renderClassesView, renderDriversView, renderCarsVi import { renderGuideView, renderOverlayPageView } from "./misc_views.js"; import { installAuthFetchGuard, showPinDialog, mountAuthSettings } from "./auth_view.js"; import { createRaceController } from "./race_controller.js"; +import { mergeDriverInto } from "./driver_merge_logic.js"; import { resolveBackendUrl } from "./backend_url.js"; import { getSessionsForEventHelper, getModeLabelHelper, normalizeStartModeHelper, getStartModeLabelHelper, getClassNameHelper, getEventNameHelper, renderAssignmentListView, renderSessionsTableView } from "./event_common.js"; import { renderEventWorkspaceView } from "./event_workspace_controller.js"; @@ -872,7 +873,20 @@ const testDriverVoice = ({ spokenName, passSound }) => { triggerRaceAudio("personal_best", { force: true, interrupt: true, variables }); triggerRaceAudio("race_winner", { force: true, variables }); }; -const renderDrivers = () => renderDriversView({ state, dom, t, driverBrandFilter: () => driverBrandFilter, setDriverBrandFilter: (value) => { driverBrandFilter = value; }, selectedDriverEditId: () => selectedDriverEditId, setSelectedDriverEditId: (value) => { selectedDriverEditId = value; }, uid, saveState, renderView, renderTable, escapeHtml, setFormError, bindModalShell, normalizeDriver, getClassName , testDriverVoice }); +// Two entries for one person (or results left on a deleted duplicate): everything moves to the +// kept driver. It changes results, so only the Race Controller Master may do it - the server +// keeps the race results out of other browsers' saves. +function mergeDrivers(fromId, toId, { oldName = "" } = {}) { + const target = state.drivers.find((driver) => driver.id === toId); + if (!target || fromId === toId) return false; + if (!isRaceMaster()) { alert(notifyNotMaster()); return false; } + const from = state.drivers.find((driver) => driver.id === fromId); + if (!window.confirm(t("drivers.merge_confirm", { from: from?.name || oldName || fromId, to: target.name, class: getClassName(target.classId) || "-" }))) return false; + const moved = mergeDriverInto(state, fromId, toId); + saveState(); + return moved > 0; +} +const renderDrivers = () => renderDriversView({ mergeDrivers, state, dom, t, driverBrandFilter: () => driverBrandFilter, setDriverBrandFilter: (value) => { driverBrandFilter = value; }, selectedDriverEditId: () => selectedDriverEditId, setSelectedDriverEditId: (value) => { selectedDriverEditId = value; }, uid, saveState, renderView, renderTable, escapeHtml, setFormError, bindModalShell, normalizeDriver, getClassName , testDriverVoice }); const renderCars = () => renderCarsView({ state, dom, t, carBrandFilter: () => carBrandFilter, setCarBrandFilter: (value) => { carBrandFilter = value; }, selectedCarEditId: () => selectedCarEditId, setSelectedCarEditId: (value) => { selectedCarEditId = value; }, uid, saveState, renderView, renderTable, escapeHtml, setFormError, bindModalShell, normalizeCar }); const renderGuide = () => renderGuideView({ dom, t }); const renderRaceDay = () => renderRaceDayView({ @@ -1211,7 +1225,7 @@ const exportSeriesPdf = async (series, tables) => { )), }); }; -const renderSeries = () => renderSeriesView({ state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries, getSeriesRounds, deleteSeriesRaces, runSeriesSession, runSeriesSeeding, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound }); +const renderSeries = () => renderSeriesView({ mergeDrivers, state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries, getSeriesRounds, deleteSeriesRaces, runSeriesSession, runSeriesSeeding, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound }); const renderArchive = () => renderResultsArchiveView({ getBackendUrl, state, dom, t, escapeHtml, formatLap, formatRaceClock, renderTable, @@ -2047,6 +2061,14 @@ const TRANSLATIONS = { "drivers.brand_filter_placeholder": "Sök namn / transponder / märke / klubb / land", "drivers.transponder_placeholder": "Personlig transponder (valfritt)", "drivers.transponder_conflict_confirm": "Transpondern {tp} används redan av {name} ({class}). Spara ändå?", + "drivers.same_class_transponder": "Transpondern {tp} finns redan på {name} i {class}. Två förare i samma klass kan inte ha samma transponder - decodern kan inte skilja deras varv åt. Kör båda bilarna på den föraren, eller slå ihop förarna.", + "drivers.merge_title": "Slå ihop med en annan förare", + "drivers.merge_hint": "För samma person som lagts in två gånger (t.ex. två bilar på samma transponder). {name} tas bort och alla heat, varv, resultat och serie-poäng flyttas till föraren du väljer. Samma person i två olika klasser ska INTE slås ihop.", + "drivers.merge_pick": "Välj förare att behålla…", + "drivers.merge_go": "Slå ihop", + "drivers.merge_confirm": "Flytta allt från \"{from}\" till {to} ({class})? Heat, varv, resultat och serie-poäng hamnar på {to} och \"{from}\" tas bort. Det går inte att ångra.", + "series.link_driver": "Koppla till förare", + "series.link_driver_hint": "Föraren finns inte längre i förarlistan (borttagen dubblett). Välj vem resultaten tillhör så slås raderna ihop.", "drivers.speech_name": "Uttalsnamn", "drivers.voice_test": "🔊 Testa uttal", "drivers.speech_name_placeholder": "Uttal för uppläsning (valfritt)", @@ -4428,6 +4450,14 @@ const TRANSLATIONS = { "drivers.brand_filter_placeholder": "Search name / transponder / brand / club / country", "drivers.transponder_placeholder": "Personal transponder (optional)", "drivers.transponder_conflict_confirm": "Transponder {tp} is already used by {name} ({class}). Save anyway?", + "drivers.same_class_transponder": "Transponder {tp} is already on {name} in {class}. Two drivers in one class can't share a transponder - the decoder can't tell their laps apart. Run both cars on that driver, or merge the drivers.", + "drivers.merge_title": "Merge with another driver", + "drivers.merge_hint": "For one person entered twice (e.g. two cars on one transponder). {name} is removed and every heat, lap, result and series point moves to the driver you pick. The same person in two different classes should NOT be merged.", + "drivers.merge_pick": "Pick the driver to keep…", + "drivers.merge_go": "Merge", + "drivers.merge_confirm": "Move everything from \"{from}\" to {to} ({class})? Heats, laps, results and series points go to {to} and \"{from}\" is removed. This can't be undone.", + "series.link_driver": "Link to driver", + "series.link_driver_hint": "This driver is no longer in the driver list (a deleted duplicate). Pick who the results belong to and the rows are merged.", "drivers.speech_name": "Spoken name", "drivers.voice_test": "🔊 Test pronunciation", "drivers.speech_name_placeholder": "Pronunciation for announcements (optional)", diff --git a/src/core_views.js b/src/core_views.js index 28bb79b..8e70cf3 100644 --- a/src/core_views.js +++ b/src/core_views.js @@ -1,5 +1,6 @@ import { flagHtml, countryChoices } from "./country_flags.js"; -import { getDriverProfileGroups, getDriverProfileId, findTransponderConflict } from "./driver_profile_logic.js"; +import { getDriverProfileGroups, getDriverProfileId, findTransponderConflict, findSameClassTransponder } from "./driver_profile_logic.js"; +import { mergeCandidates } from "./driver_merge_logic.js"; import { filterDrivers, sortDrivers, groupDriversByClass, removeDrivers, DRIVER_SORT_KEYS } from "./driver_list_logic.js"; // The driver list's own view settings; kept for the browser tab (sort and grouping also in @@ -411,6 +412,7 @@ export function renderDriversView(deps) { normalizeDriver, getClassName, testDriverVoice = () => {}, + mergeDrivers = () => false, } = deps; const classOptions = state.classes.map((c) => ``).join(""); const registered = filterDrivers(state.drivers, ""); @@ -560,6 +562,14 @@ export function renderDriversView(deps) { +
+ ${t("drivers.merge_title")} +

${t("drivers.merge_hint", { name: escapeHtml(editingDriver.name) })}

+
+ + +
+
` @@ -583,6 +593,8 @@ export function renderDriversView(deps) { : sameNameProfile?.id || uid("profile"); const linkedProfile = profileGroups.find((profile) => profile.id === profileId); const cleanedTransponder = String(form.get("transponder") || "").trim(); + const sameClass = findSameClassTransponder(state.drivers, { transponder: cleanedTransponder, classId: String(form.get("classId") || "") }); + if (sameClass) { window.alert(t("drivers.same_class_transponder", { tp: cleanedTransponder, name: sameClass.name, class: getClassName(sameClass.classId) })); return; } const transponderConflict = findTransponderConflict(state.drivers, { transponder: cleanedTransponder, profileId }); if (transponderConflict && !window.confirm(t("drivers.transponder_conflict_confirm", { tp: cleanedTransponder, name: transponderConflict.name, class: getClassName(transponderConflict.classId) }))) { return; @@ -757,6 +769,8 @@ export function renderDriversView(deps) { setFormError("driverEditError", t("validation.invalid_selection")); return; } + const sameClass = findSameClassTransponder(state.drivers, { transponder: cleanedTp, classId: cleanedClassId || editingDriver.classId, excludeDriverId: editingDriver.id }); + if (sameClass) { setFormError("driverEditError", t("drivers.same_class_transponder", { tp: cleanedTp, name: sameClass.name, class: getClassName(sameClass.classId) })); return; } const transponderConflict = findTransponderConflict(state.drivers, { transponder: cleanedTp, profileId: cleanedProfileId, excludeDriverId: editingDriver.id }); if (transponderConflict && !window.confirm(t("drivers.transponder_conflict_confirm", { tp: cleanedTp, name: transponderConflict.name, class: getClassName(transponderConflict.classId) }))) { return; @@ -795,6 +809,12 @@ export function renderDriversView(deps) { }); document.getElementById("driverEditSave")?.addEventListener("click", commitDriverEdit); + document.getElementById("driverMergeGo")?.addEventListener("click", () => { + const targetId = document.getElementById("driverMergeTarget")?.value; + if (!editingDriver || !targetId) return; + if (mergeDrivers(editingDriver.id, targetId)) setSelectedDriverEditId(null); + renderView(); + }); } export function renderCarsView(deps) { diff --git a/src/driver_merge_logic.js b/src/driver_merge_logic.js new file mode 100644 index 0000000..72c733f --- /dev/null +++ b/src/driver_merge_logic.js @@ -0,0 +1,63 @@ +// Merging two driver entries into one: the same person entered twice (two cars on one +// transponder, a wrong transponder, a guest who became a member), or results left on a driver +// that has since been deleted - the series then shows that person on two rows. Everything that +// points at the old id moves to the kept driver: heat lists and grids, results and laps +// (competitor keys "driver_"), entry lists, teams, check-in, series results and the +// training stats. Done as one sweep over the state, so a place added later is covered too. + +const ID_KEY_PREFIX = "driver_"; + +// Where both ids hold a value under the same key (both drove one heat, both checked in): the +// kept driver's value stays, unless the old one has more laps. +function pickOnCollision(kept, moved) { + const laps = (value) => Number(value?.laps || 0); + return laps(moved) > laps(kept) ? moved : kept; +} + +function rewrite(value, fromId, toId, counter) { + const fromKey = ID_KEY_PREFIX + fromId; + const toKey = ID_KEY_PREFIX + toId; + const swap = (text) => { + if (text === fromId) { counter.count += 1; return toId; } + if (text === fromKey) { counter.count += 1; return toKey; } + return text; + }; + if (typeof value === "string") return swap(value); + if (Array.isArray(value)) { + const out = value.map((item) => rewrite(item, fromId, toId, counter)); + // A list of ids holding both: once is enough. + return out.every((item) => typeof item === "string") ? [...new Set(out)] : out; + } + if (!value || typeof value !== "object") return value; + const out = {}; + Object.entries(value).forEach(([key, item]) => { + const next = rewrite(item, fromId, toId, counter); + const newKey = swap(key); + out[newKey] = newKey in out ? (newKey === key ? pickOnCollision(next, out[newKey]) : pickOnCollision(out[newKey], next)) : next; + }); + return out; +} + +// Returns how many references moved. The old driver entry (if it still exists) is removed. +export function mergeDriverInto(state, fromId, toId) { + const from = String(fromId || ""); + const to = String(toId || ""); + if (!state || !from || !to || from === to || !(state.drivers || []).some((driver) => driver.id === to)) return 0; + const counter = { count: 0 }; + Object.keys(state).forEach((key) => { + if (key === "drivers") return; + state[key] = rewrite(state[key], from, to, counter); + }); + const before = state.drivers.length; + state.drivers = state.drivers.filter((driver) => driver.id !== from); + return counter.count + (before - state.drivers.length); +} + +// Kept-driver choices for an old id: same name first, then the rest by name. +export function mergeCandidates(drivers = [], { excludeId = "", name = "" } = {}) { + const wanted = String(name || "").trim().toLowerCase(); + const first = (driver) => (wanted && String(driver.name || "").trim().toLowerCase() === wanted ? 0 : 1); + return drivers + .filter((driver) => driver.id !== excludeId && !driver.guestEventId) + .sort((a, b) => first(a) - first(b) || String(a.name || "").localeCompare(String(b.name || ""), "sv")); +} diff --git a/src/driver_profile_logic.js b/src/driver_profile_logic.js index f25caa6..714da41 100644 --- a/src/driver_profile_logic.js +++ b/src/driver_profile_logic.js @@ -60,3 +60,17 @@ export function findTransponderConflict(drivers, { transponder, profileId, exclu && getDriverProfileId(driver) !== String(profileId || "") )) || null; } + +// The same transponder twice in one class (one person's two cars entered as two drivers): the +// laps can't be told apart - the decoder only sees the chip - so that is never allowed. Drive +// both cars as one entry, or merge the two entries. +export function findSameClassTransponder(drivers, { transponder, classId, excludeDriverId } = {}) { + const value = String(transponder || "").trim(); + if (!value || !classId) return null; + return (Array.isArray(drivers) ? drivers : []).find((driver) => ( + String(driver.id || "") !== String(excludeDriverId || "") + && !driver.guestEventId + && String(driver.classId || "") === String(classId) + && String(driver.transponder || "").trim() === value + )) || null; +} diff --git a/src/series_view.js b/src/series_view.js index 1e43159..17018e4 100644 --- a/src/series_view.js +++ b/src/series_view.js @@ -1,5 +1,6 @@ import { renderParticipantPicker, bindParticipantPicker } from "./participant_picker.js"; import { medal } from "./medal.js"; +import { mergeCandidates } from "./driver_merge_logic.js"; // "Series" page: create a series/cup, pick its classes and races (or create the races in one // go from a list of dates), set the points table and how many results count, and follow the // standings per class - printable and exportable as PDF. Scoring lives in series_logic.js. @@ -173,7 +174,14 @@ function renderAddExistingRace(series, rounds, { t, escapeHtml, state, getClassN `; } -function renderStandingsTable(table, { t, escapeHtml }) { +// drivers (the admin view only): a row whose driver is no longer in the register - results left +// on a deleted duplicate - gets a "link to driver" choice, which merges it into that driver. +function renderStandingsTable(table, { t, escapeHtml, drivers = null }) { + const linkChoice = (row) => (!drivers || drivers.some((driver) => driver.id === row.driverId) ? "" : ` + `); const head = table.events.map((event, index) => `${index + 1}`).join(""); const cells = (row) => table.events.map((event) => { const result = row.results.find((item) => item.eventId === event.id); @@ -187,7 +195,7 @@ function renderStandingsTable(table, { t, escapeHtml }) { ${table.rows.length ? `
${head} - ${table.rows.map((row) => `${cells(row)}`).join("")} + ${table.rows.map((row) => `${cells(row)}`).join("")}
${t("table.pos")}${t("table.driver")}${t("series.starts")}${t("series.total")}
${medal(row.rank)}${escapeHtml(row.driverName)}${row.starts}${row.total}
${medal(row.rank)}${escapeHtml(row.driverName)}${linkChoice(row)}${row.starts}${row.total}
` : `

${t("series.no_results")}

`} `; } @@ -195,7 +203,7 @@ function renderStandingsTable(table, { t, escapeHtml }) { export function renderSeriesView(deps) { const { state, dom, t, escapeHtml, saveState, renderView, uid, getClassName, getSeriesStandings, createSeriesEvents, getRaceFormatPresets, exportSeriesPdf, printSeries, - getSeriesRounds, deleteSeriesRaces, runSeriesSession, runSeriesSeeding, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound, + mergeDrivers = () => false, getSeriesRounds, deleteSeriesRaces, runSeriesSession, runSeriesSeeding, setSeriesRoundFormat, setSeriesRoundParticipants, copySeriesRoundParticipants, addDriverToSeriesRound, generateSeriesRoundQualifying, generateSeriesRoundFinals, openSeriesRound, } = deps; const list = state.series || []; if (!list.some((item) => item.id === selectedSeriesId)) selectedSeriesId = list[0]?.id || ""; @@ -239,10 +247,15 @@ export function renderSeriesView(deps) {

${t("series.step4")}

-
${tables.length ? tables.map((table) => renderStandingsTable(table, { t, escapeHtml })).join("") : `

${t("series.no_results")}

`} +
${tables.length ? tables.map((table) => renderStandingsTable(table, { t, escapeHtml, drivers: state.drivers })).join("") : `

${t("series.no_results")}

`}

${t("series.legend")}

` : ""}`; + dom.view.querySelectorAll("[data-link-driver]").forEach((select) => select.addEventListener("change", () => { + if (select.value) mergeDrivers(select.dataset.linkDriver, select.value, { oldName: select.dataset.linkName }); + renderView(); + })); + document.getElementById("seriesNew")?.addEventListener("click", () => { // No classes ticked: step 1 asks for them, instead of starting with every class selected. const created = normalizeSeries({ name: t("series.new_name", { year: new Date().getFullYear() }), classIds: [] }, { uid }); diff --git a/src/styles.css b/src/styles.css index 317f9b2..79ffee1 100644 --- a/src/styles.css +++ b/src/styles.css @@ -4694,6 +4694,8 @@ tr.is-removed td.lap-actions { .series-add-driver { display: flex; gap: 8px; flex-wrap: wrap; } .series-add-driver input { max-width: 220px; } .series-add-existing { display: grid; gap: 4px; margin-top: 14px; max-width: 520px; } +.series-link-driver { display: block; margin-top: 4px; max-width: 220px; font-size: 0.85em; } +.driver-merge summary { cursor: pointer; font-weight: 600; } .series-status-done { border-color: var(--success, #2e9d5b); } .series-status-qual_running, .series-status-finals { border-color: var(--accent); } @media (max-width: 900px) { .series-create { grid-template-columns: 1fr 1fr; } } diff --git a/tests/driver_merge.test.js b/tests/driver_merge.test.js new file mode 100644 index 0000000..10014db --- /dev/null +++ b/tests/driver_merge.test.js @@ -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); +}); diff --git a/tests/run.js b/tests/run.js index 6fb7f79..e3726ba 100644 --- a/tests/run.js +++ b/tests/run.js @@ -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";