From e97ffe2fc16539e16bb8f9734f3ea60ed6209a59 Mon Sep 17 00:00:00 2001
From: Kalle <38327916+Sendouc@users.noreply.github.com>
Date: Sat, 27 Jul 2024 10:18:59 +0300
Subject: [PATCH] Fix many events showing in the list and messing up React keys

---
 .../TournamentOrganizationRepository.server.ts               | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/features/tournament-organization/TournamentOrganizationRepository.server.ts b/app/features/tournament-organization/TournamentOrganizationRepository.server.ts
index ca7bb5cc8..656458d6f 100644
--- a/app/features/tournament-organization/TournamentOrganizationRepository.server.ts
+++ b/app/features/tournament-organization/TournamentOrganizationRepository.server.ts
@@ -136,7 +136,7 @@ const findEventsBaseQuery = (organizationId: number) =>
 			"CalendarEvent.id as eventId",
 			"CalendarEvent.name",
 			"CalendarEvent.tournamentId",
-			"CalendarEventDate.startTime",
+			eb.fn.min("CalendarEventDate.startTime").as("startTime"),
 			eb
 				.selectFrom("UserSubmittedImage")
 				.select(["UserSubmittedImage.url"])
@@ -207,7 +207,8 @@ const findEventsBaseQuery = (organizationId: number) =>
 					.where("CalendarEventResultTeam.placement", "=", 1),
 			).as("eventWinners"),
 		])
-		.where("CalendarEvent.organizationId", "=", organizationId);
+		.where("CalendarEvent.organizationId", "=", organizationId)
+		.groupBy("CalendarEvent.id");
 
 const mapEvent = <
 	T extends {