diff --git a/app/features/leaderboards/LeaderboardRepository.server.ts b/app/features/leaderboards/LeaderboardRepository.server.ts index dd214cb8b..8c7ff2b0b 100644 --- a/app/features/leaderboards/LeaderboardRepository.server.ts +++ b/app/features/leaderboards/LeaderboardRepository.server.ts @@ -87,15 +87,15 @@ export async function teamLeaderboardBySeason({ onlyOneEntryPerUser: boolean; }) { const entries = await teamLeaderboardBySeasonQuery(season).execute(); + const withIgnoredHandled = onlyOneEntryPerUser + ? ignoreTeams({ season, entries }) + : entries; const oneEntryPerUser = onlyOneEntryPerUser - ? filterOneEntryPerUser(entries) - : entries; + ? filterOneEntryPerUser(withIgnoredHandled) + : withIgnoredHandled; const withSharedTeam = resolveSharedTeam(oneEntryPerUser); - const withIgnoredHandled = onlyOneEntryPerUser - ? ignoreTeams({ season, entries: withSharedTeam }) - : withSharedTeam; - const withPower = addPowers(withIgnoredHandled); + const withPower = addPowers(withSharedTeam); return addPlacementRank(withPower); } @@ -132,7 +132,7 @@ function resolveSharedTeam(entries: ReturnType) { function ignoreTeams({ season, entries, -}: { season: number; entries: ReturnType }) { +}: { season: number; entries: TeamLeaderboardBySeasonQueryReturnType }) { const ignoredTeams = IGNORED_TEAMS.get(season); if (!ignoredTeams) return entries;