From 48d98b2a27708b5d7072973bdff715eff57f822f Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sun, 9 Nov 2025 11:35:59 +0200
Subject: [PATCH] Fix tournamentLogoWithDefault function returning null instead
 of default

---
 app/utils/kysely.server.ts | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/app/utils/kysely.server.ts b/app/utils/kysely.server.ts
index be4b6d751..26d6f7514 100644
--- a/app/utils/kysely.server.ts
+++ b/app/utils/kysely.server.ts
@@ -81,26 +81,22 @@ export function tournamentLogoOrNull(
  * @returns A SQL expression that concatenates the image root URL with either the custom logo URL or default logo
  */
 export function tournamentLogoWithDefault(
-	/** Expression builder scoped to the CalendarEvent table */
 	eb: ExpressionBuilder<Tables, "CalendarEvent">,
 ) {
 	return concatUserSubmittedImagePrefix(
-		eb
-			.selectFrom("UnvalidatedUserSubmittedImage")
-			.select((eb) => [
-				eb.fn
-					.coalesce(
-						"UnvalidatedUserSubmittedImage.url",
-						sql.lit(`${import.meta.env.VITE_TOURNAMENT_DEFAULT_LOGO}`),
-					)
-					.as("url"),
-			])
-			.whereRef(
-				"CalendarEvent.avatarImgId",
-				"=",
-				"UnvalidatedUserSubmittedImage.id",
-			)
-			.$asScalar(),
+		eb.fn.coalesce(
+			eb
+				.selectFrom("UnvalidatedUserSubmittedImage")
+				.select("UnvalidatedUserSubmittedImage.url")
+				.whereRef(
+					"CalendarEvent.avatarImgId",
+					"=",
+					"UnvalidatedUserSubmittedImage.id",
+				)
+				.$asScalar(),
+			sql.lit(`${import.meta.env.VITE_TOURNAMENT_DEFAULT_LOGO}
+  `),
+		),
 	);
 }