From a691755d2909b3504c8e0d3d0c60ebac0e5b4ad8 Mon Sep 17 00:00:00 2001 From: Laurent Date: Fri, 21 Jun 2024 09:05:28 +0200 Subject: [PATCH] better show where the creator is set --- PadelClub/Data/Club.swift | 2 +- PadelClub/Views/Club/CreateClubView.swift | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/PadelClub/Data/Club.swift b/PadelClub/Data/Club.swift index 8c615b8..0428a90 100644 --- a/PadelClub/Data/Club.swift +++ b/PadelClub/Data/Club.swift @@ -237,7 +237,7 @@ extension Club { if clubs.isEmpty == false { return clubs.first! } else { - return Club(creator: Store.main.userId, name: name, code: code, city: city, zipCode: zipCode) + return Club(name: name, code: code, city: city, zipCode: zipCode) } } diff --git a/PadelClub/Views/Club/CreateClubView.swift b/PadelClub/Views/Club/CreateClubView.swift index 505ab9d..3adfd47 100644 --- a/PadelClub/Views/Club/CreateClubView.swift +++ b/PadelClub/Views/Club/CreateClubView.swift @@ -45,26 +45,27 @@ struct CreateClubView: View { Logger.error(error) } - let existingOrCreatedClub = Club.findOrCreate(name: club.name, code: club.code, city: club.city, zipCode: club.zipCode) + let club = Club.findOrCreate(name: club.name, code: club.code, city: club.city, zipCode: club.zipCode) + club.creator = Store.main.userId //update existing club if rights ok / freshly created club with data input from user - if existingOrCreatedClub.hasBeenCreated(by: Store.main.userId) { - existingOrCreatedClub.update(fromClub: club) + if club.hasBeenCreated(by: Store.main.userId) { + club.update(fromClub: club) } do { - try dataStore.clubs.addOrUpdate(instance: existingOrCreatedClub) + try dataStore.clubs.addOrUpdate(instance: club) } catch { Logger.error(error) } //save into user - if dataStore.user.clubs.contains(where: { $0 == existingOrCreatedClub.id }) == false { - dataStore.user.clubs.append(existingOrCreatedClub.id) + if dataStore.user.clubs.contains(where: { $0 == club.id }) == false { + dataStore.user.clubs.append(club.id) self.dataStore.saveUser() } dismiss() - selection?(existingOrCreatedClub) + selection?(club) } } }