Various tournament queries migrated to Kysely (#2978)

Author: Sendouc

app/features/tournament-bracket/TournamentMatchRepository.server.ts

@@ -1,4 +1,78 @@
+import { sql } from "kysely";
+import { jsonArrayFrom } from "kysely/helpers/sqlite";
 import { db } from "~/db/sql";
+import type { Unwrapped } from "~/utils/types";
+
+export type FindMatchById = NonNullable<Unwrapped<typeof findMatchById>>;
+export async function findMatchById(id: number) {
+	const row = await db
+		.selectFrom("TournamentMatch")
+		.innerJoin(
+			"TournamentStage",
+			"TournamentStage.id",
+			"TournamentMatch.stageId",
+		)
+		.innerJoin(
+			"TournamentRound",
+			"TournamentRound.id",
+			"TournamentMatch.roundId",
+		)
+		.innerJoin("Tournament", "Tournament.id", "TournamentStage.tournamentId")
+		.select(({ eb }) => [
+			"TournamentMatch.id",
+			"TournamentMatch.groupId",
+			"TournamentMatch.opponentOne",
+			"TournamentMatch.opponentTwo",
+			"TournamentMatch.chatCode",
+			"TournamentMatch.startedAt",
+			"TournamentMatch.status",
+			"Tournament.mapPickingStyle",
+			"TournamentRound.id as roundId",
+			"TournamentRound.maps as roundMaps",
+			jsonArrayFrom(
+				eb
+					.selectFrom("TournamentTeamMember")
+					.innerJoin("User", "User.id", "TournamentTeamMember.userId")
+					.select([
+						"User.id",
+						"User.username",
+						"TournamentTeamMember.tournamentTeamId",
+						sql<
+							string | null
+						>`coalesce("TournamentTeamMember"."inGameName", "User"."inGameName")`.as(
+							"inGameName",
+						),
+						"User.discordId",
+						"User.customUrl",
+						"User.discordAvatar",
+						"User.pronouns",
+					])
+					.where(({ or, eb: innerEb }) =>
+						or([
+							innerEb(
+								"TournamentTeamMember.tournamentTeamId",
+								"=",
+								sql<number>`"TournamentMatch"."opponentOne" ->> '$.id'`,
+							),
+							innerEb(
+								"TournamentTeamMember.tournamentTeamId",
+								"=",
+								sql<number>`"TournamentMatch"."opponentTwo" ->> '$.id'`,
+							),
+						]),
+					),
+			).as("players"),
+		])
+		.where("TournamentMatch.id", "=", id)
+		.executeTakeFirst();
+
+	if (!row) return;
+
+	return {
+		...row,
+		bestOf: row.roundMaps.count,
+	};
+}
 
 export function findResultById(id: number) {
 	return db

app/features/tournament-bracket/actions/to.$id.brackets.server.ts

@@ -288,9 +288,8 @@ export const action: ActionFunction = async ({ params, request }) => {
 				`Checking in (bracket try): tournament team id: ${teamMemberOf.id} - user id: ${user.id} - tournament id: ${tournament.ctx.id} - bracket idx: ${data.bracketIdx}`,
 			);
 
-			await TournamentTeamRepository.checkIn({
+			await TournamentTeamRepository.checkIn(teamMemberOf.id, {
 				bracketIdx: data.bracketIdx,
-				tournamentTeamId: teamMemberOf.id,
 			});
 
 			logger.info(

app/features/tournament-bracket/actions/to.$id.matches.$mid.server.ts

@@ -29,14 +29,11 @@ import { deleteMatchPickBanEvents } from "../queries/deleteMatchPickBanEvents.se
 import { deleteParticipantsByMatchGameResultId } from "../queries/deleteParticipantsByMatchGameResultId.server";
 import { deletePickBanEvent } from "../queries/deletePickBanEvent.server";
 import { deleteTournamentMatchGameResultById } from "../queries/deleteTournamentMatchGameResultById.server";
-import {
-	type FindMatchById,
-	findMatchById,
-} from "../queries/findMatchById.server";
 import { findResultsByMatchId } from "../queries/findResultsByMatchId.server";
 import { insertTournamentMatchGameResult } from "../queries/insertTournamentMatchGameResult.server";
 import { insertTournamentMatchGameResultParticipant } from "../queries/insertTournamentMatchGameResultParticipant.server";
 import { updateMatchGameResultPoints } from "../queries/updateMatchGameResultPoints.server";
+import type { FindMatchById } from "../TournamentMatchRepository.server";
 import {
 	matchPageParamsSchema,
 	matchSchema,
@@ -56,7 +53,9 @@ export const action: ActionFunction = async ({ params, request }) => {
 		params,
 		schema: matchPageParamsSchema,
 	});
-	const match = notFoundIfFalsy(findMatchById(matchId));
+	const match = notFoundIfFalsy(
+		await TournamentMatchRepository.findMatchById(matchId),
+	);
 	const data = await parseRequestPayload({
 		request,
 		schema: matchSchema,

app/features/tournament-bracket/loaders/to.$id.matches.$mid.server.ts

@@ -15,8 +15,8 @@ import { executeRoll } from "../core/executeRoll.server";
 import { mapListFromResults, resolveMapList } from "../core/mapList.server";
 import * as PickBan from "../core/PickBan";
 import { tournamentFromDBCached } from "../core/Tournament.server";
-import { findMatchById } from "../queries/findMatchById.server";
 import { findResultsByMatchId } from "../queries/findResultsByMatchId.server";
+import * as TournamentMatchRepository from "../TournamentMatchRepository.server";
 import { matchPageParamsSchema } from "../tournament-bracket-schemas.server";
 import { matchEndedEarly } from "../tournament-bracket-utils";
 
@@ -33,7 +33,9 @@ export const loader = async ({ params }: LoaderFunctionArgs) => {
 		user: undefined,
 	});
 
-	const match = notFoundIfFalsy(findMatchById(matchId));
+	const match = notFoundIfFalsy(
+		await TournamentMatchRepository.findMatchById(matchId),
+	);
 
 	const isBye = !match.opponentOne || !match.opponentTwo;
 	if (isBye) {