From 95d898887628b74ddfd9e63cdcb01df3ae271621 Mon Sep 17 00:00:00 2001
From: unurled <unurled@unurled.me>
Date: Mon, 7 Jul 2025 22:51:37 +0200
Subject: [PATCH] change scheduling mode to enum in rounds, change appreance of
 scheduling mode picker in competition

---
 src/lib/components/rounds/create-round.svelte |  9 ++--
 src/lib/components/rounds/round.svelte        |  7 +++
 src/lib/components/rounds/rounds.svelte       |  7 ---
 src/lib/server/db/index.ts                    |  2 -
 src/lib/server/db/queries/competitions.ts     | 38 ++++++++++++++
 src/lib/server/db/queries/rounds.ts           |  7 +++
 src/lib/server/db/schema/competitions.ts      | 39 +-------------
 src/lib/server/db/schema/rounds.ts            | 16 +++---
 src/lib/server/db/schema/schedulingmodes.ts   | 25 ---------
 src/lib/server/db/util.ts                     |  4 +-
 src/routes/+layout.svelte                     | 16 +++---
 src/routes/+page.server.ts                    |  2 +-
 src/routes/api/competitions/[id]/+server.ts   | 42 ++++++++++++++-
 src/routes/competitions/[id]/+page.server.ts  |  3 +-
 src/routes/competitions/[id]/+page.svelte     | 51 ++++++++++++-------
 src/types.ts                                  |  6 +++
 16 files changed, 159 insertions(+), 115 deletions(-)
 create mode 100644 src/lib/components/rounds/round.svelte
 delete mode 100644 src/lib/components/rounds/rounds.svelte
 create mode 100644 src/lib/server/db/queries/competitions.ts
 create mode 100644 src/lib/server/db/queries/rounds.ts
 delete mode 100644 src/lib/server/db/schema/schedulingmodes.ts

diff --git a/src/lib/components/rounds/create-round.svelte b/src/lib/components/rounds/create-round.svelte
index 90e1e15..0ad9f9d 100644
--- a/src/lib/components/rounds/create-round.svelte
+++ b/src/lib/components/rounds/create-round.svelte
@@ -26,6 +26,7 @@
 			credentials: 'include',
 			body: JSON.stringify({ scheduling_mode: schedulingMode })
 		});
+		console.log("response", response)
 	}
 </script>
 
