From 2c25ef6561e8d1bd710d721c1537658b2c1ef46b Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sun, 2 Nov 2025 17:53:49 +0200
Subject: [PATCH] Fix bugs with new tournament adding

---
 .../calendar/loaders/calendar.new.server.ts   | 30 +++++++++++--------
 1 file changed, 17 insertions(+), 13 deletions(-)

diff --git a/app/features/calendar/loaders/calendar.new.server.ts b/app/features/calendar/loaders/calendar.new.server.ts
index 38850b67e..bdc4b85e9 100644
--- a/app/features/calendar/loaders/calendar.new.server.ts
+++ b/app/features/calendar/loaders/calendar.new.server.ts
@@ -65,8 +65,21 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 
 	const managedBadges = await BadgeRepository.findManagedByUserId(user.id);
 
+	const organizations = (
+		await findValidOrganizations(
+			user.id,
+			user.roles.includes("TOURNAMENT_ADDER"),
+		)
+	).concat(
+		eventToEdit?.tournament?.ctx.organization
+			? eventToEdit.tournament.ctx.organization
+			: [],
+	);
+
+	const canAddTournaments = organizations.length > 0;
+
 	const eventToCopyRaw =
-		user.roles.includes("TOURNAMENT_ADDER") && !eventToEdit
+		canAddTournaments && !eventToEdit
 			? await eventWithTournament("copyEventId")
 			: undefined;
 
@@ -89,19 +102,10 @@ export const loader = async ({ request }: LoaderFunctionArgs) => {
 		eventToEdit: canEditEvent ? eventToEdit : undefined,
 		eventToCopy,
 		recentTournaments:
-			user.roles.includes("TOURNAMENT_ADDER") && !eventToEdit
+			canAddTournaments && !eventToEdit
 				? await CalendarRepository.findRecentTournamentsByAuthorId(user.id)
 				: undefined,
-		organizations: (
-			await findValidOrganizations(
-				user.id,
-				user.roles.includes("TOURNAMENT_ADDER"),
-			)
-		).concat(
-			eventToEdit?.tournament?.ctx.organization
-				? eventToEdit.tournament.ctx.organization
-				: [],
-		),
+		organizations,
 	};
 };
 
@@ -110,7 +114,7 @@ export async function findValidOrganizations(
 	isTournamentAdder: boolean,
 ) {
 	const orgs = await TournamentOrganizationRepository.findByUserId(userId, {
-		roles: ["ADMIN"],
+		roles: ["ADMIN", "ORGANIZER"],
 	});
 
 	if (isTournamentAdder) {