From c119e5a412a54149fcfcd1e6f5a5424e557e5224 Mon Sep 17 00:00:00 2001 From: Raz Date: Mon, 3 Feb 2025 17:38:59 +0100 Subject: [PATCH] fix crash when filtering with no code club --- PadelClub/ViewModel/FederalDataViewModel.swift | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/PadelClub/ViewModel/FederalDataViewModel.swift b/PadelClub/ViewModel/FederalDataViewModel.swift index 2ca3b2f..c841fb7 100644 --- a/PadelClub/ViewModel/FederalDataViewModel.swift +++ b/PadelClub/ViewModel/FederalDataViewModel.swift @@ -90,7 +90,7 @@ class FederalDataViewModel { && (ageCategories.isEmpty || tournament.tournaments.anySatisfy({ ageCategories.contains($0.age) })) && - (selectedClubs.isEmpty || selectedClubs.contains(tournament.codeClub!)) + (selectedClubs.isEmpty || (tournament.codeClub != nil && selectedClubs.contains(tournament.codeClub!))) && (dayPeriod == .all || (dayPeriod != .all && dayPeriod == tournament.dayPeriod)) && @@ -100,7 +100,7 @@ class FederalDataViewModel { func countForTournamentBuilds(from tournaments: [any FederalTournamentHolder]) -> Int { tournaments.filter({ tournament in - (selectedClubs.isEmpty || selectedClubs.contains(tournament.codeClub!)) + (selectedClubs.isEmpty || (tournament.codeClub != nil && selectedClubs.contains(tournament.codeClub!))) && (dayPeriod == .all || (dayPeriod != .all && dayPeriod == tournament.dayPeriod)) && @@ -151,7 +151,7 @@ class FederalDataViewModel { && (ageCategories.isEmpty || ageCategories.contains(build.age)) && - (selectedClubs.isEmpty || selectedClubs.contains(tournament.codeClub!)) + (selectedClubs.isEmpty || (tournament.codeClub != nil && selectedClubs.contains(tournament.codeClub!))) && (dayPeriod == .all || (dayPeriod != .all && dayPeriod == tournament.dayPeriod)) &&