Skip to content

fix: keep competition order when merging cached standings #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ItamarShDev merged 1 commit into from
Sep 9, 2026
Merged

fix: keep competition order when merging cached standings #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions convex/football.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,14 +159,15 @@ function mergeWithPrevious(
const nextId = next.matchDetails?.id;
const sameMatch = nextId != null && nextId === prev?.matchDetails?.id;

const freshLeagueIds = new Set(fresh.leaguesData.map((l) => l.leagueId));
const keptLeagues = (previous.leaguesData ?? []).filter(
(l) => requestedLeagueIds.includes(l.leagueId) && !freshLeagueIds.has(l.leagueId),
);
const freshLeagues = new Map(fresh.leaguesData.map((entry) => [entry.leagueId, entry]));
const previousLeagues = new Map((previous.leaguesData ?? []).map((entry) => [entry.leagueId, entry]));

return {
team: fresh.team,
leaguesData: [...fresh.leaguesData, ...keptLeagues],
leaguesData: requestedLeagueIds.flatMap((leagueId) => {
const entry = freshLeagues.get(leagueId) ?? previousLeagues.get(leagueId);
return entry ? [entry] : [];
}),
nextMatchData:
!fixturesFetched && prev
? prev
Expand Down
Loading