From 443d06be74b9e0c4e88feee08c6da4aefe5e5e12 Mon Sep 17 00:00:00 2001
From: Razmig Sarkissian <razmig@staxriver.com>
Date: Mon, 1 Jul 2024 17:47:55 +0200
Subject: [PATCH] fix post merge

---
 PadelClub/Data/Match.swift                     | 18 ++----------------
 PadelClub/Views/Navigation/MainView.swift      |  2 +-
 PadelClub/Views/Round/LoserRoundView.swift     |  3 +--
 .../Tournament/Screen/TournamentRankView.swift |  7 +++----
 4 files changed, 7 insertions(+), 23 deletions(-)

diff --git a/PadelClub/Data/Match.swift b/PadelClub/Data/Match.swift
index bef1ef7..738d2d6 100644
--- a/PadelClub/Data/Match.swift
+++ b/PadelClub/Data/Match.swift
@@ -223,7 +223,7 @@ defer {
         let existingTeamScore = teamScore(ofTeam: team) ?? TeamScore(match: id, team: team)
         existingTeamScore.walkOut = 1
         do {
-            try DataStore.shared.teamScores.addOrUpdate(instance: existingTeamScore)
+            try self.tournamentStore.teamScores.addOrUpdate(instance: existingTeamScore)
         } catch {
             Logger.error(error)
         }
@@ -239,27 +239,13 @@ defer {
     
     func setLuckyLoser(team: TeamRegistration, teamPosition: TeamPosition) {
         resetMatch()
-        let previousScores = teamScores.filter({ $0.luckyLoser != nil })
-        do {
-            try self.tournamentStore.teamScores.delete(contentOfs: previousScores)
-        } catch {
-            Logger.error(error)
-        }
-
-        if let existingTeamScore = teamScore(ofTeam: team) {
-            do {
-                try self.tournamentStore.teamScores.delete(instance: existingTeamScore)
-            } catch {
-                Logger.error(error)
-            }
-        }
         
         let matchIndex = index
         let position = matchIndex * 2 + teamPosition.rawValue
         
         let previousScores = teamScores.filter({ $0.luckyLoser == position })
         do {
-            try DataStore.shared.teamScores.delete(contentOfs: previousScores)
+            try self.tournamentStore.teamScores.delete(contentOfs: previousScores)
         } catch {
             Logger.error(error)
         }
diff --git a/PadelClub/Views/Navigation/MainView.swift b/PadelClub/Views/Navigation/MainView.swift
index eeaf717..c7f7001 100644
--- a/PadelClub/Views/Navigation/MainView.swift
+++ b/PadelClub/Views/Navigation/MainView.swift
@@ -87,7 +87,7 @@ struct MainView: View {
         }
         .environmentObject(dataStore)
         .task {
-            await self._checkSourceFileAvailability()
+            //await self._checkSourceFileAvailability()
             if StoreCenter.main.hasToken() {
                 do {
                     try await dataStore.clubs.loadDataFromServerIfAllowed()
diff --git a/PadelClub/Views/Round/LoserRoundView.swift b/PadelClub/Views/Round/LoserRoundView.swift
index 5b50bd9..19fc8bc 100644
--- a/PadelClub/Views/Round/LoserRoundView.swift
+++ b/PadelClub/Views/Round/LoserRoundView.swift
@@ -9,7 +9,6 @@ import SwiftUI
 import LeStorage
 
 struct LoserRoundView: View {
-    @EnvironmentObject var dataStore: DataStore
     @Environment(Tournament.self) var tournament: Tournament
     @Environment(\.isEditingTournamentSeed) private var isEditingTournamentSeed
     
@@ -93,7 +92,7 @@ struct LoserRoundView: View {
                         let allRoundMatches = loserBracket.allMatches
                         allRoundMatches.forEach({ $0.name = $0.roundTitle() })
                         do {
-                            try DataStore.shared.matches.addOrUpdate(contentOfs: allRoundMatches)
+                            try self.tournament.tournamentStore.matches.addOrUpdate(contentOfs: allRoundMatches)
                         } catch {
                             Logger.error(error)
                         }
diff --git a/PadelClub/Views/Tournament/Screen/TournamentRankView.swift b/PadelClub/Views/Tournament/Screen/TournamentRankView.swift
index f9fd065..b9ed6b2 100644
--- a/PadelClub/Views/Tournament/Screen/TournamentRankView.swift
+++ b/PadelClub/Views/Tournament/Screen/TournamentRankView.swift
@@ -160,7 +160,6 @@ struct TournamentRankView: View {
     struct TeamRankCellView: View {
         @Environment(\.editMode) private var editMode
         @Environment(Tournament.self) var tournament: Tournament
-        @EnvironmentObject var dataStore: DataStore
         @State private var isEditingTeam: Bool = false
         @Bindable var team: TeamRegistration
         @State var key: Int
@@ -173,7 +172,7 @@ struct TournamentRankView: View {
                             key -= 1
                             team.finalRanking = key
                             do {
-                                try dataStore.teamRegistrations.addOrUpdate(instance: team)
+                                try self.tournament.tournamentStore.teamRegistrations.addOrUpdate(instance: team)
                             } catch {
                                 Logger.error(error)
                             }
@@ -264,7 +263,7 @@ struct TournamentRankView: View {
                         key += 1
                         team.finalRanking = key
                         do {
-                            try dataStore.teamRegistrations.addOrUpdate(instance: team)
+                            try self.tournament.tournamentStore.teamRegistrations.addOrUpdate(instance: team)
                         } catch {
                             Logger.error(error)
                         }
@@ -283,7 +282,7 @@ struct TournamentRankView: View {
                 Button("Valider") {
                     team.pointsEarned = tournament.isAnimation() ? nil : tournament.tournamentLevel.points(for: key - 1, count: tournament.teamCount)
                     do {
-                        try dataStore.teamRegistrations.addOrUpdate(instance: team)
+                        try self.tournament.tournamentStore.teamRegistrations.addOrUpdate(instance: team)
                     } catch {
                         Logger.error(error)
                     }