From a17d1a543b7ba23b8097657ced25da99dd41bb40 Mon Sep 17 00:00:00 2001 From: Laurent Date: Thu, 20 Jun 2024 16:33:48 +0200 Subject: [PATCH] Fixes user id stuff --- PadelClub/Data/DataStore.swift | 12 ++++-------- .../Views/Calling/CallMessageCustomizationView.swift | 2 +- PadelClub/Views/Club/ClubsView.swift | 4 ++-- PadelClub/Views/Club/CreateClubView.swift | 2 +- PadelClub/Views/Planning/PlanningSettingsView.swift | 2 +- .../Components/TournamentClubSettingsView.swift | 6 +++--- 6 files changed, 12 insertions(+), 16 deletions(-) diff --git a/PadelClub/Data/DataStore.swift b/PadelClub/Data/DataStore.swift index aee87b6..d16972d 100644 --- a/PadelClub/Data/DataStore.swift +++ b/PadelClub/Data/DataStore.swift @@ -139,8 +139,8 @@ class DataStore: ObservableObject { fileprivate func _fixMissingClubCreatorIfNecessary(_ clubsCollection: StoredCollection) { for club in clubsCollection { - if club.creator == nil && self.user.username.count > 0 { - club.creator = self.user.id + if let userId = Store.main.userId, club.creator == nil { + club.creator = userId clubsCollection.writeChangeAndInsertOnServer(instance: club) } } @@ -148,14 +148,10 @@ class DataStore: ObservableObject { fileprivate func _fixMissingEventCreatorIfNecessary(_ eventsCollection: StoredCollection) { for event in eventsCollection { - if event.creator == nil && self.user.username.count > 0 { - event.creator = self.user.id + if let userId = Store.main.userId, event.creator == nil { + event.creator = userId do { try event.insertOnServer() -// try eventsCollection.writeChangeAndInsertOnServer(instance: event) -// for tournament in event.tournaments { -// try self.tournaments.writeChangeAndInsertOnServer(instance: tournament) -// } } catch { Logger.error(error) } diff --git a/PadelClub/Views/Calling/CallMessageCustomizationView.swift b/PadelClub/Views/Calling/CallMessageCustomizationView.swift index 08c3154..36b3a33 100644 --- a/PadelClub/Views/Calling/CallMessageCustomizationView.swift +++ b/PadelClub/Views/Calling/CallMessageCustomizationView.swift @@ -206,7 +206,7 @@ struct CallMessageCustomizationView: View { @ViewBuilder private func _clubNameView() -> some View { if let eventClub = tournament.eventObject()?.clubObject() { - let hasBeenCreated: Bool = eventClub.hasBeenCreated(by: dataStore.user.id) + let hasBeenCreated: Bool = eventClub.hasBeenCreated(by: Store.main.userId) Section { TextField("Nom du club", text: $customClubName, axis: .vertical) .lineLimit(2) diff --git a/PadelClub/Views/Club/ClubsView.swift b/PadelClub/Views/Club/ClubsView.swift index d69825d..9812223 100644 --- a/PadelClub/Views/Club/ClubsView.swift +++ b/PadelClub/Views/Club/ClubsView.swift @@ -48,7 +48,7 @@ struct ClubsView: View { .buttonStyle(.plain) } else { NavigationLink { - ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: dataStore.user.id) ? .edition : .lockedForEditing) + ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: Store.main.userId) ? .edition : .lockedForEditing) } label: { ClubRowView(club: club) } @@ -74,7 +74,7 @@ struct ClubsView: View { .buttonStyle(.plain) } else { NavigationLink { - ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: dataStore.user.id) ? .edition : .lockedForEditing) + ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: Store.main.userId) ? .edition : .lockedForEditing) } label: { ClubRowView(club: club) } diff --git a/PadelClub/Views/Club/CreateClubView.swift b/PadelClub/Views/Club/CreateClubView.swift index 8bcf280..505ab9d 100644 --- a/PadelClub/Views/Club/CreateClubView.swift +++ b/PadelClub/Views/Club/CreateClubView.swift @@ -48,7 +48,7 @@ struct CreateClubView: View { let existingOrCreatedClub = Club.findOrCreate(name: club.name, code: club.code, city: club.city, zipCode: club.zipCode) //update existing club if rights ok / freshly created club with data input from user - if existingOrCreatedClub.hasBeenCreated(by: dataStore.user.id) { + if existingOrCreatedClub.hasBeenCreated(by: Store.main.userId) { existingOrCreatedClub.update(fromClub: club) } diff --git a/PadelClub/Views/Planning/PlanningSettingsView.swift b/PadelClub/Views/Planning/PlanningSettingsView.swift index 4a005f1..fe36063 100644 --- a/PadelClub/Views/Planning/PlanningSettingsView.swift +++ b/PadelClub/Views/Planning/PlanningSettingsView.swift @@ -68,7 +68,7 @@ struct PlanningSettingsView: View { let verb = tournament.courtCount > 1 ? "seront" : "sera" Text("En réduisant les terrains maximum, seul\(plural) le\(plural) \(tournament.courtCount) premier\(plural) terrain\(plural) \(verb) utilisé\(plural)") + Text(", par contre, si vous augmentez le nombre de terrains, vous pourrez plutôt préciser quel terrain n'est pas disponible.") } else if tournament.courtCount > club.courtCount { - let isCreatedByUser = club.hasBeenCreated(by: dataStore.user.id) + let isCreatedByUser = club.hasBeenCreated(by: Store.main.userId) Button { do { club.courtCount = tournament.courtCount diff --git a/PadelClub/Views/Tournament/Screen/Components/TournamentClubSettingsView.swift b/PadelClub/Views/Tournament/Screen/Components/TournamentClubSettingsView.swift index 0ab2809..0425f9e 100644 --- a/PadelClub/Views/Tournament/Screen/Components/TournamentClubSettingsView.swift +++ b/PadelClub/Views/Tournament/Screen/Components/TournamentClubSettingsView.swift @@ -75,7 +75,7 @@ struct TournamentClubSettingsView: View { let verb = tournament.courtCount > 1 ? "seront" : "sera" Text("En réduisant les terrains maximum, seul\(plural) le\(plural) \(tournament.courtCount) premier\(plural) terrain\(plural) \(verb) utilisé\(plural)") + Text(", par contre, si vous augmentez le nombre de terrains, vous pourrez plutôt préciser quel terrain n'est pas disponible.") } else if tournament.courtCount > club.courtCount { - let isCreatedByUser = club.hasBeenCreated(by: dataStore.user.id) + let isCreatedByUser = club.hasBeenCreated(by: Store.main.userId) Button { do { club.courtCount = tournament.courtCount @@ -100,7 +100,7 @@ struct TournamentClubSettingsView: View { if let selectedClub { - ClubCourtSetupView(club: selectedClub, displayContext: selectedClub.hasBeenCreated(by: dataStore.user.id) ? .edition : .lockedForEditing, selectedCourt: $selectedCourt) + ClubCourtSetupView(club: selectedClub, displayContext: selectedClub.hasBeenCreated(by: Store.main.userId) ? .edition : .lockedForEditing, selectedCourt: $selectedCourt) .onChange(of: selectedClub.courtCount) { tournament.courtCount = max(tournament.courtCount, selectedClub.courtCount) do { @@ -112,7 +112,7 @@ struct TournamentClubSettingsView: View { } } .navigationDestination(item: $showClubDetail) { club in - ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: dataStore.user.id) ? .edition : .lockedForEditing) + ClubDetailView(club: club, displayContext: club.hasBeenCreated(by: Store.main.userId) ? .edition : .lockedForEditing) } .navigationDestination(item: $selectedCourt) { court in CourtView(court: court)