@@ -37,13 +38,11 @@
 	>
 		{#each Object.values(SchedulingMode) as mode}
 			<button
-				class={cn(
-					'flex h-full w-full items-center gap-4 rounded-xl border',
-					schedulingMode === mode && ' border-green-500'
-				)}
+				class=
+					'flex h-full w-full items-center gap-4 rounded-xl'
 				onclick={() => (schedulingMode = mode)}
 			>
-				<Card class="w-full">
+				<Card class={cn("w-full", schedulingMode === mode && ' border-green-500')}>
 					<CardHeader class="flex justify-between">
 						<Label class="text-start">{$_(mode)}</Label>
 					</CardHeader>
diff --git a/src/lib/components/rounds/round.svelte b/src/lib/components/rounds/round.svelte
new file mode 100644
index 0000000..ca99435
--- /dev/null
+++ b/src/lib/components/rounds/round.svelte
@@ -0,0 +1,7 @@
+<script lang="ts">
+	import type { Round } from '@/lib/server/db/schema/rounds';
+
+	let { round }: { round: Round } = $props();
+</script>
+
+{JSON.stringify(round)}
diff --git a/src/lib/components/rounds/rounds.svelte b/src/lib/components/rounds/rounds.svelte
deleted file mode 100644
index 82d0d1f..0000000
--- a/src/lib/components/rounds/rounds.svelte
+++ /dev/null
@@ -1,7 +0,0 @@
-<script lang="ts">
-	import CreateRound from './create-round.svelte';
-
-	let { rounds, createForm } = $props();
-</script>
-
-<CreateRound data={{ form: createForm }} />
diff --git a/src/lib/server/db/index.ts b/src/lib/server/db/index.ts
index 018c0dd..1d6d3a5 100644
--- a/src/lib/server/db/index.ts
+++ b/src/lib/server/db/index.ts
@@ -8,7 +8,6 @@ import * as matches from './schema/matches';
 import * as permissions from './schema/permissions';
 import * as roles from './schema/roles';
 import * as rounds from './schema/rounds';
-import * as schedulingmodes from './schema/schedulingmodes';
 import * as sessions from './schema/sessions';
 import * as teams from './schema/teams';
 import * as users from './schema/users';
@@ -26,7 +25,6 @@ export const db = drizzle(client, {
 		...permissions,
 		...roles,
 		...rounds,
-		...schedulingmodes,
 		...sessions,
 		...teams,
 		...users
diff --git a/src/lib/server/db/queries/competitions.ts b/src/lib/server/db/queries/competitions.ts
new file mode 100644
index 0000000..fea090a
--- /dev/null
+++ b/src/lib/server/db/queries/competitions.ts
@@ -0,0 +1,38 @@
+import { eq } from 'drizzle-orm';
+import { db } from '..';
+import { competitions } from '../schema/competitions';
+import type { Round } from '../schema/rounds';
+
+export async function getCompetitionWithAll(id: number) {
+	return await db.query.competitions.findFirst({
+		where: eq(competitions.id, id),
+		with: {
+			breakperiods: true,
+			fields: true,
+			rounds: {
+				with: {
+					matches: true
+				}
+			},
+			teams: true
+		}
+	});
+}
+
+export async function getCompetitionsWithAll(skip: number = 0, take: number = 10) {
+	return await db.query.competitions.findMany({
+		orderBy: (competitions, { desc }) => [desc(competitions.start_date)],
+		with: {
+			breakperiods: true,
+			fields: true,
+			rounds: {
+				with: {
+					matches: true
+				}
+			},
+			teams: true
+		},
+		limit: take,
+		offset: skip
+	});
+}
diff --git a/src/lib/server/db/queries/rounds.ts b/src/lib/server/db/queries/rounds.ts
new file mode 100644
index 0000000..960f3c5
--- /dev/null
+++ b/src/lib/server/db/queries/rounds.ts
@@ -0,0 +1,7 @@
+import { eq } from 'drizzle-orm';
+import { db } from '..';
+import { rounds, type RoundInsert } from '../schema/rounds';
+
+export async function insertRound(competitionId: number, round: RoundInsert) {
+	return await db.insert(rounds).values(round);
+}
diff --git a/src/lib/server/db/schema/competitions.ts b/src/lib/server/db/schema/competitions.ts
index 1a26b06..4e29a1d 100644
--- a/src/lib/server/db/schema/competitions.ts
+++ b/src/lib/server/db/schema/competitions.ts
@@ -1,12 +1,11 @@
 import * as t from 'drizzle-orm/pg-core';
 import { timestamps } from '../util';
-import { eq, relations } from 'drizzle-orm';
+import { relations } from 'drizzle-orm';
 import { users } from './users';
 import { breakperiods } from './breakperiods';
 import { fields } from './fields';
 import { teams } from './teams';
 import { rounds } from './rounds';
-import { db } from '..';
 
 export const competitions = t.pgTable('competitions', {
 	id: t.serial('id').primaryKey(),
@@ -30,39 +29,3 @@ export const competitionsRelations = relations(competitions, ({ one, many }) =>
 }));
 
 export type Competition = typeof competitions.$inferSelect;
-
-export async function getCompetitionWithAll(id: number) {
-	return await db.query.competitions.findFirst({
-		where: eq(competitions.id, id),
-		with: {
-			breakperiods: true,
-			fields: true,
-			rounds: {
-				with: {
-					matches: true,
-					schedulingMode: true
-				}
-			},
-			teams: true
-		}
-	});
-}
-
-export async function getCompetitionsWithAll(skip: number = 0, take: number = 10) {
-	return await db.query.competitions.findMany({
-		orderBy: (competitions, { desc }) => [desc(competitions.start_date)],
-		with: {
-			breakperiods: true,
-			fields: true,
-			rounds: {
-				with: {
-					matches: true,
-					schedulingMode: true
-				}
-			},
-			teams: true
-		},
-		limit: take,
-		offset: skip
-	});
-}
diff --git a/src/lib/server/db/schema/rounds.ts b/src/lib/server/db/schema/rounds.ts
index 473bfa1..9182d09 100644
--- a/src/lib/server/db/schema/rounds.ts
+++ b/src/lib/server/db/schema/rounds.ts
@@ -2,13 +2,15 @@ import { relations } from 'drizzle-orm';
 import * as t from 'drizzle-orm/pg-core';
 import { matches } from './matches';
 import { competitions } from './competitions';
-import { schedulingModes } from './schedulingmodes';
+import { enumToPgEnum, SchedulingMode } from '../../../../types';
+
+export const schedulingModes = t.pgEnum('scheduling_modes', enumToPgEnum(SchedulingMode));
 
 export const rounds = t.pgTable('rounds', {
 	id: t.serial('id').primaryKey(),
 	nb_matches: t.integer('nb_matches').notNull(),
 	competition_id: t.integer('competition_id').notNull(),
-	scheduling_mode: t.integer('scheduling_mode').notNull()
+	scheduling_mode: schedulingModes('scheduling_modes')
 });
 
 export const roundsRelations = relations(rounds, ({ many, one }) => ({
@@ -16,9 +18,9 @@ export const roundsRelations = relations(rounds, ({ many, one }) => ({
 		fields: [rounds.competition_id],
 		references: [competitions.id]
 	}),
-	matches: many(matches),
-	schedulingMode: one(schedulingModes, {
-		fields: [rounds.scheduling_mode],
-		references: [schedulingModes.id]
-	})
+	matches: many(matches)
 }));
+
+export type Round = typeof rounds.$inferSelect;
+
+export type RoundInsert = typeof rounds.$inferInsert;
diff --git a/src/lib/server/db/schema/schedulingmodes.ts b/src/lib/server/db/schema/schedulingmodes.ts
deleted file mode 100644
index 8156115..0000000
--- a/src/lib/server/db/schema/schedulingmodes.ts
+++ /dev/null
@@ -1,25 +0,0 @@
-import * as t from 'drizzle-orm/pg-core';
-import { timestamps } from '../util';
-import { relations } from 'drizzle-orm';
-import { rounds } from './rounds';
-
-export const schedulingModes = t.pgTable('scheduling_modes', {
-	id: t.serial('id').primaryKey(),
-	name: t.text('name').notNull(),
-	description: t.text('description'),
-	algorithm: t.text('algorithm').notNull(),
-	config: t.jsonb('config').notNull(),
-	sequence_order: t.integer('sequence_order').notNull(),
-	status: t.text('status').notNull(),
-	round_id: t.integer('round_id').notNull(),
-	...timestamps
-});
-
-export const schedulingModesRelations = relations(schedulingModes, ({ one }) => ({
-	round: one(rounds, {
-		fields: [schedulingModes.round_id],
-		references: [rounds.id]
-	})
-}));
-
-export type SchedulingMode = typeof schedulingModes.$inferSelect;
diff --git a/src/lib/server/db/util.ts b/src/lib/server/db/util.ts
index bb128f3..c30ae43 100644
--- a/src/lib/server/db/util.ts
+++ b/src/lib/server/db/util.ts
@@ -1,9 +1,9 @@
 import * as t from 'drizzle-orm/pg-core';
 
 export const timestamps = {
-	updated_at: t.timestamp({ withTimezone: true, mode: 'date' }).default(new Date(Date.now())),
+	updated_at: t.timestamp({ withTimezone: true, mode: 'date' }).defaultNow(),
 	created_at: t.timestamp({ withTimezone: true, mode: 'date' }).defaultNow().notNull(),
-	deleted_at: t.timestamp({ withTimezone: true, mode: 'date' }).default(new Date())
+	deleted_at: t.timestamp({ withTimezone: true, mode: 'date' })
 };
 
 export const binaryHash = t.customType<{ data: Buffer; driverData: Buffer }>({
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 7a39ed9..2bb8bd9 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,16 +1,16 @@
 <script lang="ts">
-	import { ModeWatcher } from 'mode-watcher';
-	import '../app.css';
-	import { setContext } from 'svelte';
-	import type { PageProps } from './$types';
 	import { Toaster } from '$lib/components/ui/sonner';
+	import { ModeWatcher } from 'mode-watcher';
+	import { setContext, type Snippet } from 'svelte';
+	import '../app.css';
+	import type { LayoutData } from './$types';
 
 	let {
-		children,
-		data
+		data,
+		children
 	}: {
-		children: any;
-		data: PageProps['data'];
+		data: LayoutData;
+		children: Snippet;
 	} = $props();
 
 	setContext('user', data.user);
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index a148c75..4f6eedf 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,4 +1,4 @@
-import { getCompetitionsWithAll } from '$lib/server/db/schema/competitions';
+import { getCompetitionsWithAll } from '@/lib/server/db/queries/competitions';
 import type { PageServerLoad } from './$types';
 
 export const load: PageServerLoad = async ({ locals }) => {
diff --git a/src/routes/api/competitions/[id]/+server.ts b/src/routes/api/competitions/[id]/+server.ts
index 60ff3f8..cc0dd80 100644
--- a/src/routes/api/competitions/[id]/+server.ts
+++ b/src/routes/api/competitions/[id]/+server.ts
@@ -1,3 +1,41 @@
-import type { RequestHandler } from '../../../competitions/[id]/$types';
+import { insertRound } from '@/lib/server/db/queries/rounds';
+import type { RequestHandler } from './$types';
+import type { RoundInsert } from '@/lib/server/db/schema/rounds';
+import { SchedulingMode } from '@/types';
 
-export const POST: RequestHandler = () => {};
+export const POST: RequestHandler = async ({ request, params }) => {
+	// get body from request
+	// get competition id from url
+	const body = await request.json();
+	let competitionId;
+	try {
+		competitionId = Number.parseInt(params.id, 10);
+	} catch {
+		throw new Error('Invalid competition id');
+	}
+	if (competitionId === -1) {
+		throw new Error('Invalid competition id');
+	}
+
+	console.log('body', body);
+	console.log('competitionId', competitionId);
+
+	let schedulingMode: SchedulingMode;
+
+	try {
+		schedulingMode = SchedulingMode[body.scheduling_mode as keyof typeof SchedulingMode];
+	} catch {
+		throw new Error('Invalid scheduling mode');
+	}
+
+	// create round
+	const roundInsert: RoundInsert = {
+		nb_matches: 0,
+		competition_id: competitionId,
+		scheduling_mode: schedulingMode
+	};
+
+	const round = await insertRound(competitionId, roundInsert);
+
+	return new Response(JSON.stringify(round));
+};
diff --git a/src/routes/competitions/[id]/+page.server.ts b/src/routes/competitions/[id]/+page.server.ts
index 937ae67..e1e11b6 100644
--- a/src/routes/competitions/[id]/+page.server.ts
+++ b/src/routes/competitions/[id]/+page.server.ts
@@ -1,6 +1,6 @@
 import { db } from '$lib/server/db';
 import type { Actions, PageServerLoad } from './$types';
-import { competitions, getCompetitionWithAll } from '$lib/server/db/schema/competitions';
+import { competitions } from '$lib/server/db/schema/competitions';
 import { error, redirect } from '@sveltejs/kit';
 import { eq } from 'drizzle-orm';
 import { and } from 'drizzle-orm';
@@ -8,6 +8,7 @@ import { teams } from '$lib/server/db/schema/teams';
 import { superValidate } from 'sveltekit-superforms';
 import { zod } from 'sveltekit-superforms/adapters';
 import { formSchema } from '$lib/components/rounds/create-schema';
+import { getCompetitionWithAll } from '@/lib/server/db/queries/competitions';
 
 export const load: PageServerLoad = async ({ params, locals }) => {
 	try {
diff --git a/src/routes/competitions/[id]/+page.svelte b/src/routes/competitions/[id]/+page.svelte
index e68dfcb..9b7bb4c 100644
--- a/src/routes/competitions/[id]/+page.svelte
+++ b/src/routes/competitions/[id]/+page.svelte
@@ -1,29 +1,34 @@
 <script lang="ts">
+	import { enhance } from '$app/forms';
+	import Round from '$lib/components/rounds/round.svelte';
 	import Badge from '$lib/components/ui/badge/badge.svelte';
-	import type { PageProps } from './$types';
-	import { CalendarDays, MapPin, Users, Trophy, Clock, Trash2Icon } from 'lucide-svelte';
-	import { formatDate } from '$lib/utils';
 	import Button from '$lib/components/ui/button/button.svelte';
-	import Card from '$lib/components/ui/card/card.svelte';
-	import CardHeader from '$lib/components/ui/card/card-header.svelte';
 	import CardContent from '$lib/components/ui/card/card-content.svelte';
 	import CardFooter from '$lib/components/ui/card/card-footer.svelte';
+	import CardHeader from '$lib/components/ui/card/card-header.svelte';
+	import Card from '$lib/components/ui/card/card.svelte';
 	import Input from '$lib/components/ui/input/input.svelte';
-	import { enhance } from '$app/forms';
-	import Textarea from '$lib/components/ui/textarea/textarea.svelte';
-	import Tabs from '$lib/components/ui/tabs/tabs.svelte';
+	import TabsContent from '$lib/components/ui/tabs/tabs-content.svelte';
 	import TabsList from '$lib/components/ui/tabs/tabs-list.svelte';
 	import TabsTrigger from '$lib/components/ui/tabs/tabs-trigger.svelte';
-	import TabsContent from '$lib/components/ui/tabs/tabs-content.svelte';
+	import Tabs from '$lib/components/ui/tabs/tabs.svelte';
+	import Textarea from '$lib/components/ui/textarea/textarea.svelte';
+	import { formatDate } from '$lib/utils';
+	import { CalendarDays, Clock, MapPin, PlusIcon, Trash2Icon, Trophy, Users } from 'lucide-svelte';
 	import { Svelvet } from 'svelvet';
-	import Rounds from '$lib/components/rounds/rounds.svelte';
+	import type { PageProps } from './$types';
+	import CreateRound from '@/lib/components/rounds/create-round.svelte';
 
 	let { data }: PageProps = $props();
 
+	let tabValue = $state('rounds');
+
 	let showInputTeam = $state(false);
 	let showInputDescription = $state(false);
 	let description = $state(data.competition.description);
 
+	let showAddRound = $state(false);
+
 	function clearAndCloseDescription() {
 		showInputDescription = false;
 	}
@@ -59,11 +64,19 @@
 		</div>
 	</div>
 
-	<Tabs value="rounds">
-		<TabsList>
-			<TabsTrigger value="general">General</TabsTrigger>
-			<TabsTrigger value="rounds">Rounds</TabsTrigger>
-		</TabsList>
+	<Tabs bind:value={tabValue}>
+		<div class="flex justify-between">
+			<TabsList>
+				<TabsTrigger value="general">General</TabsTrigger>
+				<TabsTrigger value="rounds">Rounds</TabsTrigger>
+			</TabsList>
+			<Button
+				hidden={tabValue !== 'rounds' ||
+					!data.competition.rounds ||
+					data.competition.rounds.length === 0}
+				onclick={() => (showAddRound = !showAddRound)}>Add Round<PlusIcon /></Button
+			>
+		</div>
 		<TabsContent value="general">
 			<div class="grid gap-6 md:grid-cols-3">
 				<Card class=" md:col-span-2">
@@ -166,8 +179,12 @@
 		</TabsContent>
 
 		<TabsContent value="rounds">
-			{#if !data.competition.rounds || data.competition.rounds.length === 0}
-				<Rounds createForm={data.createForm} rounds={data.competition.rounds} />
+			{#if showAddRound || !data.competition.rounds || data.competition.rounds.length === 0}
+				<CreateRound competitionId={data.competition.id} />
+			{:else}
+				{#each data.competition.rounds as round (round.id)}
+					<Round {round} />
+				{/each}
 			{/if}
 		</TabsContent>
 	</Tabs>
diff --git a/src/types.ts b/src/types.ts
index 058c6eb..ce32b76 100644
--- a/src/types.ts
+++ b/src/types.ts
@@ -20,3 +20,9 @@ export enum SchedulingMode {
 	round_robin = 'round_robin',
 	double_round_robin = 'double_round_robin'
 }
+
+export function enumToPgEnum<T extends Record<string, any>>(
+	myEnum: T
+): [T[keyof T], ...T[keyof T][]] {
+	return Object.values(myEnum).map((value: any) => `${value}`) as any;
+}