From 59839d79aa35d69f58d81022eb4d9191bc1c7001 Mon Sep 17 00:00:00 2001 From: voidarc Date: Tue, 26 May 2026 13:06:57 +0100 Subject: [PATCH] realised that caching was pointless, made getResultPresets return all presets if there is no preset specified --- src/lib/server/cacheManager.ts | 24 ------------------------ src/lib/server/databaseManager.ts | 19 ++----------------- 2 files changed, 2 insertions(+), 41 deletions(-) delete mode 100644 src/lib/server/cacheManager.ts diff --git a/src/lib/server/cacheManager.ts b/src/lib/server/cacheManager.ts deleted file mode 100644 index 2f40972..0000000 --- a/src/lib/server/cacheManager.ts +++ /dev/null @@ -1,24 +0,0 @@ -import * as database from './databaseManager.ts'; -import { globalEmitter } from './databaseManager.ts'; - -// TODO Implement caching of info at some point -// structure: -// databaseManager gets raw data from backend -// stored in variables in cacheManager -// sent to frontend using same function names in dataManager (not made) - -let teamsCache; - -export async function updateTeamsCache() { - teamsCache = database.getTeams(); -} - -globalEmitter.on('invalTeamsCache', updateTeamsCache); - -let eventsCache; - -export async function updateEventsCache() { - eventsCache = database.getRegisteredEvents(); -} - -globalEmitter.on('invalEventsCache', updateEventsCache); diff --git a/src/lib/server/databaseManager.ts b/src/lib/server/databaseManager.ts index 0b61801..09d4ec8 100644 --- a/src/lib/server/databaseManager.ts +++ b/src/lib/server/databaseManager.ts @@ -1,21 +1,7 @@ -import { EventEmitter } from 'node:events'; import { db } from '$lib/server/db'; import { eq } from 'drizzle-orm'; import * as schema from '$lib/server/db/schema'; -// Emitter that emits -export const globalEmitter = new EventEmitter(); - -//// REFERENCE CODE -// Increment score for testing (remove ts) -// const increment = () => { -// testScore++; -// console.log('score incremented', testScore); -// globalEmitter.emit('scoreUpdate'); -// }; -// Increment scores when there is an emit -// globalEmitter.on('incrementScores', increment); - // For page.server.ts so that it doesnt look weird before loading export async function getAllInitialInfo() { return { @@ -44,7 +30,6 @@ export async function getTeams() { // Get all registered events from database export async function getRegisteredEvents(eventId?: number) { - console.log('eventId: ', eventId); const allEvents = await db .select() .from(schema.registeredEventsView) @@ -98,11 +83,11 @@ export async function getAllBrackets() { }; } -export async function getResultPreset(presetId: number) { +export async function getResultPreset(presetId?: number) { const resultPresets = await db .select() .from(schema.resultPresets) - .where(eq(schema.resultPresets.id, presetId)); + .where(presetId ? eq(schema.resultPresets.id, presetId) : undefined); return { resultPresets: resultPresets