From a44ee668c8b8e4a08af0a90c15666a79ef87e202 Mon Sep 17 00:00:00 2001 From: voidarc Date: Sat, 30 May 2026 17:28:46 +0100 Subject: [PATCH] i cant read, and it punishes me --- scripts/seed.ts | 2 +- src/lib/server/databaseManager.ts | 9 +++++++++ src/lib/server/db/schema.ts | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/scripts/seed.ts b/scripts/seed.ts index 6f5c988..3e9b5a8 100644 --- a/scripts/seed.ts +++ b/scripts/seed.ts @@ -132,7 +132,7 @@ async function seed() { if (!presetId) throw new Error(`Team "${row.resultPreset}" not found`); await db.insert(schema.eventTypes).values({ name: row.event_name, - preset: row.preset, + scoringPreset: row.preset, resultPreset: presetId }); console.log( diff --git a/src/lib/server/databaseManager.ts b/src/lib/server/databaseManager.ts index a57d49e..d012b17 100644 --- a/src/lib/server/databaseManager.ts +++ b/src/lib/server/databaseManager.ts @@ -38,6 +38,14 @@ export async function getRegisteredEvents(eventId?: number) { return teamInfo.teams[0]; } + async function getScoringPreset(presetId: number) { + const presets = await db + .select() + .from(schema.scoringPresets) + .where(presetId ? eq(schema.scoringPresets.presetID, presetId) : undefined); + return presets; + } + const allEvents = await db .select() .from(schema.registeredEventsView) @@ -51,6 +59,7 @@ export async function getRegisteredEvents(eventId?: number) { state: events.state, completed: events.timeCompleted || 0, resultPreset: events.resultPreset, + scoringPreset: events.scorePreset ? await getScoringPreset(events.scorePreset) : 'UNDECIDED', winner: events.winner ? await getWinnerInfo(events.winner) : 'UNDECIDED' })) ); diff --git a/src/lib/server/db/schema.ts b/src/lib/server/db/schema.ts index 2148468..62d5db9 100644 --- a/src/lib/server/db/schema.ts +++ b/src/lib/server/db/schema.ts @@ -46,7 +46,7 @@ export const resultPresets = sqliteTable('resultPresets', { export const eventTypes = sqliteTable('eventTypes', { id: integer('eventTypes_id').primaryKey({ autoIncrement: true }), name: text('event_name').notNull(), - preset: integer('preset') + scoringPreset: integer('preset') .references(() => scoringPresets.presetID) .notNull(), resultPreset: integer('result_preset') @@ -133,6 +133,7 @@ export const registeredEventsView = sqliteView('registeredEventsView').as((qb) = state: registeredEvents.state, timeCompleted: registeredEvents.timeCompleted, winner: registeredEvents.teamWinner, + scorePreset: eventTypes.scoringPreset, resultPreset: eventTypes.resultPreset }) .from(registeredEvents)