add cache example

fix issue with structure reset

.gitignore

@@ -3,8 +3,12 @@
 #
 # gitignore contributors: remember to update Global/Xcode.gitignore, Objective-C.gitignore & Swift.gitignore
 
+PadelClubDataTests/config.plist
+
 ## User settings
 xcuserdata/
+.DS_Store
+config.plist
 
 ## compatibility with Xcode 8 and earlier (ignoring not required starting Xcode 9)
 *.xcscmblueprint

PadelClubData/Data/Club.swift

@@ -29,15 +29,12 @@ final public class Club: BaseClub {
         DataStore.shared.courts.filter { $0.club == self.id }.sorted(by: \.index)
     }
 
-    public override func deleteDependencies(store: Store, shouldBeSynchronized: Bool) {
+    public override func deleteDependencies(store: Store, actionOption: ActionOption) {
-        
+        store.deleteDependencies(type: Court.self, actionOption: actionOption) { $0.club == self.id }
-        store.deleteDependencies(type: Court.self, shouldBeSynchronized: shouldBeSynchronized) { $0.club == self.id }
+    }
 
-//        let customizedCourts = self.customizedCourts
+    public override func deleteUnusedSharedDependencies(store: Store) {
-//        for customizedCourt in customizedCourts {
+        store.deleteUnusedSharedDependencies(type: Court.self) { $0.club == self.id }
-//            customizedCourt.deleteDependencies(store: store, shouldBeSynchronized: shouldBeSynchronized)
-//        }
-//        DataStore.shared.courts.deleteDependencies(customizedCourts, shouldBeSynchronized: shouldBeSynchronized)
     }
 
 }

PadelClubData/Data/Court.swift

@@ -32,7 +32,7 @@ final public class Court: BaseCourt {
         Store.main.findById(club)
     }
     
-    public override func deleteDependencies(store: Store, shouldBeSynchronized: Bool) {
+    public override func deleteDependencies(store: Store, actionOption: ActionOption) {
     }
     
 }

PadelClubData/Data/DataStore.swift

@@ -22,8 +22,8 @@ public class DataStore: ObservableObject {
                 if self.user.id != self.userStorage.item()?.id {
                     self.userStorage.setItemNoSync(self.user)
                     StoreCenter.main.initialSynchronization(clear: false)
-                    self._fixMissingClubCreatorIfNecessary(self.clubs)
+                    self._fixMissingClubCreatorIfNecessary()
-                    self._fixMissingEventCreatorIfNecessary(self.events)
+                    self._fixMissingEventCreatorIfNecessary()
                 }
             } else {
                 self._temporaryLocalUser.item = self.user
@@ -59,7 +59,7 @@ public class DataStore: ObservableObject {
         self.events = store.registerSynchronizedCollection(indexed: indexed)
         self.dateIntervals = store.registerSynchronizedCollection(indexed: indexed)
         self.userStorage = store.registerObject(synchronized: true, shouldLoadDataFromServer: false)
-        self.purchases = Store.main.registerSynchronizedCollection(inMemory: true)
+        self.purchases = store.registerSynchronizedCollection(inMemory: true)
 
         self.monthData = store.registerCollection(indexed: indexed)
 
@@ -96,12 +96,12 @@ public class DataStore: ObservableObject {
     
     @objc func collectionDidLoad(notification: Notification) {
 
-        if let userSingleton: StoredSingleton<CustomUser> = notification.object as? StoredSingleton<CustomUser> {
+        if let userSingleton: StoredCollection<CustomUser> = notification.object as? StoredCollection<CustomUser> {
-            self.user = userSingleton.item() ?? self._temporaryLocalUser.item ?? CustomUser.placeHolder()
+            self.user = userSingleton.first ?? self._temporaryLocalUser.item ?? CustomUser.placeHolder()
-        } else if let clubsCollection: SyncedCollection<Club> = notification.object as? SyncedCollection<Club> {
+        } else if notification.object is StoredCollection<Club> {
-            self._fixMissingClubCreatorIfNecessary(clubsCollection)
+            self._fixMissingClubCreatorIfNecessary()
-        } else if let eventsCollection: SyncedCollection<Event> = notification.object as? SyncedCollection<Event> {
+        } else if notification.object is StoredCollection<Event> {
-            self._fixMissingEventCreatorIfNecessary(eventsCollection)
+            self._fixMissingEventCreatorIfNecessary()
         }
         
         if Store.main.fileCollectionsAllLoaded() {
@@ -111,10 +111,11 @@ public class DataStore: ObservableObject {
         
     }
     
-    fileprivate func _fixMissingClubCreatorIfNecessary(_ clubsCollection: SyncedCollection<Club>) {
+    fileprivate func _fixMissingClubCreatorIfNecessary() {
         
         if self.user.clubs.count > 0 { return }
         
+        let clubsCollection = DataStore.shared.clubs
         for club in clubsCollection {
             if let userId = StoreCenter.main.userId, club.creator == nil {
                 club.creator = userId
@@ -125,7 +126,8 @@ public class DataStore: ObservableObject {
         }
     }
     
-    fileprivate func _fixMissingEventCreatorIfNecessary(_ eventsCollection: SyncedCollection<Event>) {
+    fileprivate func _fixMissingEventCreatorIfNecessary() {
+        let eventsCollection = DataStore.shared.events
         for event in eventsCollection {
             if let userId = StoreCenter.main.userId, event.creator == nil {
                 event.creator = userId
@@ -330,7 +332,7 @@ public class DataStore: ObservableObject {
         _lastRunningAndNextCheckDate = nil
     }
     
-    public func runningAndNextMatches() -> [Match] {
+    public func runningAndNextMatches(_ selectedTournaments: Set<String> = Set()) -> [Match] {
         let dateNow : Date = Date()
         if let lastCheck = _lastRunningAndNextCheckDate,
            let cachedMatches = _cachedRunningAndNextMatches,
@@ -338,7 +340,7 @@ public class DataStore: ObservableObject {
             return cachedMatches
         }
 
-        let lastTournaments = self.tournaments.filter { $0.isDeleted == false && $0.startDate <= dateNow && $0.hasEnded() == false }.sorted(by: \Tournament.startDate, order: .descending).prefix(10)
+        let lastTournaments = self.tournaments.filter { (selectedTournaments.isEmpty || selectedTournaments.contains($0.id) == false) && $0.isDeleted == false && $0.startDate <= dateNow.addingTimeInterval(86_400) && $0.hasEnded() == false }.sorted(by: \Tournament.startDate, order: .descending).prefix(10)
         
         var runningMatches: [Match] = []
         for tournament in lastTournaments {

PadelClubData/Data/DateInterval.swift

@@ -28,7 +28,7 @@ final public class DateInterval: BaseDateInterval {
         date <= startDate && date <= endDate && date >= startDate && date >= endDate
     }
     
-    public override func deleteDependencies(store: Store, shouldBeSynchronized: Bool) {
+    public override func deleteDependencies(store: Store, actionOption: ActionOption) {
     }
     
 //    enum CodingKeys: String, CodingKey {

PadelClubData/Data/DrawLog.swift

@@ -74,7 +74,7 @@ final public class DrawLog: BaseDrawLog, SideStorable {
         return TournamentLibrary.shared.store(tournamentId: self.tournament)
     }
 
-    public override func deleteDependencies(store: Store, shouldBeSynchronized: Bool) {
+    public override func deleteDependencies(store: Store, actionOption: ActionOption) {
     }
     
 }

PadelClubData/Data/Event.swift

@@ -25,24 +25,16 @@ final public class Event: BaseEvent {
         super.init()
     }
     
-    public override func deleteDependencies(store: Store, shouldBeSynchronized: Bool) {
+    public override func deleteUnusedSharedDependencies(store: Store) {
+        store.deleteUnusedSharedDependencies(type: Tournament.self) { $0.event == self.id && $0.isDeleted == false }
+        store.deleteUnusedSharedDependencies(type: DateInterval.self) { $0.event == self.id }
+    }
+    
+    public override func deleteDependencies(store: Store, actionOption: ActionOption) {
         
-        store.deleteDependencies(type: Tournament.self, shouldBeSynchronized: shouldBeSynchronized) { $0.event == self.id && $0.isDeleted == false }
+        store.deleteDependencies(type: Tournament.self, actionOption: actionOption) { $0.event == self.id && $0.isDeleted == false }
-        store.deleteDependencies(type: DateInterval.self, shouldBeSynchronized: shouldBeSynchronized) { $0.event == self.id }
+        store.deleteDependencies(type: DateInterval.self, actionOption: actionOption) { $0.event == self.id }
 
-        
-//        let tournaments = self.tournaments
-//        for tournament in tournaments {
-//            tournament.deleteDependencies(store: store, shouldBeSynchronized: shouldBeSynchronized)
-//        }
-//        
-//        DataStore.shared.tournaments.deleteDependencies(tournaments, shouldBeSynchronized: shouldBeSynchronized)
-//        
-//        let courtsUnavailabilities = self.courtsUnavailability
-//        for courtsUnavailability in courtsUnavailabilities {
-//            courtsUnavailability.deleteDependencies(store: store, shouldBeSynchronized: shouldBeSynchronized)
-//        }
-//        DataStore.shared.dateIntervals.deleteDependencies(courtsUnavailabilities, shouldBeSynchronized: shouldBeSynchronized)
     }
     
     // MARK: - Computed dependencies
@@ -191,7 +183,35 @@ final public class Event: BaseEvent {
         
         return link.compactMap({ $0 }).joined(separator: "\n\n")
     }
+    
+    public func selectedTeams() -> [TeamRegistration] {
+        confirmedTournaments().flatMap({ $0.selectedSortedTeams() })
+    }
 
+    public func umpireMail() -> [String]? {
+        confirmedTournaments().first?.umpireMail()
+    }
+    
+    public func mailSubject() -> String {
+        let tournaments = confirmedTournaments()
+        
+        guard !tournaments.isEmpty else {
+            return eventTitle()
+        }
+        
+        // Get the date range from all confirmed tournaments
+        let dates = tournaments.compactMap { $0.startDate }
+        guard let firstDate = dates.min(), let lastDate = dates.max() else {
+            return eventTitle()
+        }
+        
+        let dateRange = firstDate == lastDate
+            ? firstDate.formattedDate(.short)
+            : "\(firstDate.formatted(.dateTime.day())) au \(lastDate.formatted(.dateTime.day())) \(lastDate.formatted(.dateTime.month(.wide))) \(lastDate.formatted(.dateTime.year()))"
+
+        let subject = [eventTitle(), dateRange, clubObject()?.name].compactMap({ $0 }).joined(separator: " | ")
+        return subject
+    }
 
     func insertOnServer() throws {
         DataStore.shared.events.writeChangeAndInsertOnServer(instance: self)

PadelClubData/Data/Gen/BaseClub.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseClub: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "clubs" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = true
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var creator: String? = nil
@@ -120,7 +121,7 @@ public class BaseClub: SyncedModelObject, SyncedStorable {
 
     func creatorValue() -> CustomUser? {
         guard let creator = self.creator else { return nil }
-        return Store.main.findById(creator)
+        return self.store?.findById(creator)
     }
 
     public func copy(from other: any Storable) {
@@ -141,10 +142,24 @@ public class BaseClub: SyncedModelObject, SyncedStorable {
         self.timezone = club.timezone
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
+        return [
+            Relationship(type: CustomUser.self, keyPath: \BaseClub.creator, storeLookup: .same),
+        ]
+    }
+
+    public static func childrenRelationships() -> [Relationship] {
         return [
-            Relationship(type: CustomUser.self, keyPath: \BaseClub.creator),
+            Relationship(type: Event.self, keyPath: \BaseEvent.club, storeLookup: .same),
+            Relationship(type: Court.self, keyPath: \BaseCourt.club, storeLookup: .same),
         ]
     }
 
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseCourt.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseCourt: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "courts" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var index: Int = 0
@@ -71,7 +72,7 @@ public class BaseCourt: SyncedModelObject, SyncedStorable {
     }
 
     func clubValue() -> Club? {
-        return Store.main.findById(club)
+        return self.store?.findById(club)
     }
 
     public func copy(from other: any Storable) {
@@ -84,10 +85,21 @@ public class BaseCourt: SyncedModelObject, SyncedStorable {
         self.indoor = court.indoor
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
         return [
-            Relationship(type: Club.self, keyPath: \BaseCourt.club),
+            Relationship(type: Club.self, keyPath: \BaseCourt.club, storeLookup: .same),
         ]
     }
 
+    public static func childrenRelationships() -> [Relationship] {
+        return []
+    }
+
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseCustomUser.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseCustomUser: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "users" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [.post] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var username: String = ""
@@ -255,8 +256,23 @@ public class BaseCustomUser: SyncedModelObject, SyncedStorable {
         self.hideUmpirePhone = customuser.hideUmpirePhone
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
         return []
     }
 
+    public static func childrenRelationships() -> [Relationship] {
+        return [
+            Relationship(type: Club.self, keyPath: \BaseClub.creator, storeLookup: .same),
+            Relationship(type: Event.self, keyPath: \BaseEvent.creator, storeLookup: .same),
+            Relationship(type: Purchase.self, keyPath: \BasePurchase.user, storeLookup: .same),
+        ]
+    }
+
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseDateInterval.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseDateInterval: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "date-intervals" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var event: String = ""
@@ -73,6 +74,14 @@ public class BaseDateInterval: SyncedModelObject, SyncedStorable {
         self.endDate = dateinterval.endDate
     }
 
+    public static func parentRelationships() -> [Relationship] {
+        return []
+    }
+
+    public static func childrenRelationships() -> [Relationship] {
+        return []
+    }
+
     public static func relationships() -> [Relationship] {
         return []
     }

PadelClubData/Data/Gen/BaseDrawLog.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseDrawLog: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "draw-logs" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var tournament: String = ""
@@ -77,7 +78,7 @@ public class BaseDrawLog: SyncedModelObject, SyncedStorable {
     }
 
     func tournamentValue() -> Tournament? {
-        return Store.main.findById(tournament)
+        return self.store?.storeCenter.mainStore.findById(tournament)
     }
 
     public func copy(from other: any Storable) {
@@ -91,10 +92,21 @@ public class BaseDrawLog: SyncedModelObject, SyncedStorable {
         self.drawType = drawlog.drawType
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
         return [
-            Relationship(type: Tournament.self, keyPath: \BaseDrawLog.tournament),
+            Relationship(type: Tournament.self, keyPath: \BaseDrawLog.tournament, storeLookup: .main),
         ]
     }
 
+    public static func childrenRelationships() -> [Relationship] {
+        return []
+    }
+
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseEvent.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseEvent: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "events" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var creator: String? = nil
@@ -72,12 +73,12 @@ public class BaseEvent: SyncedModelObject, SyncedStorable {
 
     func creatorValue() -> CustomUser? {
         guard let creator = self.creator else { return nil }
-        return Store.main.findById(creator)
+        return self.store?.findById(creator)
     }
 
     func clubValue() -> Club? {
         guard let club = self.club else { return nil }
-        return Store.main.findById(club)
+        return self.store?.findById(club)
     }
 
     public func copy(from other: any Storable) {
@@ -90,11 +91,24 @@ public class BaseEvent: SyncedModelObject, SyncedStorable {
         self.tenupId = event.tenupId
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
+        return [
+            Relationship(type: CustomUser.self, keyPath: \BaseEvent.creator, storeLookup: .same),
+            Relationship(type: Club.self, keyPath: \BaseEvent.club, storeLookup: .same),
+        ]
+    }
+
+    public static func childrenRelationships() -> [Relationship] {
         return [
-            Relationship(type: CustomUser.self, keyPath: \BaseEvent.creator),
+            Relationship(type: Tournament.self, keyPath: \BaseTournament.event, storeLookup: .same),
-            Relationship(type: Club.self, keyPath: \BaseEvent.club),
         ]
     }
 
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseGroupStage.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseGroupStage: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "group-stages" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var tournament: String = ""
@@ -95,7 +96,7 @@ public class BaseGroupStage: SyncedModelObject, SyncedStorable {
     }
 
     func tournamentValue() -> Tournament? {
-        return Store.main.findById(tournament)
+        return self.store?.storeCenter.mainStore.findById(tournament)
     }
 
     public func copy(from other: any Storable) {
@@ -111,10 +112,24 @@ public class BaseGroupStage: SyncedModelObject, SyncedStorable {
         self.plannedStartDate = groupstage.plannedStartDate
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
+        return [
+            Relationship(type: Tournament.self, keyPath: \BaseGroupStage.tournament, storeLookup: .main),
+        ]
+    }
+
+    public static func childrenRelationships() -> [Relationship] {
         return [
-            Relationship(type: Tournament.self, keyPath: \BaseGroupStage.tournament),
+            Relationship(type: Match.self, keyPath: \BaseMatch.groupStage, storeLookup: .same),
+            Relationship(type: TeamRegistration.self, keyPath: \BaseTeamRegistration.groupStage, storeLookup: .same),
         ]
     }
 
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseMatch.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseMatch: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "matches" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var round: String? = nil
@@ -159,11 +160,24 @@ public class BaseMatch: SyncedModelObject, SyncedStorable {
         self.plannedStartDate = match.plannedStartDate
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
+        return [
+            Relationship(type: Round.self, keyPath: \BaseMatch.round, storeLookup: .same),
+            Relationship(type: GroupStage.self, keyPath: \BaseMatch.groupStage, storeLookup: .same),
+        ]
+    }
+
+    public static func childrenRelationships() -> [Relationship] {
         return [
-            Relationship(type: Round.self, keyPath: \BaseMatch.round),
+            Relationship(type: TeamScore.self, keyPath: \BaseTeamScore.match, storeLookup: .same),
-            Relationship(type: GroupStage.self, keyPath: \BaseMatch.groupStage),
         ]
     }
 
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseMatchScheduler.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseMatchScheduler: BaseModelObject, Storable {
     public static func resourceName() -> String { return "match-scheduler" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var tournament: String = ""
@@ -143,7 +144,7 @@ public class BaseMatchScheduler: BaseModelObject, Storable {
     }
 
     func tournamentValue() -> Tournament? {
-        return Store.main.findById(tournament)
+        return self.store?.storeCenter.mainStore.findById(tournament)
     }
 
     public func copy(from other: any Storable) {
@@ -168,10 +169,21 @@ public class BaseMatchScheduler: BaseModelObject, Storable {
         self.accountGroupStageBreakTime = matchscheduler.accountGroupStageBreakTime
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
         return [
-            Relationship(type: Tournament.self, keyPath: \BaseMatchScheduler.tournament),
+            Relationship(type: Tournament.self, keyPath: \BaseMatchScheduler.tournament, storeLookup: .main),
         ]
     }
 
+    public static func childrenRelationships() -> [Relationship] {
+        return []
+    }
+
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseMonthData.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseMonthData: BaseModelObject, Storable {
     public static func resourceName() -> String { return "month-data" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var monthKey: String = ""
@@ -115,6 +116,14 @@ public class BaseMonthData: BaseModelObject, Storable {
         self.fileModelIdentifier = monthdata.fileModelIdentifier
     }
 
+    public static func parentRelationships() -> [Relationship] {
+        return []
+    }
+
+    public static func childrenRelationships() -> [Relationship] {
+        return []
+    }
+
     public static func relationships() -> [Relationship] {
         return []
     }

PadelClubData/Data/Gen/BasePlayerRegistration.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BasePlayerRegistration: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "player-registrations" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var teamRegistration: String? = nil
@@ -216,7 +217,7 @@ public class BasePlayerRegistration: SyncedModelObject, SyncedStorable {
 
     func teamRegistrationValue() -> TeamRegistration? {
         guard let teamRegistration = self.teamRegistration else { return nil }
-        return Store.main.findById(teamRegistration)
+        return self.store?.findById(teamRegistration)
     }
 
     public func copy(from other: any Storable) {
@@ -253,10 +254,21 @@ public class BasePlayerRegistration: SyncedModelObject, SyncedStorable {
         self.contactEmail = playerregistration.contactEmail
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
         return [
-            Relationship(type: TeamRegistration.self, keyPath: \BasePlayerRegistration.teamRegistration),
+            Relationship(type: TeamRegistration.self, keyPath: \BasePlayerRegistration.teamRegistration, storeLookup: .same),
         ]
     }
 
+    public static func childrenRelationships() -> [Relationship] {
+        return []
+    }
+
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BasePurchase.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -9,6 +9,7 @@ public class BasePurchase: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "purchases" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: UInt64 = 0
     public var user: String = ""
@@ -76,7 +77,7 @@ public class BasePurchase: SyncedModelObject, SyncedStorable {
     }
 
     func userValue() -> CustomUser? {
-        return Store.main.findById(user)
+        return self.store?.findById(user)
     }
 
     public func copy(from other: any Storable) {
@@ -90,10 +91,21 @@ public class BasePurchase: SyncedModelObject, SyncedStorable {
         self.expirationDate = purchase.expirationDate
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
         return [
-            Relationship(type: CustomUser.self, keyPath: \BasePurchase.user),
+            Relationship(type: CustomUser.self, keyPath: \BasePurchase.user, storeLookup: .same),
         ]
     }
 
+    public static func childrenRelationships() -> [Relationship] {
+        return []
+    }
+
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseRound.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseRound: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "rounds" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var tournament: String = ""
@@ -95,7 +96,7 @@ public class BaseRound: SyncedModelObject, SyncedStorable {
     }
 
     func tournamentValue() -> Tournament? {
-        return Store.main.findById(tournament)
+        return self.store?.storeCenter.mainStore.findById(tournament)
     }
 
     public func copy(from other: any Storable) {
@@ -111,10 +112,23 @@ public class BaseRound: SyncedModelObject, SyncedStorable {
         self.plannedStartDate = round.plannedStartDate
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
+        return [
+            Relationship(type: Tournament.self, keyPath: \BaseRound.tournament, storeLookup: .main),
+        ]
+    }
+
+    public static func childrenRelationships() -> [Relationship] {
         return [
-            Relationship(type: Tournament.self, keyPath: \BaseRound.tournament),
+            Relationship(type: Match.self, keyPath: \BaseMatch.round, storeLookup: .same),
         ]
     }
 
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseTeamRegistration.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseTeamRegistration: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "team-registrations" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var tournament: String = ""
@@ -166,6 +167,10 @@ public class BaseTeamRegistration: SyncedModelObject, SyncedStorable {
         try super.encode(to: encoder)
     }
 
+    func tournamentValue() -> Tournament? {
+        return self.store?.storeCenter.mainStore.findById(tournament)
+    }
+
     func groupStageValue() -> GroupStage? {
         guard let groupStage = self.groupStage else { return nil }
         return self.store?.findById(groupStage)
@@ -197,10 +202,25 @@ public class BaseTeamRegistration: SyncedModelObject, SyncedStorable {
         self.uniqueRandomIndex = teamregistration.uniqueRandomIndex
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
+        return [
+            Relationship(type: Tournament.self, keyPath: \BaseTeamRegistration.tournament, storeLookup: .main),
+            Relationship(type: GroupStage.self, keyPath: \BaseTeamRegistration.groupStage, storeLookup: .same),
+        ]
+    }
+
+    public static func childrenRelationships() -> [Relationship] {
         return [
-            Relationship(type: GroupStage.self, keyPath: \BaseTeamRegistration.groupStage),
+            Relationship(type: TeamScore.self, keyPath: \BaseTeamScore.teamRegistration, storeLookup: .same),
+            Relationship(type: PlayerRegistration.self, keyPath: \BasePlayerRegistration.teamRegistration, storeLookup: .same),
         ]
     }
 
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseTeamScore.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseTeamScore: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "team-scores" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return false }
 
     public var id: String = Store.randomId()
     public var match: String = ""
@@ -89,11 +90,22 @@ public class BaseTeamScore: SyncedModelObject, SyncedStorable {
         self.luckyLoser = teamscore.luckyLoser
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
         return [
-            Relationship(type: Match.self, keyPath: \BaseTeamScore.match),
+            Relationship(type: Match.self, keyPath: \BaseTeamScore.match, storeLookup: .same),
-            Relationship(type: TeamRegistration.self, keyPath: \BaseTeamScore.teamRegistration),
+            Relationship(type: TeamRegistration.self, keyPath: \BaseTeamScore.teamRegistration, storeLookup: .same),
         ]
     }
 
+    public static func childrenRelationships() -> [Relationship] {
+        return []
+    }
+
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/BaseTournament.swift

@@ -1,4 +1,4 @@
-// Generated by SwiftModelGenerator
+// Generated by LeStorageGenerator
 // Do not modify this file manually
 
 import Foundation
@@ -11,6 +11,7 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
     public static func resourceName() -> String { return "tournaments" }
     public static func tokenExemptedMethods() -> [HTTPMethod] { return [] }
     public static var copyServerResponse: Bool = false
+    public static func storeParent() -> Bool { return true }
 
     public var id: String = Store.randomId()
     public var event: String? = nil
@@ -84,6 +85,7 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
     public var clubMemberFeeDeduction: Double? = nil
     public var unregisterDeltaInHours: Int = 24
     public var currencyCode: String? = nil
+    public var customClubName: String? = nil
 
     public init(
         id: String = Store.randomId(),
@@ -157,7 +159,8 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         showTeamsInProg: Bool = false,
         clubMemberFeeDeduction: Double? = nil,
         unregisterDeltaInHours: Int = 24,
-        currencyCode: String? = nil
+        currencyCode: String? = nil,
+        customClubName: String? = nil
     ) {
         super.init()
         self.id = id
@@ -232,6 +235,7 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         self.clubMemberFeeDeduction = clubMemberFeeDeduction
         self.unregisterDeltaInHours = unregisterDeltaInHours
         self.currencyCode = currencyCode
+        self.customClubName = customClubName
     }
     required public override init() {
         super.init()
@@ -312,6 +316,7 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         case _clubMemberFeeDeduction = "clubMemberFeeDeduction"
         case _unregisterDeltaInHours = "unregisterDeltaInHours"
         case _currencyCode = "currencyCode"
+        case _customClubName = "customClubName"
     }
 
     private static func _decodePayment(container: KeyedDecodingContainer<CodingKeys>) throws -> TournamentPayment? {
@@ -455,6 +460,7 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         self.clubMemberFeeDeduction = try container.decodeIfPresent(Double.self, forKey: ._clubMemberFeeDeduction) ?? nil
         self.unregisterDeltaInHours = try container.decodeIfPresent(Int.self, forKey: ._unregisterDeltaInHours) ?? 24
         self.currencyCode = try container.decodeIfPresent(String.self, forKey: ._currencyCode) ?? nil
+        self.customClubName = try container.decodeIfPresent(String.self, forKey: ._customClubName) ?? nil
         try super.init(from: decoder)
     }
 
@@ -532,12 +538,13 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         try container.encode(self.clubMemberFeeDeduction, forKey: ._clubMemberFeeDeduction)
         try container.encode(self.unregisterDeltaInHours, forKey: ._unregisterDeltaInHours)
         try container.encode(self.currencyCode, forKey: ._currencyCode)
+        try container.encode(self.customClubName, forKey: ._customClubName)
         try super.encode(to: encoder)
     }
 
     func eventValue() -> Event? {
         guard let event = self.event else { return nil }
-        return Store.main.findById(event)
+        return self.store?.findById(event)
     }
 
     public func copy(from other: any Storable) {
@@ -614,12 +621,30 @@ public class BaseTournament: SyncedModelObject, SyncedStorable {
         self.clubMemberFeeDeduction = tournament.clubMemberFeeDeduction
         self.unregisterDeltaInHours = tournament.unregisterDeltaInHours
         self.currencyCode = tournament.currencyCode
+        self.customClubName = tournament.customClubName
     }
 
-    public static func relationships() -> [Relationship] {
+    public static func parentRelationships() -> [Relationship] {
+        return [
+            Relationship(type: Event.self, keyPath: \BaseTournament.event, storeLookup: .same),
+        ]
+    }
+
+    public static func childrenRelationships() -> [Relationship] {
         return [
-            Relationship(type: Event.self, keyPath: \BaseTournament.event),
+            Relationship(type: GroupStage.self, keyPath: \BaseGroupStage.tournament, storeLookup: .child),
+            Relationship(type: MatchScheduler.self, keyPath: \BaseMatchScheduler.tournament, storeLookup: .child),
+            Relationship(type: Round.self, keyPath: \BaseRound.tournament, storeLookup: .child),
+            Relationship(type: TeamRegistration.self, keyPath: \BaseTeamRegistration.tournament, storeLookup: .child),
+            Relationship(type: DrawLog.self, keyPath: \BaseDrawLog.tournament, storeLookup: .child),
         ]
     }
 
+    public static func relationships() -> [Relationship] {
+        var relationships: [Relationship] = []
+        relationships.append(contentsOf: parentRelationships())
+        relationships.append(contentsOf: childrenRelationships())
+        return relationships
+    }
+
 }

PadelClubData/Data/Gen/Drawlog.json

@@ -6,7 +6,6 @@
       "synchronizable": true,
       "sideStorable": true,
       "observable": true,
-      "relationshipNames": [],
       "properties": [
         {
           "name": "id",
@@ -16,7 +15,7 @@
         {
           "name": "tournament",
           "type": "String",
-          "foreignKey": "Tournament"
+          "foreignKey": "Tournament###"
         },
         {
           "name": "drawDate",

PadelClubData/Data/Gen/GroupStage.json

@@ -13,7 +13,7 @@
         {
           "name": "tournament",
           "type": "String",
-          "foreignKey": "Tournament"
+          "foreignKey": "Tournament###"
         },
         {
           "name": "index",

PadelClubData/Data/Gen/Match.json

@@ -15,13 +15,13 @@
           "name": "round",
           "type": "String",
           "optional": true,
-          "foreignKey": "Round*"
+          "foreignKey": "Round"
         },
         {
           "name": "groupStage",
           "type": "String",
           "optional": true,
-          "foreignKey": "GroupStage*"
+          "foreignKey": "GroupStage"
         },
         {
           "name": "startDate",

PadelClubData/Data/Gen/MatchScheduler.json

@@ -15,7 +15,7 @@
         {
           "name": "tournament",
           "type": "String",
-          "foreignKey": "Tournament"
+          "foreignKey": "Tournament###"
         },
         {
           "name": "timeDifferenceLimit",

PadelClubData/Data/Gen/PlayerRegistration.json

@@ -5,7 +5,6 @@
       "synchronizable": true,
       "sideStorable": true,
       "observable": true,
-      "relationshipNames": ["teamRegistration"],
       "properties": [
         {
           "name": "id",

PadelClubData/Data/Gen/Purchase.json

@@ -44,8 +44,7 @@
           "defaultValue": "nil"
         }
       ],
-      "tokenExemptedMethods": [],
+      "tokenExemptedMethods": []
-      "relationshipNames": []
     }
   ]
 }

PadelClubData/Data/Gen/Round.json

@@ -5,7 +5,6 @@
       "synchronizable": true,
       "sideStorable": true,
       "observable": true,
-      "relationshipNames": [],
       "properties": [
         {
           "name": "id",
@@ -15,7 +14,7 @@
         {
           "name": "tournament",
           "type": "String",
-          "foreignKey": "Tournament"
+          "foreignKey": "Tournament###"
         },
         {
           "name": "index",

PadelClubData/Data/Gen/TeamRegistration.json

@@ -5,7 +5,6 @@
       "synchronizable": true,
       "sideStorable": true,
       "observable": true,
-      "relationshipNames": [],
       "properties": [
         {
           "name": "id",
@@ -14,13 +13,14 @@
         },
         {
           "name": "tournament",
-          "type": "String"
+          "type": "String",
+          "foreignKey": "Tournament###"
         },
         {
           "name": "groupStage",
           "type": "String",
           "optional": true,
-          "foreignKey": "GroupStage*"
+          "foreignKey": "GroupStage"
         },
         {
           "name": "registrationDate",

PadelClubData/Data/Gen/TeamScore.json

@@ -5,7 +5,6 @@
       "synchronizable": true,
       "sideStorable": true,
       "observable": true,
-      "relationshipNames": ["match"],
       "properties": [
         {
           "name": "id",
@@ -15,13 +14,13 @@
         {
           "name": "match",
           "type": "String",
-          "foreignKey": "Match*"
+          "foreignKey": "Match"
         },
         {
           "name": "teamRegistration",
           "type": "String",
           "optional": true,
-          "foreignKey": "TeamRegistration*"
+          "foreignKey": "TeamRegistration"
         },
         {
           "name": "score",

PadelClubData/Data/Gen/Tournament.json

@@ -3,9 +3,8 @@
     {
       "name": "Tournament",
       "synchronizable": true,
-      "copyable": true,
       "observable": true,
-      "relationshipNames": [],
+      "storeParent": true,
       "properties": [
         {
           "name": "id",
@@ -373,6 +372,11 @@
           "name": "currencyCode",
           "type": "String",
           "optional": true
+        },
+        {
+            "name": "customClubName",
+            "type": "String",
+            "optional": true
         }
       ]
     }

PadelClubData/Data/Gen/generator.py

@@ -3,21 +3,85 @@ import re
 import os
 from pathlib import Path
 from typing import Dict, List, Any
+from collections import defaultdict
 import argparse
 import sys
 import logging
 from datetime import datetime
 import inflect
 
-class SwiftModelGenerator:
+class RelationshipAnalyzer:
-    def __init__(self, json_data: Dict[str, Any]):
+    def __init__(self):
-        self.data = json_data
+        self.parent_relationships = defaultdict(list)  # model_name -> list of parent relationships
+        self.children_relationships = defaultdict(list)  # model_name -> list of children relationships
+
+    def analyze_all_models(self, input_dir: str) -> None:
+        """Analyze all JSON files to build complete relationship map."""
+        input_path = Path(input_dir)
+        json_files = list(input_path.glob("*.json"))
+
+        for json_file in json_files:
+            with open(json_file, 'r') as f:
+                json_data = json.load(f)
+
+            for model in json_data["models"]:
+                model_name = model["name"]
+                properties = model.get("properties", [])
+
+                # Find foreign key properties (parents)
+                for prop in properties:
+                    if "foreignKey" in prop:
+                        foreign_key = prop["foreignKey"].rstrip('###')
+                        located_on_main_store = prop["foreignKey"].endswith('###')
+
+                        if located_on_main_store:
+                            # Store parent relationship
+                            self.parent_relationships[model_name].append({
+                                "name": prop["name"],
+                                "foreignKey": foreign_key,
+                                "storeLookup": ".main"
+                            })
+
+                            # Store children relationship (reverse)
+                            self.children_relationships[foreign_key].append({
+                                "name": prop["name"],
+                                "childModel": model_name,
+                                "storeLookup": ".child"
+                            })
+                        else:
+                            # Store parent relationship
+                            self.parent_relationships[model_name].append({
+                                "name": prop["name"],
+                                "foreignKey": foreign_key,
+                                "storeLookup": ".same"
+                            })
+
+                            # Store children relationship (reverse)
+                            self.children_relationships[foreign_key].append({
+                                "name": prop["name"],
+                                "childModel": model_name,
+                                "storeLookup": ".same"
+                            })
+
+    def get_parent_relationships(self, model_name: str) -> List[Dict[str, Any]]:
+        """Get parent relationships for a model."""
+        return self.parent_relationships.get(model_name, [])
+
+    def get_children_relationships(self, model_name: str) -> List[Dict[str, Any]]:
+        """Get children relationships for a model."""
+        return self.children_relationships.get(model_name, [])
+
+class LeStorageGenerator:
+    def __init__(self, json_data: Dict[str, Any], relationship_analyzer: RelationshipAnalyzer = None):
+        self.json_data = json_data
+        self.relationship_analyzer = relationship_analyzer
         self.pluralizer = inflect.engine()
 
     def generate_model(self, model_data: Dict[str, Any]) -> str:
         model_name = model_data["name"]
         is_sync = model_data.get("synchronizable", False)
         is_observable = model_data.get("observable", False)
+        store_parent = model_data.get("storeParent", False)
         properties = model_data["properties"]
         did_set_properties = []
 
@@ -27,7 +91,7 @@ class SwiftModelGenerator:
         token_exempted = model_data.get("tokenExemptedMethods", [])
         copy_server_response = model_data.get("copy_server_response", "false")
 
-        lines = ["// Generated by SwiftModelGenerator", "// Do not modify this file manually", ""]
+        lines = ["// Generated by LeStorageGenerator", "// Do not modify this file manually", ""]
 
         # Import statement
         lines.append("import Foundation")
@@ -45,7 +109,7 @@ class SwiftModelGenerator:
         lines.append("")
 
         # Add SyncedStorable protocol requirements
-        lines.extend(self._generate_protocol_requirements(resource_name, token_exempted, copy_server_response))
+        lines.extend(self._generate_protocol_requirements(resource_name, token_exempted, copy_server_response, store_parent))
         lines.append("")
 
         # Properties
@@ -102,6 +166,11 @@ class SwiftModelGenerator:
         lines.extend(self._generate_copy_method(model_name, properties))
         lines.append("")
 
+        # Copy method
+#        if is_sync:
+#        lines.extend(self._generate_copy_for_update_method(model_name, properties))
+#        lines.append("")
+
         # Add relationships function
         lines.extend(self._generate_relationships(model_name, properties))
         lines.append("")
@@ -111,7 +180,7 @@ class SwiftModelGenerator:
 
     def _generate_constructor(self, model_name: str, properties: List[Dict[str, Any]]) -> List[str]:
         """Generate a constructor with all properties as parameters with default values."""
-               
+
         lines = ["    public init("]
 
         # Generate parameter list
@@ -152,15 +221,15 @@ class SwiftModelGenerator:
             lines.append(f"        self.{name} = {name}")
 
         lines.append("    }")
-        
+
         lines.extend([
                       "    required public override init() {",
                       "        super.init()",
                       "    }",
 
                       ])
-                      
+
-        
+
         return lines
 
     def _generate_didset_methods(self, properties) -> List[str]:
@@ -178,21 +247,21 @@ class SwiftModelGenerator:
                 method_name = f"{prop_name}Value"
                 is_optional = prop.get("optional", False)
 
-                lines.extend([f"    func {method_name}() -> {foreign_key.rstrip('*')}? {{"])
+                lines.extend([f"    func {method_name}() -> {foreign_key.rstrip('###')}? {{"])
 
                 if is_optional:
                     lines.extend([
                         f"        guard let {prop_name} = self.{prop_name} else {{ return nil }}"
                     ])
 
-                if foreign_key.endswith("*"):
+                if foreign_key.endswith("###"):
                     foreign_key = foreign_key[:-1]  # Remove the asterisk
                     lines.extend([
-                        f"        return self.store?.findById({prop_name})"
+                        f"        return self.store?.storeCenter.mainStore.findById({prop_name})"
                     ])
                 else:
                     lines.extend([
-                        f"        return Store.main.findById({prop_name})"
+                        f"        return self.store?.findById({prop_name})"
                     ])
 
                 lines.extend(["    }", ""])  # Close the method and add a blank line
@@ -393,43 +462,114 @@ class SwiftModelGenerator:
         lines.append("    }")
         return lines
 
-    def _generate_protocol_requirements(self, resource_name: str, token_exempted: List[str], copy_server_response: str) -> List[str]:
+    def _generate_copy_for_update_method(self, model_name: str, properties: List[Dict[str, Any]]) -> List[str]:
+        model_variable = model_name.lower()
+        lines = [f"    public func copyForUpdate(from other: any Storable) {{"]
+        lines.append(f"        guard let {model_variable} = other as? Base{model_name} else {{ return }}")
+
+        # First handle foreign key properties with special deletion logic
+        for prop in properties:
+            if "foreignKey" in prop and prop["foreignKey"] != "CustomUser":
+                name = prop["name"]
+                foreign_key = prop["foreignKey"].rstrip('###')  # Remove asterisk if present
+                foreign_variable = name + "Value"
+
+                # Generate the foreign key check and deletion logic
+                lines.append(f"        if {model_variable}.{name} != self.{name}, let {name}Object = self.{foreign_variable}(), {name}Object.shared == true, let store = {name}Object.store {{")
+                lines.append(f"            store.deleteUnusedShared({name}Object)")
+                lines.append(f"        }}")
+
+        # Then copy all properties
+        for prop in properties:
+            name = prop['name']
+            lines.append(f"        self.{name} = {model_variable}.{name}")
+
+        lines.append("    }")
+        return lines
+
+    def _generate_protocol_requirements(self, resource_name: str, token_exempted: List[str], copy_server_response: str, store_parent: bool) -> List[str]:
         """Generate the static functions required by SyncedStorable protocol."""
         # Convert HTTP methods to proper format
         formatted_methods = [f".{method.lower()}" for method in token_exempted]
         methods_str = ", ".join(formatted_methods) if formatted_methods else ""
 
+        store_parent_swift = "true" if store_parent else "false"
+
         return [
             f"    public static func resourceName() -> String {{ return \"{resource_name}\" }}",
             f"    public static func tokenExemptedMethods() -> [HTTPMethod] {{ return [{methods_str}] }}",
             f"    public static var copyServerResponse: Bool = {copy_server_response}",
+            f"    public static func storeParent() -> Bool {{ return {store_parent_swift} }}",
 
         ]
 
     def _generate_relationships(self, model_name, properties: List[Dict[str, Any]]) -> List[str]:
-        # Find all properties with foreign keys
+#        if not self.relationship_analyzer:
-        foreign_key_props = [p for p in properties if "foreignKey" in p]
+#            # Fallback to old behavior if no analyzer provided
+#            return self._generate_legacy_relationships(model_name, properties)
+
+        lines = []
 
-        if not foreign_key_props:
+        # Generate parentRelationships method
-            # If no foreign keys, return empty array
+        lines.extend(self._generate_parent_relationships(model_name))
+        lines.append("")
+
+        # Generate childrenRelationships method
+        lines.extend(self._generate_children_relationships(model_name))
+        lines.append("")
+
+        # Generate combined relationships method
+        lines.extend(self._generate_combined_relationships(model_name))
+
+        return lines
+
+    def _generate_parent_relationships(self, model_name: str) -> List[str]:
+        """Generate parentRelationships() method."""
+        parent_rels = self.relationship_analyzer.get_parent_relationships(model_name)
+
+        if not parent_rels:
             return [
-                "    public static func relationships() -> [Relationship] {",
+                "    public static func parentRelationships() -> [Relationship] {",
                 "        return []",
                 "    }"
             ]
 
         lines = [
-            "    public static func relationships() -> [Relationship] {",
+            "    public static func parentRelationships() -> [Relationship] {",
+            "        return ["
+        ]
+
+        for rel in parent_rels:
+#            main_store = "true" if rel["storeLookup"] else "false"
+            lines.append(f"            Relationship(type: {rel['foreignKey']}.self, keyPath: \\Base{model_name}.{rel['name']}, storeLookup: {rel["storeLookup"]}),")
+
+        lines.extend([
+            "        ]",
+            "    }"
+        ])
+
+        return lines
+
+    def _generate_children_relationships(self, model_name: str) -> List[str]:
+        """Generate childrenRelationships() method."""
+        children_rels = self.relationship_analyzer.get_children_relationships(model_name)
+
+        if not children_rels:
+            return [
+                "    public static func childrenRelationships() -> [Relationship] {",
+                "        return []",
+                "    }"
+            ]
+
+        lines = [
+            "    public static func childrenRelationships() -> [Relationship] {",
             "        return ["
         ]
 
-        # Generate relationship entries
+        for rel in children_rels:
-        for prop in foreign_key_props:
+            # main_store = "true" if rel["storeLookup"] else "false"
-            name = prop["name"]
+            lines.append(f"            Relationship(type: {rel['childModel']}.self, keyPath: \\Base{rel['childModel']}.{rel['name']}, storeLookup: {rel["storeLookup"]}),")
-            foreign_key = prop["foreignKey"].rstrip('*')  # Remove asterisk if present
-            lines.append(f"            Relationship(type: {foreign_key}.self, keyPath: \\Base{model_name}.{name}),")
 
-        # Close the array and function
         lines.extend([
             "        ]",
             "    }"
@@ -437,6 +577,66 @@ class SwiftModelGenerator:
 
         return lines
 
+    def _generate_combined_relationships(self, model_name: str) -> List[str]:
+        """Generate relationships() method that combines parent and children."""
+        parent_rels = self.relationship_analyzer.get_parent_relationships(model_name)
+        children_rels = self.relationship_analyzer.get_children_relationships(model_name)
+
+        if not parent_rels and not children_rels:
+            return [
+                "    public static func relationships() -> [Relationship] {",
+                "        return []",
+                "    }"
+            ]
+
+        lines = [
+            "    public static func relationships() -> [Relationship] {",
+            "        var relationships: [Relationship] = []",
+            "        relationships.append(contentsOf: parentRelationships())",
+            "        relationships.append(contentsOf: childrenRelationships())",
+            "        return relationships",
+            "    }"
+        ]
+
+        return lines
+
+#    def _generate_legacy_relationships(self, model_name, properties: List[Dict[str, Any]]) -> List[str]:
+#        """Legacy relationship generation for backward compatibility."""
+#        # Find all properties with foreign keys
+#        foreign_key_props = [p for p in properties if "foreignKey" in p]
+#
+#        if not foreign_key_props:
+#            # If no foreign keys, return empty array
+#            return [
+#                "    public static func relationships() -> [Relationship] {",
+#                "        return []",
+#                "    }"
+#            ]
+#
+#        lines = [
+#            "    public static func relationships() -> [Relationship] {",
+#            "        return ["
+#        ]
+#
+#        # Generate relationship entries
+#        for prop in foreign_key_props:
+#            name = prop["name"]
+#            located_on_main_store = "true" if prop["foreignKey"].endswith('###') else "false"
+#            foreign_key = prop["foreignKey"].rstrip('###')  # Remove asterisk if present
+#
+#            if located_on_main_store:
+#                lines.append(f"            Relationship(type: {foreign_key}.self, keyPath: \\Base{model_name}.{name}, storeLookup: {located_on_main_store}),")
+#            else:
+#                lines.append(f"            Relationship(type: {foreign_key}.self, keyPath: \\Base{model_name}.{name}, storeLookup: {located_on_main_store}),")
+#
+#        # Close the array and function
+#        lines.extend([
+#            "        ]",
+#            "    }"
+#        ])
+#
+#        return lines
+
     def _get_default_value(self, type_name: str) -> str:
         """Get default value for non-optional types"""
         if "String" in type_name:
@@ -481,14 +681,21 @@ def process_directory(input_dir: str, output_dir: str, logger: logging.Logger, d
             return 0
 
         logger.info(f"Found {len(json_files)} JSON files to process")
+
+        # First pass: Analyze all relationships
+        logger.info("Analyzing relationships across all models...")
+        relationship_analyzer = RelationshipAnalyzer()
+        relationship_analyzer.analyze_all_models(input_dir)
+
         successful_files = 0
 
+        # Second pass: Generate models with complete relationship information
         for json_file in json_files:
             try:
                 with open(json_file, 'r') as f:
                     json_data = json.load(f)
 
-                generator = SwiftModelGenerator(json_data)
+                generator = LeStorageGenerator(json_data, relationship_analyzer)
 
                 # Generate each model in the JSON file
                 for model in json_data["models"]:
@@ -524,7 +731,7 @@ def process_directory(input_dir: str, output_dir: str, logger: logging.Logger, d
 
 def setup_logging(verbose: bool) -> logging.Logger:
     """Configure logging based on verbosity level."""
-    logger = logging.getLogger('SwiftModelGenerator')
+    logger = logging.getLogger('LeStorageGenerator')
     handler = logging.StreamHandler()
 
     if verbose:

PadelClubData/Data/GroupStage.swift

@@ -90,7 +90,7 @@ final public class GroupStage: BaseGroupStage, SideStorable {
         return _matches.anySatisfy { $0.hasEnded() == false } == false
     }
     
-    fileprivate func _createMatch(index: Int) -> Match {
+    func createMatch(index: Int) -> Match {
         let match: Match = Match(groupStage: self.id,
                                  index: index,
                                  format: self.matchFormat,
@@ -128,7 +128,7 @@ final public class GroupStage: BaseGroupStage, SideStorable {
         var matches = [Match]()
         let matchPhaseCount = matchPhaseCount
         for i in 0..<_numberOfMatchesToBuild() {
-            let newMatch = self._createMatch(index: i + matchCount * matchPhaseCount)
+            let newMatch = self.createMatch(index: i + matchCount * matchPhaseCount)
 //            let newMatch = Match(groupStage: self.id, index: i, matchFormat: self.matchFormat, name: localizedMatchUpLabel(for: i))
             teamScores.append(contentsOf: newMatch.createTeamScores())
             matches.append(newMatch)
@@ -147,13 +147,13 @@ final public class GroupStage: BaseGroupStage, SideStorable {
             _removeMatches()
             
             for i in 0..<_numberOfMatchesToBuild() {
-                let newMatch = self._createMatch(index: i)
+                let newMatch = self.createMatch(index: i)
     //            let newMatch = Match(groupStage: self.id, index: i, matchFormat: self.matchFormat, name: localizedMatchUpLabel(for: i))
                 teamScores.append(contentsOf: newMatch.createTeamScores())
                 matches.append(newMatch)
             }
         } else {
-            for match in _matches() {
+            for match in self._matches() {
                 match.resetTeamScores(outsideOf: [])
                 teamScores.append(contentsOf: match.createTeamScores())
             }
@@ -298,7 +298,7 @@ final public class GroupStage: BaseGroupStage, SideStorable {
         return playedMatches.filter({ $0.isRunning() }).sorted(by: \.computedStartDateForSorting)
     }
     
-    public func readyMatches(playedMatches: [Match]) -> [Match] {
+    public func readyMatches(playedMatches: [Match], runningMatches: [Match]) -> [Match] {
         #if _DEBUG_TIME //DEBUGING TIME
         let start = Date()
         defer {
@@ -306,7 +306,9 @@ final public class GroupStage: BaseGroupStage, SideStorable {
             print("func group stage readyMatches", id, duration.formatted(.units(allowed: [.seconds, .milliseconds])))
         }
         #endif
-        return playedMatches.filter({ $0.isReady() && $0.isRunning() == false && $0.hasEnded() == false })
+        let playingTeams = runningMatches.flatMap({ $0.teams() }).map({ $0.id })
+        
+        return playedMatches.filter({ $0.isReady() && $0.isRunning() == false && $0.hasEnded() == false && $0.containsTeamIds(playingTeams) == false })
     }
 
     public func finishedMatches(playedMatches: [Match]) -> [Match] {
@@ -335,7 +337,7 @@ final public class GroupStage: BaseGroupStage, SideStorable {
         case 5:
             order = [3, 5, 8, 2, 6, 1, 9, 4, 7, 0]
         case 6:
-            order = [4, 7, 9, 3, 6, 11, 2, 8, 10, 1, 13, 5, 12, 14, 0]
+            order = [4, 6, 10, 1, 8, 12, 2, 7, 11, 3, 5, 13, 14, 9, 0]
         case 7:
             order = [6, 15, 20, 1, 16, 19, 2, 10, 18, 3, 9, 14, 4, 7, 12, 5, 8, 11, 0, 13, 17]
         case 8:
@@ -400,11 +402,11 @@ final public class GroupStage: BaseGroupStage, SideStorable {
         return combinations[safe: matchIndex%matchCount]?.map { teamAt(groupStagePosition: $0) } ?? []
     }
     
-    private func _removeMatches() {
+    func _removeMatches() {
         self.tournamentStore?.matches.delete(contentOfs: _matches())
     }
         
-    private func _numberOfMatchesToBuild() -> Int {
+    func _numberOfMatchesToBuild() -> Int {
         (size * (size - 1)) / 2
     }
     
@@ -447,7 +449,7 @@ final public class GroupStage: BaseGroupStage, SideStorable {
             return teamsSorted.first == teamPosition
         } else {
             
-            if let matchIndex = combos.firstIndex(of: indexes), let match = _matches().first(where: { $0.index == matchIndex }) {
+            if let matchIndex = combos.firstIndex(of: indexes), let match = self._matches().first(where: { $0.index == matchIndex }) {
                 return teamPosition.id == match.losingTeamId
             } else {
                 return false
@@ -614,19 +616,41 @@ final public class GroupStage: BaseGroupStage, SideStorable {
     }
     
     public func computedStartDate() -> Date? {
-        return _matches().sorted(by: \.computedStartDateForSorting).first?.startDate
+        return self._matches().sorted(by: \.computedStartDateForSorting).first?.startDate
     }
-
+    
-    public override func deleteDependencies(store: Store, shouldBeSynchronized: Bool) {
+    public func removeAllTeams() {
+        let teams = teams()
+        teams.forEach { team in
+            team.groupStagePosition = nil
+            team.groupStage = nil
+            self._matches().forEach({ $0.updateTeamScores() })
+        }
+        tournamentStore?.teamRegistrations.addOrUpdate(contentOfs: teams)
+    }
+    
+    public func setData(from correspondingGroupStage: GroupStage, tournamentStartDate: Date, previousTournamentStartDate: Date) {
         
-        store.deleteDependencies(type: Match.self, shouldBeSynchronized: shouldBeSynchronized) { $0.groupStage == self.id }
+        self.matchFormat = correspondingGroupStage.matchFormat
+        if let correspondingPlannedStartDate = correspondingGroupStage.plannedStartDate {
+            let offset = correspondingPlannedStartDate.timeIntervalSince(previousTournamentStartDate)
+            self.startDate = tournamentStartDate.addingTimeInterval(offset)
+        }
+        self.size = correspondingGroupStage.size
+        self.name = correspondingGroupStage.name
+        
+        let matches = correspondingGroupStage._matches()
+        for (index, match) in self._matches().enumerated() {
+            match.setData(from: matches[index], tournamentStartDate: tournamentStartDate, previousTournamentStartDate: previousTournamentStartDate)
+        }
+    }
 
-//        
+    public override func deleteDependencies(store: Store, actionOption: ActionOption) {
-//        let matches = self._matches()
+        store.deleteDependencies(type: Match.self, actionOption: actionOption) { $0.groupStage == self.id }
-//        for match in matches {
+    }
-//            match.deleteDependencies(store: store, shouldBeSynchronized: shouldBeSynchronized)
+    
-//        }
+    public override func deleteUnusedSharedDependencies(store: Store) {
-//        self.tournamentStore?.matches.deleteDependencies(matches, shouldBeSynchronized: shouldBeSynchronized)
+        store.deleteUnusedSharedDependencies(type: Match.self) { $0.groupStage == self.id }
     }
     
     func insertOnServer() {

PadelClubData/Data/Match.swift

@@ -22,6 +22,25 @@ final public class Match: BaseMatch, SideStorable {
     
     public var byeState: Bool = false
     
+//<<<<<<< HEAD
+//    public init(round: String? = nil, groupStage: String? = nil, startDate: Date? = nil, endDate: Date? = nil, index: Int, format: MatchFormat? = nil, servingTeamId: String? = nil, winningTeamId: String? = nil, losingTeamId: String? = nil, name: String? = nil, disabled: Bool = false, courtIndex: Int? = nil, confirmed: Bool = false) {
+//        
+//        super.init(round: round, groupStage: groupStage, startDate: startDate, endDate: endDate, index: index, format: format, servingTeamId: servingTeamId, winningTeamId: winningTeamId, losingTeamId: losingTeamId, name: name, disabled: disabled, courtIndex: courtIndex, confirmed: confirmed)
+//        
+//    }
+//    
+//    required init(from decoder: Decoder) throws {
+//        try super.init(from: decoder)
+//    }
+//    
+//    required public init() {
+//        super.init()
+//        
+//        let drawLog = DrawLog()
+//    }
+//    
+//=======
+//>>>>>>> main
     // MARK: - DidSet
     
     public override func didSetStartDate() {
@@ -76,15 +95,12 @@ final public class Match: BaseMatch, SideStorable {
     
     // MARK: -
     
-    public override func deleteDependencies(store: Store, shouldBeSynchronized: Bool) {
+    public override func deleteDependencies(store: Store, actionOption: ActionOption) {
-        
+        store.deleteDependencies(type: TeamScore.self, actionOption: actionOption) { $0.match == self.id }
-        store.deleteDependencies(type: TeamScore.self, shouldBeSynchronized: shouldBeSynchronized) { $0.match == self.id }
+    }
-        
+    
-//        let teamScores = self.teamScores
+    public override func deleteUnusedSharedDependencies(store: Store) {
-//        for teamScore in teamScores {
+        store.deleteUnusedSharedDependencies(type: TeamScore.self) { $0.match == self.id }
-//            teamScore.deleteDependencies(store: store, shouldBeSynchronized: shouldBeSynchronized)
-//        }
-//        self.tournamentStore?.teamScores.deleteDependencies(teamScores, shouldBeSynchronized: shouldBeSynchronized)
     }
     
     public func indexInRound(in matches: [Match]? = nil) -> Int {
@@ -478,7 +494,15 @@ defer {
             return (groupStageObject.index + 1) * 100 + groupStageObject.indexOf(index)
         }
         guard let roundObject else { return index }
-        return (300 - (roundObject.theoryCumulativeMatchCount * 10 + roundObject.index * 22)) * 10 + RoundRule.matchIndexWithinRound(fromMatchIndex: index)
+
+        // primary: theoryCumulativeMatchCount (final = 1, semis = 3, quarters = 7, ...)
+        // multiply by a factor big enough to separate match indexes
+        let primary = roundObject.theoryCumulativeMatchCount * 1_000
+
+        // tie-breaker: match position inside the round (0..N-1)
+        let secondary = RoundRule.matchIndexWithinRound(fromMatchIndex: index)
+
+        return primary + secondary
     }
     
     public func previousMatches() -> [Match] {
@@ -1115,6 +1139,18 @@ defer {
     public func initialStartDate() -> Date? {
         plannedStartDate ?? startDate
     }
+    
+    public func setData(from correspondingMatch: Match, tournamentStartDate: Date, previousTournamentStartDate: Date) {
+        if let correspondingMatchPlannedStartDate = correspondingMatch.plannedStartDate {
+            let offset = correspondingMatchPlannedStartDate.timeIntervalSince(previousTournamentStartDate)
+            self.startDate = tournamentStartDate.addingTimeInterval(offset)
+        }
+
+        self.disabled = correspondingMatch.disabled
+        self.matchFormat = correspondingMatch.matchFormat
+        self.courtIndex = correspondingMatch.courtIndex
+        self.name = correspondingMatch.name
+    }
 
     func insertOnServer() {
         self.tournamentStore?.matches.writeChangeAndInsertOnServer(instance: self)

PadelClubData/Data/MatchScheduler.swift

@@ -420,7 +420,7 @@ final public class MatchScheduler: BaseMatchScheduler, SideStorable {
                 rotationIndex += 1
             }
             
-            let timeMatch = TimeMatch(matchID: match.id, rotationIndex: rotationIndex, courtIndex: match.courtIndex ?? 0, startDate: match.startDate!, durationLeft: match.matchFormat.getEstimatedDuration(additionalEstimationDuration), minimumBreakTime: match.matchFormat.breakTime.breakTime)
+            let timeMatch = TimeMatch(matchID: match.id, rotationIndex: rotationIndex, matchRank: match.computedOrder, courtIndex: match.courtIndex ?? 0, startDate: match.startDate!, durationLeft: match.matchFormat.getEstimatedDuration(additionalEstimationDuration), minimumBreakTime: match.matchFormat.breakTime.breakTime)
             slots.append(timeMatch)
         }
 
@@ -534,7 +534,7 @@ final public class MatchScheduler: BaseMatchScheduler, SideStorable {
         for i in 0..<rotationIndex {
             let courtsSorted = slots.filter { $0.rotationIndex == i }.map { $0.courtIndex }.sorted()
             let courts = randomizeCourts ? courtsSorted.shuffled() : courtsSorted
-            var matches = slots.filter { $0.rotationIndex == i }.sorted(using: .keyPath(\.courtIndex))
+            var matches = slots.filter { $0.rotationIndex == i }.sorted(using: .keyPath(\.matchRank))
             
             for j in 0..<matches.count {
                 matches[j].courtIndex = courts[j]
@@ -621,6 +621,7 @@ final public class MatchScheduler: BaseMatchScheduler, SideStorable {
                 let timeMatch = TimeMatch(
                     matchID: firstMatch.id,
                     rotationIndex: rotationIndex,
+                    matchRank: firstMatch.computedOrder,
                     courtIndex: courtIndex,
                     startDate: rotationStartDate,
                     durationLeft: firstMatch.matchFormat.getEstimatedDuration(additionalEstimationDuration),
@@ -838,8 +839,10 @@ final public class MatchScheduler: BaseMatchScheduler, SideStorable {
         }
 
 
-        if tournament.dayDuration > 1 && (lastDate.timeOfDay == .evening || lastDate.timeOfDay == .night || errorFormat) {
+        if tournament.dayDuration > 1 && (lastDate.timeOfDay == .evening || lastDate.timeOfDay == .night || errorFormat) {            
-            bracketStartDate = lastDate.tomorrowAtNine
+            if tournament.groupStageCount > 0 {
+                bracketStartDate = lastDate.tomorrowAtNine
+            }
         }
         
         return updateBracketSchedule(tournament: tournament, fromRoundId: nil, fromMatchId: nil, startDate: bracketStartDate)
@@ -856,6 +859,7 @@ struct GroupStageTimeMatch {
 public struct TimeMatch {
     let matchID: String
     let rotationIndex: Int
+    let matchRank: Int
     var courtIndex: Int
     var startDate: Date
     var durationLeft: Int //in minutes
@@ -894,6 +898,11 @@ extension Match {
         return teamIds().contains(id)
     }
     
+    public func containsTeamIds(_ ids: [String]) -> Bool {
+        let teamIds = teamIds()
+        return !Set(ids).isDisjoint(with: teamIds)
+    }
+
     public func containsTeamIndex(_ id: String) -> Bool {
         matchUp().contains(id)
     }

PadelClubData/Data/PlayerRegistration.swift

@@ -56,12 +56,23 @@ final public class PlayerRegistration: BasePlayerRegistration, SideStorable {
         return nil
     }
     
-    public func pasteData(_ exportFormat: ExportFormat = .rawText) -> String {
+    public func pasteData(_ exportFormat: ExportFormat = .rawText, type: ExportType) -> String {
-        switch exportFormat {
+        switch type {
-        case .rawText:
+        case .payment:
-            return [firstName.capitalized, lastName.capitalized, licenceId?.computedLicense].compactMap({ $0 }).joined(separator: exportFormat.separator())
+            switch exportFormat {
-        case .csv:
+            case .rawText:
-            return [lastName.uppercased() + " " + firstName.capitalized].joined(separator: exportFormat.separator())
+                return [firstName.capitalized, lastName.capitalized, hasPaidOnline() ? "Payé [X]" : "Payé  [ ]"].compactMap({ $0 }).joined(separator: exportFormat.separator())
+            case .csv:
+                return [lastName.uppercased() + " " + firstName.capitalized].joined(separator: exportFormat.separator())
+            }
+        case .sharing:
+            switch exportFormat {
+            case .rawText:
+                return [firstName.capitalized, lastName.capitalized, licenceId?.computedLicense].compactMap({ $0 }).joined(separator: exportFormat.separator())
+            case .csv:
+                return [lastName.uppercased() + " " + firstName.capitalized, hasPaid() ? "Payé" : "", hasPaidOnline() ? "En ligne" : ""]
+                    .joined(separator: exportFormat.separator())
+            }
         }
     }
     
@@ -70,6 +81,13 @@ final public class PlayerRegistration: BasePlayerRegistration, SideStorable {
     }
     
     public func contains(_ searchField: String) -> Bool {
+        if let paymentId, paymentId.localizedCaseInsensitiveContains(searchField) { return true }
+        if let email, email.lowercased().localizedCaseInsensitiveContains(searchField) { return true }
+        if let contactEmail, contactEmail.localizedCaseInsensitiveContains(searchField) { return true }
+        if let licenceId, licenceId.localizedCaseInsensitiveContains(searchField) { return true }
+        if searchField.isPhoneNumber(), let phoneNumber, phoneNumber.isSamePhoneNumber(as: searchField) { return true }
+        if searchField.isPhoneNumber(), let contactPhoneNumber, contactPhoneNumber.isSamePhoneNumber(as: searchField) { return true }
+
         let nameComponents = searchField.canonicalVersion.split(separator: " ")
         
         if nameComponents.count > 1 {
@@ -167,7 +185,7 @@ final public class PlayerRegistration: BasePlayerRegistration, SideStorable {
     }
         
     public func setComputedRank(in tournament: Tournament) {
-        let maleUnranked = tournament.unrankValue(for: isMalePlayer()) ?? 90_415
+        let maleUnranked = tournament.unrankValue(for: isMalePlayer()) ?? 92_327
         let femaleUnranked = tournament.unrankValue(for: false) ?? 0
         let currentRank = rank ?? maleUnranked
         switch tournament.tournamentCategory {
@@ -212,6 +230,16 @@ final public class PlayerRegistration: BasePlayerRegistration, SideStorable {
         registrationStatus = .confirmed
     }
     
+    public func hasMail() -> Bool {
+        let mails = [email, contactEmail].compactMap({ $0 })
+        return mails.isEmpty == false && mails.anySatisfy({ $0.isValidEmail() })
+    }
+    
+    public func hasMobilePhone() -> Bool {
+        let phones = [phoneNumber, contactPhoneNumber].compactMap({ $0 })
+        return phones.isEmpty == false && phones.anySatisfy({ $0.isPhoneNumber() })
+    }
+    
     public func paidAmount(_ tournament: Tournament, accountForGiftOrForfeit: Bool = false) -> Double {
         if accountForGiftOrForfeit == false, paymentType == .gift {
             return 0.0

PadelClubData/Data/Round.swift

@@ -56,6 +56,30 @@ final public class Round: BaseRound, SideStorable {
         return tournamentStore.matches.filter { $0.round == self.id && $0.disabled == true }
     }
 
+    public func setData(from correspondingRound: Round, tournamentStartDate: Date, previousTournamentStartDate: Date) {
+        let matches = correspondingRound._matches()
+        for (index, match) in self._matches().enumerated() {
+            match.setData(from: matches[index], tournamentStartDate: tournamentStartDate, previousTournamentStartDate: previousTournamentStartDate)
+        }
+        
+        self.matchFormat = correspondingRound.matchFormat
+        if let correspondingPlannedStartDate = correspondingRound.plannedStartDate {
+            let offset = correspondingPlannedStartDate.timeIntervalSince(previousTournamentStartDate)
+            self.startDate = tournamentStartDate.addingTimeInterval(offset)
+        }
+        self.loserBracketMode = correspondingRound.loserBracketMode
+        self.groupStageLoserBracket =  correspondingRound.groupStageLoserBracket
+        
+        loserRounds().forEach { round in
+            
+            if let pRound = correspondingRound.loserRounds().first(where: { r in
+                r.index == round.index
+            }) {
+                round.setData(from: pRound, tournamentStartDate: tournamentStartDate, previousTournamentStartDate: previousTournamentStartDate)
+            }
+        }
+    }
+    
     // MARK: -
     
     public var matchFormat: MatchFormat {
@@ -761,10 +785,7 @@ defer {
         guard currentRoundMatchCount > 1 else { return }
         guard let tournamentStore else { return }
         let roundCount = RoundRule.numberOfRounds(forTeams: currentRoundMatchCount)
-        let loserBracketMatchFormat = tournamentObject()?.loserBracketMatchFormat
+        let loserBracketMatchFormat = tournamentObject()?.loserBracketSmartMatchFormat()
-//        if let parentRound {
-//            loserBracketMatchFormat = tournamentObject()?.loserBracketSmartMatchFormat(parentRound.index)
-//        }
 
         var titles = [String: String]()
 
@@ -891,27 +912,17 @@ defer {
         groupStageLoserBracket == true
     }
     
-    public override func deleteDependencies(store: Store, shouldBeSynchronized: Bool) {
+    public override func deleteDependencies(store: Store, actionOption: ActionOption) {
 
-        store.deleteDependencies(type: Match.self, shouldBeSynchronized: shouldBeSynchronized) { $0.round == self.id }
+        store.deleteDependencies(type: Match.self, actionOption: actionOption) { $0.round == self.id }
-        store.deleteDependencies(type: Round.self, shouldBeSynchronized: shouldBeSynchronized) { $0.parent == self.id }
+        store.deleteDependencies(type: Round.self, actionOption: actionOption) { $0.parent == self.id }
 
-        
-//        let matches = self._matches()
-//        for match in matches {
-//            match.deleteDependencies(store: store, shouldBeSynchronized: shouldBeSynchronized)
-//        }
-//        
-//        self.tournamentStore?.matches.deleteDependencies(matches, shouldBeSynchronized: shouldBeSynchronized)
-//        
-//        let loserRounds = self.loserRounds()
-//        for round in loserRounds {
-//            round.deleteDependencies(store: store, shouldBeSynchronized: shouldBeSynchronized)
-//        }
-//        
-//        self.tournamentStore?.rounds.deleteDependencies(loserRounds, shouldBeSynchronized: shouldBeSynchronized)
     }
-
+    
+    public override func deleteUnusedSharedDependencies(store: Store) {
+        store.deleteUnusedSharedDependencies(type: Match.self) { $0.round == self.id }
+        store.deleteUnusedSharedDependencies(type: Round.self) { $0.parent == self.id }
+    }
     
 //    enum CodingKeys: String, CodingKey {
 //        case _id = "id"

PadelClubData/Data/TeamRegistration.swift

@@ -50,6 +50,10 @@ final public class TeamRegistration: BaseTeamRegistration, SideStorable {
         players().anySatisfy({ $0.registeredOnline })
     }
 
+    public func hasPaid() -> Bool {
+        players().allSatisfy({ $0.hasPaid() })
+    }
+
     public func hasPaidOnline() -> Bool {
         players().anySatisfy({ $0.hasPaidOnline() })
     }
@@ -92,23 +96,17 @@ final public class TeamRegistration: BaseTeamRegistration, SideStorable {
         let ts = tournamentStore.teamScores.filter({ $0.teamRegistration == id })
         tournamentStore.teamScores.delete(contentOfs: ts)
     }
-
+    
-    public override func deleteDependencies(store: Store, shouldBeSynchronized: Bool) {
+    public override func deleteUnusedSharedDependencies(store: Store) {
+        store.deleteUnusedSharedDependencies(type: TeamScore.self) { $0.teamRegistration == self.id }
+        store.deleteUnusedSharedDependencies(type: PlayerRegistration.self) { $0.teamRegistration == self.id }
+    }
+    
+    public override func deleteDependencies(store: Store, actionOption: ActionOption) {
         
-        store.deleteDependencies(type: TeamScore.self, shouldBeSynchronized: shouldBeSynchronized) { $0.teamRegistration == self.id }
+        store.deleteDependencies(type: TeamScore.self, actionOption: actionOption) { $0.teamRegistration == self.id }
-        store.deleteDependencies(type: PlayerRegistration.self, shouldBeSynchronized: shouldBeSynchronized) { $0.teamRegistration == self.id }
+        store.deleteDependencies(type: PlayerRegistration.self, actionOption: actionOption) { $0.teamRegistration == self.id }
-
+
-        //        let unsortedPlayers = unsortedPlayers()
-//        for player in unsortedPlayers {
-//            player.deleteDependencies(store: store, shouldBeSynchronized: shouldBeSynchronized)
-//        }
-//        self.tournamentStore?.playerRegistrations.deleteDependencies(unsortedPlayers, shouldBeSynchronized: shouldBeSynchronized)
-//
-//        let teamScores = teamScores()
-//        for teamScore in teamScores {
-//            teamScore.deleteDependencies(store: store, shouldBeSynchronized: shouldBeSynchronized)
-//        }
-//        self.tournamentStore?.teamScores.deleteDependencies(teamScores, shouldBeSynchronized: shouldBeSynchronized)
     }
     
     public func hasArrived(isHere: Bool = false) {
@@ -173,7 +171,7 @@ final public class TeamRegistration: BaseTeamRegistration, SideStorable {
         } else if let roundMatchStartDate = initialMatch()?.startDate {
             return roundMatchStartDate
         }
-        return nil
+        return callDate
     }
 
     public var initialWeight: Int {
@@ -213,7 +211,7 @@ final public class TeamRegistration: BaseTeamRegistration, SideStorable {
     }
 
     public func currentMatch() -> Match? {
-        return teamScores().compactMap { $0.matchObject() }.first(where: { $0.isRunning() })
+        return teamScores().compactMap { $0.matchValue() }.first(where: { $0.isRunning() })
     }
 
     public func teamScores() -> [TeamScore] {
@@ -256,7 +254,7 @@ final public class TeamRegistration: BaseTeamRegistration, SideStorable {
     public func teamLabel(
         _ displayStyle: DisplayStyle = .wide, twoLines: Bool = false, separator: String = "&"
     ) -> String {
-        if let name { return name }
+        if let name, name.isEmpty == false { return name }
         return players().map { $0.playerLabel(displayStyle) }.joined(
             separator: twoLines ? "\n" : " \(separator) ")
     }
@@ -380,14 +378,20 @@ final public class TeamRegistration: BaseTeamRegistration, SideStorable {
         resetBracketPosition()
     }
 
-    public func pasteData(_ exportFormat: ExportFormat = .rawText, _ index: Int = 0) -> String {
+    public func pasteData(_ exportFormat: ExportFormat = .rawText, type: ExportType, _ index: Int = 0) -> String {
         switch exportFormat {
         case .rawText:
-            return [playersPasteData(exportFormat), formattedInscriptionDate(exportFormat), name]
+            switch type {
-                .compactMap({ $0 }).joined(separator: exportFormat.newLineSeparator())
+            case .sharing:
+                return [playersPasteData(exportFormat, type: type), formattedInscriptionDate(exportFormat), name]
+                    .compactMap({ $0 }).joined(separator: exportFormat.newLineSeparator())
+            case .payment:
+                return [playersPasteData(exportFormat, type: type), name]
+                    .compactMap({ $0 }).joined(separator: exportFormat.newLineSeparator())
+            }
         case .csv:
             return [
-                index.formatted(), playersPasteData(exportFormat),
+                index.formatted(), playersPasteData(exportFormat, type: type),
                 isWildCard() ? "WC" : weight.formatted(),
             ].joined(separator: exportFormat.separator())
         }
@@ -437,15 +441,20 @@ final public class TeamRegistration: BaseTeamRegistration, SideStorable {
         }
     }
 
-    public func playersPasteData(_ exportFormat: ExportFormat = .rawText) -> String {
+    public func playersPasteData(_ exportFormat: ExportFormat = .rawText, type: ExportType) -> String {
         switch exportFormat {
         case .rawText:
-            return players().map { $0.pasteData(exportFormat) }.joined(
+            return players().map { $0.pasteData(exportFormat, type: type) }.joined(
                 separator: exportFormat.newLineSeparator())
         case .csv:
             return players().map {
-                [$0.pasteData(exportFormat), isWildCard() ? "WC" : $0.computedRank.formatted()]
+                switch type {
-                    .joined(separator: exportFormat.separator())
+                case .sharing:
+                    [$0.pasteData(exportFormat, type: type), isWildCard() ? "WC" : $0.computedRank.formatted()]
+                        .joined(separator: exportFormat.separator())
+                case .payment:
+                    $0.pasteData(exportFormat, type: type)
+                }
             }.joined(separator: exportFormat.separator())
         }
     }
@@ -542,7 +551,7 @@ final public class TeamRegistration: BaseTeamRegistration, SideStorable {
     }
 
     public func unrankValue(for malePlayer: Bool) -> Int {
-        return tournamentObject()?.unrankValue(for: malePlayer) ?? 90_415
+        return tournamentObject()?.unrankValue(for: malePlayer) ?? 92_327
     }
 
     public func groupStageObject() -> GroupStage? {
@@ -678,6 +687,37 @@ final public class TeamRegistration: BaseTeamRegistration, SideStorable {
 
         return nil
     }
+    
+    public func followingMatches() -> [Match] {
+        guard let tournamentStore else { return [] }
+        let allTeamScores = tournamentStore.teamScores.filter({ $0.teamRegistration == self.id })
+        let ids = allTeamScores.compactMap({ $0.match })
+        let matches = tournamentStore.matches.filter({ match in
+            ids.contains(match.id)
+        })
+        return matches.sorted(by: \.computedStartDateForSorting)
+    }
+    
+    public func nextMatch(in followingMatches: [Match]) -> Match? {
+        return followingMatches.filter({ $0.hasEnded() == false }).first
+    }
+    
+    public func lastMatchPlayed(in followingMatches: [Match]) -> Match? {
+        return followingMatches.first(where: { $0.hasEnded() })
+    }
+    
+    public func numberOfRotation(in followingMatches: [Match]) -> (Int, Int)? {
+        if let nextMatch = nextMatch(in: followingMatches), let nextMatchPlannedStartDate = nextMatch.plannedStartDate, let lastMatchPlayed = lastMatchPlayed(in: followingMatches), let lastMatchPlayedPlannedStartDate = lastMatchPlayed.plannedStartDate {
+            
+            let courtCount = self.tournamentStore?.matches.filter({ $0.plannedStartDate == nextMatchPlannedStartDate && $0.disabled == false && $0.hasEnded() == false && $0.confirmed == true && $0.id != nextMatch.id && $0.hasStarted() == false }).count ?? 0
+            let interval = nextMatchPlannedStartDate.timeIntervalSince(lastMatchPlayedPlannedStartDate)
+            let matchDuration = lastMatchPlayed.matchFormat.defaultEstimatedDuration * 60
+            let rotation = Int(interval) / matchDuration
+            print("numberOfRotation", interval, matchDuration, courtCount, rotation)
+            return (rotation, (rotation - 1) * lastMatchPlayed.courtCount() + courtCount + 1)
+        }
+        return nil
+    }
 
     func insertOnServer() {
         self.tournamentStore?.teamRegistrations.writeChangeAndInsertOnServer(instance: self)

PadelClubData/Data/TeamScore.swift

@@ -49,10 +49,10 @@ final public class TeamScore: BaseTeamScore, SideStorable {
 
     // MARK: - Computed dependencies
     
-    public func matchObject() -> Match? {
+//    public func matchObject() -> Match? {
-        return self.tournamentStore?.matches.findById(self.match)
+//        return self.tournamentStore?.matches.findById(self.match)
-    }
+//    }
-    
+//    
     public var team: TeamRegistration? {
         guard let teamRegistration else {
             return nil

PadelClubData/Data/Tournament.swift

@@ -32,16 +32,32 @@ final public class Tournament: BaseTournament {
         return TournamentLibrary.shared.store(tournamentId: self.id)
     }
 
-    public override func deleteDependencies(store: Store, shouldBeSynchronized: Bool) {
+    public override func deleteUnusedSharedDependencies(store: Store) {
         
         do {
             let tournamentStore = try store.alternateStore(identifier: self.id)
             
-            tournamentStore.deleteAllDependencies(type: DrawLog.self, shouldBeSynchronized: shouldBeSynchronized)
+            tournamentStore.deleteUnusedSharedDependencies(type: DrawLog.self)
-            tournamentStore.deleteAllDependencies(type: TeamRegistration.self, shouldBeSynchronized: shouldBeSynchronized)
+            tournamentStore.deleteUnusedSharedDependencies(type: TeamRegistration.self)
-            tournamentStore.deleteAllDependencies(type: GroupStage.self, shouldBeSynchronized: shouldBeSynchronized)
+            tournamentStore.deleteUnusedSharedDependencies(type: GroupStage.self)
-            tournamentStore.deleteAllDependencies(type: Round.self, shouldBeSynchronized: shouldBeSynchronized)
+            tournamentStore.deleteUnusedSharedDependencies(type: Round.self)
-            tournamentStore.deleteAllDependencies(type: MatchScheduler.self, shouldBeSynchronized: shouldBeSynchronized)
+        } catch {
+            Logger.error(error)
+        }
+
+        store.deleteUnusedSharedDependencies(type: Court.self) { $0.club == self.id }
+    }
+ 
+    public override func deleteDependencies(store: Store, actionOption: ActionOption) {
+        
+        do {
+            let tournamentStore = try store.alternateStore(identifier: self.id)
+            
+            tournamentStore.deleteAllDependencies(type: DrawLog.self, actionOption: actionOption)
+            tournamentStore.deleteAllDependencies(type: TeamRegistration.self, actionOption: actionOption)
+            tournamentStore.deleteAllDependencies(type: GroupStage.self, actionOption: actionOption)
+            tournamentStore.deleteAllDependencies(type: Round.self, actionOption: actionOption)
+            tournamentStore.deleteAllDependencies(type: MatchScheduler.self, actionOption: actionOption)
         } catch {
             Logger.error(error)
         }
@@ -88,11 +104,36 @@ final public class Tournament: BaseTournament {
         return self.tournamentStore?.teamRegistrations.count ?? 0
     }
 
+    public func deleteGroupStage(_ groupStage: GroupStage) {
+        groupStage.removeAllTeams()
+        let index = groupStage.index
+        self.tournamentStore?.groupStages.delete(instance: groupStage)
+        self.groupStageCount -= 1
+        let groupStages = self.groupStages()
+        groupStages.filter({ $0.index > index }).forEach { gs in
+            gs.index -= 1
+        }
+        self.tournamentStore?.groupStages.addOrUpdate(contentOfs: groupStages)
+    }
+    
+    public func addGroupStage() {
+        let groupStage = GroupStage(tournament: id, index: groupStageCount, size: teamsPerGroupStage, format: groupStageFormat)
+        self.tournamentStore?.groupStages.addOrUpdate(instance: groupStage)
+        groupStage.buildMatches(keepExistingMatches: false)
+        self.groupStageCount += 1
+    }
+        
     public func groupStages(atStep step: Int = 0) -> [GroupStage] {
         guard let tournamentStore = self.tournamentStore else { return [] }
-        let groupStages: [GroupStage] = tournamentStore.groupStages.filter { $0.tournament == self.id && $0.step == step }
+        let groupStages: [GroupStage] = tournamentStore.groupStages.filter { $0.step == step }
         return groupStages.sorted(by: \.index)
     }
+    
+    public func hasGroupeStages() -> Bool {
+        if groupStageCount > 0 { return true }
+        guard let tournamentStore = self.tournamentStore else { return false }
+        return tournamentStore.groupStages.isEmpty == false
+    }
 
     public func allGroupStages() -> [GroupStage] {
         guard let tournamentStore = self.tournamentStore else { return [] }
@@ -236,17 +277,24 @@ defer {
         return Store.main.findById(event)
     }
 
-    public func pasteDataForImporting(_ exportFormat: ExportFormat = .rawText) -> String {
+    public func pasteDataForImporting(_ exportFormat: ExportFormat = .rawText, type: ExportType) -> String {
         let _selectedSortedTeams = selectedSortedTeams()
         let selectedSortedTeams = _selectedSortedTeams + waitingListSortedTeams(selectedSortedTeams: _selectedSortedTeams)
         switch exportFormat {
         case .rawText:
-            return (selectedSortedTeams.compactMap { $0.pasteData(exportFormat) } + ["Liste d'attente"] + waitingListTeams(in: selectedSortedTeams, includingWalkOuts: true).compactMap { $0.pasteData(exportFormat) }).joined(separator: exportFormat.newLineSeparator(2))
+            let waitingList = waitingListTeams(in: selectedSortedTeams, includingWalkOuts: true)
+            var stats = [String]()
+            if type == .payment, isAnimation(), minimumPlayerPerTeam == 1 {
+                stats += ["\(self.selectedPlayers().count.formatted()) personnes"]
+            } else {
+                stats += [selectedSortedTeams.count.formatted() + " équipes"]
+            }
+            return (stats + selectedSortedTeams.compactMap { $0.pasteData(exportFormat, type: type) } + (waitingList.isEmpty == false ? ["Liste d'attente"] : []) + waitingList.compactMap { $0.pasteData(exportFormat, type: type) }).joined(separator: exportFormat.newLineSeparator(1))
         case .csv:
             let headers = ["N°", "Nom Prénom", "rang", "Nom Prénom", "rang", "poids", "Paire"].joined(separator: exportFormat.separator())
             var teamPaste = [headers]
             for (index, team) in selectedSortedTeams.enumerated() {
-                var teamData = team.pasteData(exportFormat, index + 1)
+                var teamData = team.pasteData(exportFormat, type: type, index + 1)
                 teamData.append(exportFormat.separator())
                 teamData.append(team.teamLastNames().joined(separator: " / "))
                 teamPaste.append(teamData)
@@ -345,6 +393,7 @@ defer {
     public func availableSeedOpponentSpot(inRoundIndex roundIndex: Int) -> [Match] {
         return getRound(atRoundIndex: roundIndex)?.playedMatches().filter { $0.hasSpaceLeft() } ?? []
     }
+    
     public func availableSeedGroups(includeAll: Bool = false) -> [SeedInterval] {
         let seeds = seeds()
         var availableSeedGroup = Set<SeedInterval>()
@@ -362,6 +411,24 @@ defer {
         return availableSeedGroup.sorted(by: <)
     }
     
+    public func generateSeedGroups(base: Int, teamCount: Int) -> [SeedInterval] {
+        let start = base + 1
+        let root = SeedInterval(first: start, last: start + teamCount - 1)
+        var groups: [SeedInterval] = []
+
+        func split(interval: SeedInterval) {
+            groups.append(interval)
+            if let chunks = interval.chunks() {
+                for chunk in chunks {
+                    split(interval: chunk)
+                }
+            }
+        }
+
+        split(interval: root)
+        return groups.sorted(by: <)
+    }
+    
     public func chunksBy(in chunks: [SeedInterval], availableSeedGroup: inout Set<SeedInterval>) {
         chunks.forEach { chunk in
             availableSeedGroup.insert(chunk)
@@ -654,7 +721,7 @@ defer {
         var groupStageTeamCount: Int = groupStageSpots - wcGroupStage.count
         if groupStageTeamCount < 0 { groupStageTeamCount = 0 }
         if bracketSeeds < 0 { bracketSeeds = 0 }
-
+        let clubName = self.clubName
         if prioritizeClubMembers {
 
             var bracketTeams: [TeamRegistration] = []
@@ -837,7 +904,7 @@ defer {
         return allMatches.filter({ $0.isRunning() && $0.isReady() }).sorted(using: defaultSorting, order: .ascending)
     }
 
-    public static func readyMatches(_ allMatches: [Match]) -> [Match] {
+    public static func readyMatches(_ allMatches: [Match], runningMatches: [Match]) -> [Match] {
         #if _DEBUG_TIME //DEBUGING TIME
         let start = Date()
         defer {
@@ -845,7 +912,10 @@ defer {
             print("func tournament readyMatches", id, duration.formatted(.units(allowed: [.seconds, .milliseconds])))
         }
         #endif
-        return allMatches.filter({ $0.isReady() && $0.isRunning() == false && $0.hasEnded() == false }).sorted(using: defaultSorting, order: .ascending)
+        
+        let playingTeams = runningMatches.flatMap({ $0.teams() }).map({ $0.id })
+        
+        return allMatches.filter({ $0.isReady() && $0.isRunning() == false && $0.hasEnded() == false && $0.containsTeamIds(playingTeams) == false }).sorted(using: defaultSorting, order: .ascending)
     }
 
     public static func matchesLeft(_ allMatches: [Match]) -> [Match] {
@@ -1109,10 +1179,10 @@ defer {
     }
 
     public func tournamentTitle(_ displayStyle: DisplayStyle = .wide, hideSenior: Bool = false) -> String {
-        if tournamentLevel == .unlisted, displayStyle == .title {
+        if tournamentLevel == .unlisted {
             if let name {
                 return name
-            } else {
+            } else if displayStyle == .title {
                 return tournamentLevel.localizedLevelLabel(.title)
             }
         }
@@ -1152,14 +1222,7 @@ defer {
     }
 
     public func formattedDate(_ displayStyle: DisplayStyle = .wide) -> String {
-        switch displayStyle {
+        startDate.formattedDate(displayStyle)
-        case .title:
-            startDate.formatted(.dateTime.weekday(.abbreviated).day().month(.abbreviated).year())
-        case .wide:
-            startDate.formatted(date: Date.FormatStyle.DateStyle.complete, time: Date.FormatStyle.TimeStyle.omitted)
-        case .short:
-            startDate.formatted(date: .numeric, time: .omitted)
-        }
     }
 
     public func qualifiedFromGroupStage() -> Int {
@@ -1409,7 +1472,7 @@ defer {
 
         var _groupStages = [GroupStage]()
         for index in 0..<groupStageCount {
-            let groupStage = GroupStage(tournament: id, index: index, size: teamsPerGroupStage, format: groupStageFormat)
+            let groupStage = GroupStage(tournament: id, index: index, size: teamsPerGroupStage, format: groupStageSmartMatchFormat())
             _groupStages.append(groupStage)
         }
 
@@ -1428,7 +1491,7 @@ defer {
         let matchCount = RoundRule.numberOfMatches(forTeams: minimalBracketTeamCount ?? bracketTeamCount())
 
         let rounds = (0..<roundCount).map { //index 0 is the final
-            return Round(tournament: id, index: $0, format: matchFormat, loserBracketMode: loserBracketMode)
+            return Round(tournament: id, index: $0, format: roundSmartMatchFormat($0), loserBracketMode: loserBracketMode)
         }
 
         if rounds.isEmpty {
@@ -1490,6 +1553,9 @@ defer {
 
     public func deleteGroupStages() {
         self.tournamentStore?.groupStages.delete(contentOfs: allGroupStages())
+        if let gs = self.groupStageLoserBracket() {
+            self.tournamentStore?.rounds.delete(instance: gs)
+        }
     }
 
     public func refreshGroupStages(keepExistingMatches: Bool = false) {
@@ -1627,9 +1693,9 @@ defer {
         set {
             federalLevelCategory = newValue
             teamSorting = newValue.defaultTeamSortingType
-            groupStageMatchFormat = groupStageSmartMatchFormat()
+            groupStageMatchFormat = DataStore.shared.user.groupStageMatchFormatPreference ?? groupStageSmartMatchFormat()
-            loserBracketMatchFormat = loserBracketSmartMatchFormat(1)
+            loserBracketMatchFormat = DataStore.shared.user.loserBracketMatchFormatPreference ?? loserBracketSmartMatchFormat()
-            matchFormat = roundSmartMatchFormat(5)
+            matchFormat = DataStore.shared.user.bracketMatchFormatPreference ?? roundSmartMatchFormat(5)
         }
     }
 
@@ -1642,8 +1708,8 @@ defer {
         }
     }
 
-    public func loserBracketSmartMatchFormat(_ roundIndex: Int) -> MatchFormat {
+    public func loserBracketSmartMatchFormat() -> MatchFormat {
-        let format = tournamentLevel.federalFormatForLoserBracketRound(roundIndex)
+        let format = tournamentLevel.federalFormatForLoserBracketRound()
         if tournamentLevel == .p25 { return .superTie }
         if format.rank < loserBracketMatchFormat.rank {
             return format
@@ -1654,7 +1720,6 @@ defer {
 
     public func groupStageSmartMatchFormat() -> MatchFormat {
         let format = tournamentLevel.federalFormatForGroupStage()
-        if tournamentLevel == .p25 { return .superTie }
         if format.rank < groupStageMatchFormat.rank {
             return format
         } else {
@@ -1663,19 +1728,21 @@ defer {
     }
     
     public func initSettings(templateTournament: Tournament?, overrideTeamCount: Bool = true) {
+        courtCount = eventObject()?.clubObject()?.courtCount ?? 2
         setupDefaultPrivateSettings(templateTournament: templateTournament)
         setupUmpireSettings(defaultTournament: nil) //default is not template, default is for event sharing settings
         if let templateTournament {
             setupRegistrationSettings(templateTournament: templateTournament, overrideTeamCount: overrideTeamCount)
         }
         setupFederalSettings()
+        customizeUsingPreferences()
     }
     
     public func setupFederalSettings() {
         teamSorting = tournamentLevel.defaultTeamSortingType
-        groupStageMatchFormat = groupStageSmartMatchFormat()
+        groupStageMatchFormat = DataStore.shared.user.groupStageMatchFormatPreference ?? groupStageSmartMatchFormat()
-        loserBracketMatchFormat = loserBracketSmartMatchFormat(5)
+        loserBracketMatchFormat = DataStore.shared.user.loserBracketMatchFormatPreference ?? loserBracketSmartMatchFormat()
-        matchFormat = roundSmartMatchFormat(5)
+        matchFormat = DataStore.shared.user.bracketMatchFormatPreference ?? roundSmartMatchFormat(5)
         entryFee = tournamentLevel.entryFee
         registrationDateLimit = deadline(for: .inscription)
         if enableOnlineRegistration, isAnimation() == false {
@@ -1684,6 +1751,23 @@ defer {
         }
     }
     
+    public func customizeUsingPreferences() {
+        guard let lastTournamentWithSameBuild = DataStore.shared.tournaments.filter({ tournament in
+            tournament.tournamentLevel == self.tournamentLevel
+            && tournament.tournamentCategory == self.tournamentCategory
+            && tournament.federalTournamentAge == self.federalTournamentAge
+            && tournament.hasEnded() == true
+            && tournament.isCanceled == false
+            && tournament.isDeleted == false
+        }).sorted(by: \.endDate!, order: .descending).first else {
+            return
+        }
+
+        self.entryFee = lastTournamentWithSameBuild.entryFee
+        self.clubMemberFeeDeduction = lastTournamentWithSameBuild.clubMemberFeeDeduction
+    }
+
+    
     public func deadline(for type: TournamentDeadlineType) -> Date? {
         guard [.p500, .p1000, .p1500, .p2000].contains(tournamentLevel) else { return nil }
         
@@ -1773,7 +1857,6 @@ defer {
 
     public func roundSmartMatchFormat(_ roundIndex: Int) -> MatchFormat {
         let format = tournamentLevel.federalFormatForBracketRound(roundIndex)
-        if tournamentLevel == .p25 { return .superTie }
         if format.rank < matchFormat.rank {
             return format
         } else {
@@ -2040,7 +2123,18 @@ defer {
             }
         }
     }
-
+    
+    public func removeRound(_ round: Round) async {
+        await MainActor.run {
+            let teams = round.seeds()
+            teams.forEach { team in
+                team.resetBracketPosition()
+            }
+            tournamentStore?.teamRegistrations.addOrUpdate(contentOfs: teams)
+            tournamentStore?.rounds.delete(instance: round)
+        }
+    }
+    
     public func addNewRound(_ roundIndex: Int) async {
         await MainActor.run {
             let round = Round(tournament: id, index: roundIndex, format: matchFormat)
@@ -2226,7 +2320,11 @@ defer {
     }
         
     public func onlineTeams() -> [TeamRegistration] {
-        unsortedTeams().filter({ $0.hasRegisteredOnline() })
+//        guard let teamRegistrations = tournamentStore?.teamRegistrations else { return [] }
+//        return teamRegistrations.cached(key: "online") { collection in
+//            collection.filter { $0.hasRegisteredOnline() }
+//        }
+        return unsortedTeams().filter({ $0.hasRegisteredOnline() })
     }
     
     public func paidOnlineTeams() -> [TeamRegistration] {
@@ -2261,7 +2359,7 @@ defer {
     }
     
     public func mailSubject() -> String {
-        let subject = [tournamentTitle(hideSenior: true), formattedDate(.short), clubName].compactMap({ $0 }).joined(separator: " | ")
+        let subject = [tournamentTitle(hideSenior: true), formattedDate(.short), customClubName ?? clubName].compactMap({ $0 }).joined(separator: " | ")
         return subject
     }
     
@@ -2366,6 +2464,9 @@ defer {
     }
     
     public func addon(for playerRank: Int, manMax: Int, womanMax: Int) -> Int {
+        if tournamentCategory != .men {
+            return 0
+        }
         switch playerRank {
         case 0: return 0
         case womanMax: return manMax - womanMax
@@ -2405,6 +2506,16 @@ defer {
         self.tournamentStore?.rounds.addOrUpdate(contentOfs: allRounds)
     }
     
+    public func formatSummary() -> String {
+        var label = [String]()
+        if groupStageCount > 0 {
+            label.append("Poules " + groupStageMatchFormat.format)
+        }
+        label.append("Tableau " + matchFormat.format)
+        label.append("Classement " + loserBracketMatchFormat.format)
+        return label.joined(separator: ", ")
+    }
+    
     // MARK: -
 
     func insertOnServer() throws {

PadelClubData/Data/TournamentLibrary.swift

@@ -20,10 +20,15 @@ public class TournamentLibrary {
         if let store = self._stores[tournamentId] {
             return store
         }
-        let store = StoreCenter.main.requestStore(identifier: tournamentId)
+        do {
-        let tournamentStore = TournamentStore(store: store)
+            let store = try StoreCenter.main.store(identifier: tournamentId)
-        self._stores[tournamentId] = tournamentStore
+            let tournamentStore = TournamentStore(store: store, tournamentId: tournamentId)
-        return tournamentStore
+            self._stores[tournamentId] = tournamentStore
+            return tournamentStore
+        } catch {
+            Logger.error(error)
+            return nil
+        }
     }
     
     func reset() {

PadelClubData/Data/TournamentStore.swift

@@ -13,6 +13,7 @@ import Combine
 public class TournamentStore: ObservableObject {
     
     var store: Store
+    let tournamentId: String
     
     public fileprivate(set) var groupStages: SyncedCollection<GroupStage> = SyncedCollection.placeholder()
     public fileprivate(set) var matches: SyncedCollection<Match> = SyncedCollection.placeholder()
@@ -30,13 +31,18 @@ public class TournamentStore: ObservableObject {
 //        self._initialize()
 //    }
 
-    init(store: Store) {
+    init(store: Store, tournamentId: String) {
         self.store = store
+        self.tournamentId = tournamentId
         self._initialize()
     }
     
     fileprivate func _initialize() {
 
+        guard let tournament = DataStore.shared.tournaments.findById(self.tournamentId) else {
+             return
+        }
+        
         let indexed: Bool = true
 
         self.groupStages = self.store.registerSynchronizedCollection(indexed: indexed)
@@ -48,7 +54,9 @@ public class TournamentStore: ObservableObject {
         self.matchSchedulers = self.store.registerCollection(indexed: indexed)
         self.drawLogs = self.store.registerSynchronizedCollection(indexed: indexed)
 
-        self.store.loadCollectionsFromServerIfNoFile()
+        if tournament.sharing == nil {
+            self.store.loadCollectionsFromServerIfNoFile()
+        }
         
         NotificationCenter.default.addObserver(
             self,

PadelClubData/Extensions/Date+Extensions.swift

@@ -118,6 +118,14 @@ public extension Date {
         }
     }
     
+    var nextDay: Date {
+        return Calendar.current.date(byAdding: .day, value: 1, to: self)!
+    }
+    
+    var weekDay: Int {
+        Calendar.current.component(.weekday, from: self)
+    }
+    
     func atBeginningOfDay(hourInt: Int = 9) -> Date {
         Calendar.current.date(byAdding: .hour, value: hourInt, to: self.startOfDay)!
     }
@@ -144,6 +152,28 @@ public extension Date {
         return weekdays.map { $0.capitalized }
     }()
     
+    static var weekdays: [String] = {
+        let calendar = Calendar.current
+        //           let weekdays = calendar.shortWeekdaySymbols
+        
+        //           return weekdays.map { weekday in
+        //               guard let firstLetter = weekday.first else { return "" }
+        //               return String(firstLetter).capitalized
+        //           }
+        // Adjusted for the different weekday starts
+        var weekdays = calendar.weekdaySymbols
+        if firstDayOfWeek > 1 {
+            for _ in 1..<firstDayOfWeek {
+                if let first = weekdays.first {
+                    weekdays.append(first)
+                    weekdays.removeFirst()
+                }
+            }
+        }
+        return weekdays.map { $0.capitalized }
+    }()
+
+    
     static var fullMonthNames: [String] = {
         let dateFormatter = DateFormatter()
         dateFormatter.locale = Locale.current
@@ -164,6 +194,11 @@ public extension Date {
         return Calendar.current.date(byAdding: .day, value: -1, to: lastDay)!
     }
     
+    var endOfWeek: Date {
+        let lastDay = Calendar.current.dateInterval(of: .weekOfMonth, for: self)!.end
+        return Calendar.current.date(byAdding: .day, value: -1, to: lastDay)!
+    }
+    
     var startOfPreviousMonth: Date {
         let dayInPreviousMonth = Calendar.current.date(byAdding: .month, value: -1, to: self)!
         return dayInPreviousMonth.startOfMonth
@@ -276,6 +311,18 @@ public extension Date {
         let calendar = Calendar.current
         return calendar.date(bySetting: .minute, value: 0, of: self)!.withoutSeconds()
     }
+    
+    func formattedDate(_ displayStyle: DisplayStyle = .wide) -> String {
+        switch displayStyle {
+        case .title:
+            self.formatted(.dateTime.weekday(.abbreviated).day().month(.abbreviated).year())
+        case .wide:
+            self.formatted(date: Date.FormatStyle.DateStyle.complete, time: Date.FormatStyle.TimeStyle.omitted)
+        case .short:
+            self.formatted(date: .numeric, time: .omitted)
+        }
+    }
+
 }
 
 public extension Date {

PadelClubData/Extensions/String+Extensions.swift

@@ -213,16 +213,96 @@ public extension String {
 // MARK: - FFT Source Importing
 public extension String {
     enum RegexStatic {
-        static let mobileNumber = /^(?:\+33|0033|0)[6-7](?:[ .-]?[0-9]{2}){4}$/
+        // Patterns for France only
-        static let phoneNumber = /^(?:\+33|0033|0)[1-9](?:[ .-]?[0-9]{2}){4}$/
+        static let phoneNumber = /^(\+33|0033|33|0)[1-9][0-9]{8}$/
+        static let phoneNumberWithExtra0 = /^33[0][1-9][0-9]{8}$/
+        static let mobileNumber = /^(\+33|0033|33|0)[6-7][0-9]{8}$/
+        static let mobileNumberWithExtra0 = /^33[0][6-7][0-9]{8}$/
+    }
+    
+    private func cleanedNumberForValidation() -> String {
+        // Keep leading '+' if present, remove all other non-digit characters
+        var cleaned = self.trimmingCharacters(in: .whitespacesAndNewlines)
+        if cleaned.hasPrefix("+") {
+            // Preserve '+' at start, remove all other non-digit characters
+            let digitsOnly = cleaned.dropFirst().components(separatedBy: CharacterSet.decimalDigits.inverted).joined()
+            cleaned = "+" + digitsOnly
+        } else {
+            // Remove all non-digit characters
+            cleaned = cleaned.components(separatedBy: CharacterSet.decimalDigits.inverted).joined()
+        }
+        return cleaned
+    }
+    
+    // MARK: - Phone Number Validation
+    
+    /// Validate if the string is a mobile number for the specified locale.
+    /// - Parameter locale: The locale to validate against. Defaults to `.current`.
+    /// - Returns: True if the string matches the mobile number pattern for the locale.
+    func isMobileNumber(locale: Locale = .current) -> Bool {
+        // TODO: Support additional regions/locales in the future.
+        switch locale.region?.identifier {
+        case "FR", "fr", nil:
+            // French logic for now
+            let cleaned = cleanedNumberForValidation()
+            if cleaned.firstMatch(of: RegexStatic.mobileNumber) != nil {
+                return true
+            }
+            if cleaned.firstMatch(of: RegexStatic.mobileNumberWithExtra0) != nil {
+                return true
+            }
+            return false
+        default:
+            // For unsupported locales, fallback to checking if the string contains at least 8 digits
+            // This is a generic minimum length for most countries' phone numbers
+            let digitsOnly = self.components(separatedBy: CharacterSet.decimalDigits.inverted).joined()
+            return digitsOnly.count >= 8
+        }
     }
 
-    func isMobileNumber() -> Bool {
+    /// Validate if the string is a phone number for the specified locale.
-        firstMatch(of: RegexStatic.mobileNumber) != nil
+    /// - Parameter locale: The locale to validate against. Defaults to `.current`.
+    /// - Returns: True if the string matches the phone number pattern for the locale.
+    func isPhoneNumber(locale: Locale = .current) -> Bool {
+        // TODO: Support additional regions/locales in the future.
+        switch locale.region?.identifier {
+        case "FR", "fr", nil:
+            // French logic for now
+            let cleaned = cleanedNumberForValidation()
+            if cleaned.firstMatch(of: RegexStatic.phoneNumber) != nil {
+                return true
+            }
+            if cleaned.firstMatch(of: RegexStatic.phoneNumberWithExtra0) != nil {
+                return true
+            }
+            return false
+        default:
+            // For unsupported locales, fallback to checking if the string contains at least 8 digits
+            // This is a generic minimum length for most countries' phone numbers
+            let digitsOnly = self.components(separatedBy: CharacterSet.decimalDigits.inverted).joined()
+            return digitsOnly.count >= 8
+        }
+    }
+    
+    func normalize(_ phone: String) -> String {
+        var normalized = phone.trimmingCharacters(in: .whitespacesAndNewlines)
+        // Remove all non-digit characters
+        normalized = normalized.components(separatedBy: CharacterSet.decimalDigits.inverted).joined()
+        // Remove leading country code for France (33) if present
+        if normalized.hasPrefix("33") {
+            if normalized.dropFirst(2).hasPrefix("0") {
+                // Keep as is, don't strip the zero after 33
+            } else {
+                normalized = "0" + normalized.dropFirst(2)
+            }
+        } else if normalized.hasPrefix("0033") {
+            normalized = "0" + normalized.dropFirst(4)
+        }
+        return normalized
     }
 
-    func isPhoneNumber() -> Bool {
+    func isSamePhoneNumber(as other: String) -> Bool {
-        firstMatch(of: RegexStatic.phoneNumber) != nil
+        return normalize(self) == normalize(other)
     }
 
     func cleanSearchText() -> String {
@@ -312,3 +392,4 @@ public extension String {
         return self  // Return the original string if parsing fails
     }
 }
+

PadelClubData/Subscriptions/Guard.swift

@@ -30,11 +30,7 @@ import Combine
         self.updateListenerTask = self.listenForTransactions()
 
         Task {
-            do {
+            await self.refreshPurchases()
-                try await self.refreshPurchasedAppleProducts()
-            } catch {
-                Logger.error(error)
-            }
             Logger.log("plan = \(String(describing: currentBestPurchase?.productId))")
         }
         
@@ -48,7 +44,7 @@ import Combine
     }
     
     @objc func collectionDidLoad(notification: Notification) {
-        if let _ = notification.object as? BaseCollection<Purchase> {
+        if let _ = notification.object as? StoredCollection<Purchase> {
             self._updateBestPlan()
         }
     }
@@ -66,18 +62,45 @@ import Combine
         return productIds
     }
     
-    public func refreshPurchasedAppleProducts() async throws {
+    public func refreshPurchases() async {
+        await _refreshUnfinishedTransactions()
+        await _refreshPurchasedAppleProducts()
+    }
+    
+    fileprivate func _refreshPurchasedAppleProducts() async {
         
         // Iterate through the user's purchased products.
         for await verificationResult in Transaction.currentEntitlements {
-            let transaction = try await self.processTransactionResult(verificationResult)
+            do {
-            print("processs product id = \(transaction.productID)")
+                let transaction = try await self.processTransactionResult(verificationResult)
-            DispatchQueue.main.async {
+                print("processs product id = \(transaction.productID)")
-                NotificationCenter.default.post(name: Notification.Name.StoreEventHappened, object: nil)
+                DispatchQueue.main.async {
+                    NotificationCenter.default.post(name: Notification.Name.StoreEventHappened, object: nil)
+                }
+                await transaction.finish()
+            } catch {
+                Logger.error(error)
+            }
+        }
+    }
+    
+    public func _refreshUnfinishedTransactions() async {
+        
+        // Iterate through the user's purchased products.
+        for await verificationResult in Transaction.unfinished {
+            do {
+                let transaction = try await self.processTransactionResult(verificationResult)
+                print("processs product id = \(transaction.productID)")
+                DispatchQueue.main.async {
+                    NotificationCenter.default.post(name: Notification.Name.StoreEventHappened, object: nil)
+                }
+                await transaction.finish()
+            } catch {
+                Logger.error(error)
             }
-            await transaction.finish()
         }
     }
+
     
     func listenForTransactions() -> Task<Void, Never> {
         return Task(priority: .background) {
@@ -219,7 +242,7 @@ import Combine
         purchases.append(contentsOf: userPurchases)
         
         let validPurchases = DataStore.shared.purchases.filter { $0.isValid() }
-        Logger.log("valid purchases = \(validPurchases.count)")
+//        Logger.log("valid purchases = \(validPurchases.count)")
         purchases.append(contentsOf: validPurchases)
         
         if let purchase = purchases.first(where: { $0.productId == StoreItem.monthlyUnlimited.rawValue }) {
@@ -243,7 +266,26 @@ import Combine
 //        return units.reduce(0) { $0 + $1.purchasedQuantity }
     }
     
-    public func paymentForNewTournament() -> TournamentPayment? {
+    struct CanCreateResponse: Decodable { var canCreate: Bool }
+    
+    public func paymentForNewTournament() async -> TournamentPayment? {
+        
+        if let payment = self.localPaymentForNewTournament() {
+            return payment
+        } else if let services = try? StoreCenter.main.service() {
+            do {
+                let response: CanCreateResponse = try await services.run(path: "is_granted_unlimited_access/", method: .get, requiresToken: true)
+                if response.canCreate {
+                    return .unlimited
+                }
+            } catch {
+                Logger.error(error)
+            }
+        }
+        return nil
+    }
+    
+    public func localPaymentForNewTournament() -> TournamentPayment? {
         
         switch self.currentPlan {
         case .monthlyUnlimited: 

PadelClubData/Subscriptions/StoreManager.swift

@@ -71,10 +71,8 @@ public class StoreManager {
     fileprivate func _productIdentifiers() -> [String] {
         var items: [StoreItem] = []
         switch Guard.main.currentPlan {
-        case .fivePerMonth:
-            items = [StoreItem.unit, StoreItem.unit10Pack, StoreItem.monthlyUnlimited]
         case .monthlyUnlimited:
-            break
+            items = [StoreItem.unit, StoreItem.unit10Pack]
         default:
             items = [StoreItem.unit, StoreItem.unit10Pack, StoreItem.monthlyUnlimited]
         }

PadelClubData/Utils/ContactManager.swift

@@ -55,6 +55,89 @@ public enum ContactManagerError: LocalizedError {
     }
 }
 
+public enum SummonType: Int, Identifiable {
+    case contact
+    case contactWithoutSignature
+    case summon
+    case summonWalkoutFollowUp
+    case summonErrorFollowUp
+    
+    public func isRecall() -> Bool {
+        switch self {
+        case .contact, .contactWithoutSignature:
+            return false
+        case .summon:
+            return false
+        case .summonWalkoutFollowUp:
+            return true
+        case .summonErrorFollowUp:
+            return true
+        }
+    }
+    
+    public func mainWord() -> String {
+        switch self {
+        case .contact:
+            return "Contacter"
+        case .contactWithoutSignature:
+            return "Contacter"
+        case .summon:
+            return "Convoquer"
+        case .summonWalkoutFollowUp:
+            return "Reconvoquer"
+        case .summonErrorFollowUp:
+            return "Reconvoquer"
+        }
+    }
+    
+    public func caption() -> String? {
+        switch self {
+        case .contact:
+            return nil
+        case .contactWithoutSignature:
+            return "Sans texte par défaut"
+        case .summon:
+            return nil
+        case .summonWalkoutFollowUp:
+            return "Suite à un forfait"
+        case .summonErrorFollowUp:
+            return "Suite à une erreur"
+        }
+    }
+    
+    public func shouldConfirm() -> Bool {
+        switch self {
+        case .contact, .contactWithoutSignature:
+            return false
+        case .summon:
+            return true
+        case .summonWalkoutFollowUp:
+            return true
+        case .summonErrorFollowUp:
+            return true
+        }
+    }
+    
+    public func intro() -> String {
+        switch self {
+        case .contactWithoutSignature:
+            return ""
+        case .contact:
+            return "Vous êtes"
+        case .summon:
+            return "Vous êtes"
+        case .summonWalkoutFollowUp:
+            return "Suite à des forfaits, vous êtes finalement"
+        case .summonErrorFollowUp:
+            return "Suite à une erreur, vous êtes finalement"
+        }
+    }
+    
+    public var id: Int {
+        self.rawValue
+    }
+}
+
 public enum ContactType: Identifiable {
     case mail(date: Date?, recipients: [String]?, bccRecipients: [String]?, body: String?, subject: String?, tournamentBuild: TournamentBuild?)
     case message(date: Date?, recipients: [String]?, body: String?, tournamentBuild: TournamentBuild?)
@@ -76,7 +159,7 @@ Il est conseillé de vous présenter 10 minutes avant de jouer.\n\nMerci de me c
 
     static func callingCustomMessage(source: String? = nil, tournament: Tournament?, startDate: Date?, roundLabel: String) -> String {
         let tournamentCustomMessage = source ?? DataStore.shared.user.summonsMessageBody ?? defaultCustomMessage
-        let clubName = tournament?.clubName ?? ""
+        let clubName = tournament?.customClubName ?? tournament?.clubName ?? ""
 
         var text = tournamentCustomMessage
         let date = startDate ?? tournament?.startDate ?? Date()
@@ -97,8 +180,10 @@ Il est conseillé de vous présenter 10 minutes avant de jouer.\n\nMerci de me c
         return text
     }
     
-    static func callingMessage(tournament: Tournament?, startDate: Date?, roundLabel: String, matchFormat: MatchFormat?, reSummon: Bool = false) -> String {
+    static func callingMessage(tournament: Tournament?, startDate: Date?, roundLabel: String, matchFormat: MatchFormat?, summonType: SummonType = .summon) -> String {
-        
+        if summonType == .contactWithoutSignature {
+            return ""
+        }
         let useFullCustomMessage = DataStore.shared.user.summonsUseFullCustomMessage
 
         if useFullCustomMessage {
@@ -107,7 +192,7 @@ Il est conseillé de vous présenter 10 minutes avant de jouer.\n\nMerci de me c
 
         let date = startDate ?? tournament?.startDate ?? Date()
 
-        let clubName = tournament?.clubName ?? ""
+        let clubName = tournament?.customClubName ?? tournament?.clubName ?? ""
         let message = DataStore.shared.user.summonsMessageBody ?? defaultCustomMessage
         let signature = DataStore.shared.user.getSummonsMessageSignature() ?? DataStore.shared.user.defaultSignature(tournament)
 
@@ -129,7 +214,7 @@ Il est conseillé de vous présenter 10 minutes avant de jouer.\n\nMerci de me c
             [entryFeeMessage, message, linkMessage].compacted().map { $0.trimmedMultiline }.joined(separator: "\n\n")
         }
         
-        let intro = reSummon ? "Suite à des forfaits, vous êtes finalement" : "Vous êtes"
+        let intro = summonType.intro()
 
         if let tournament {
             return "Bonjour,\n\n\(intro) \(localizedCalled) pour jouer en  \(roundLabel.lowercased()) du \(tournament.tournamentTitle(.title, hideSenior: true)) au \(clubName) le \(date.formatted(Date.FormatStyle().weekday(.wide).day().month(.wide))) à \(date.formatted(Date.FormatStyle().hour().minute())).\n\n" + computedMessage + "\n\n\(signature)"

PadelClubData/Utils/ExportFormat.swift

@@ -35,3 +35,23 @@ public enum ExportFormat: Int, Identifiable, CaseIterable {
         return Array(repeating: "\n", count: count).joined()
     }
 }
+
+public enum ExportType: Int, Identifiable, CaseIterable {
+    public var id: Int { self.rawValue }
+    
+    case sharing
+    case payment
+    
+    public func localizedString() -> String {
+        switch self {
+        case .sharing:
+            return "inscriptions"
+        case .payment:
+            return "pointage"
+        }
+    }
+        
+    public func newLineSeparator(_ count: Int = 1) -> String {
+        return Array(repeating: "\n", count: count).joined()
+    }
+}

PadelClubData/Utils/PListReader.swift

@@ -10,7 +10,11 @@ import Foundation
 public class PListReader {
     
     static func dictionary(plist: String) -> [String: Any]? {
-        if let plistPath = Bundle.main.path(forResource: plist, ofType: "plist") {
+        return self.dictionary(plist: plist, bundle: Bundle.main)
+    }
+    
+    static func dictionary(plist: String, bundle: Bundle) -> [String: Any]? {
+        if let plistPath = bundle.path(forResource: plist, ofType: "plist") {
             // Read plist file into Data
             if let plistData = FileManager.default.contents(atPath: plistPath) {
                 do {
@@ -25,21 +29,21 @@ public class PListReader {
                 print("Failed to read plist file at path: \(plistPath)")
             }
         } else {
-            print("Plist file 'Data.plist' not found in bundle")
+            print("Plist file '\(plist)' not found in bundle")
         }
         return nil
         
     }
     
-    public static func readString(plist: String, key: String) -> String? {
+    public static func readString(plist: String, key: String, bundle: Bundle = Bundle.main) -> String? {
-        if let dictionary = self.dictionary(plist: plist) {
+        if let dictionary = self.dictionary(plist: plist, bundle: bundle) {
             return dictionary[key] as? String
         }
         return nil
     }
     
-    public static func readBool(plist: String, key: String) -> Bool? {
+    public static func readBool(plist: String, key: String, bundle: Bundle = Bundle.main) -> Bool? {
-        if let dictionary = self.dictionary(plist: plist) {
+        if let dictionary = self.dictionary(plist: plist, bundle: bundle) {
             return dictionary[key] as? Bool
         }
         return nil

PadelClubData/ViewModel/PadelRule.swift

@@ -25,7 +25,7 @@ enum RankSource: Hashable {
     }
 }
 
-public protocol TournamentBuildHolder: Identifiable {
+public protocol TournamentBuildHolder: Identifiable, Hashable, Equatable {
     var id: String { get }
     var category: TournamentCategory { get }
     var level: TournamentLevel { get }
@@ -349,7 +349,9 @@ public enum FederalTournamentAge: Int, Hashable, Codable, CaseIterable, Identifi
             return 4
         } else {
             switch level {
-            case .p25, .p100, .p250:
+            case .p25:
+                return 4
+            case .p100, .p250:
                 if category == .women {
                     return 4
                 }
@@ -550,7 +552,7 @@ public enum TournamentLevel: Int, Hashable, Codable, CaseIterable, Identifiable
             }
         case .p1500, .p2000:
             if roundIndex <= 3 { //demi / finale / quart / 8eme
-                return .twoSetsDecisivePoint
+                return .twoSets
             } else {
                 return .twoSetsSuperTie
             }
@@ -568,7 +570,7 @@ public enum TournamentLevel: Int, Hashable, Codable, CaseIterable, Identifiable
         }
     }
     
-    public func federalFormatForLoserBracketRound(_ roundIndex: Int) -> MatchFormat {
+    public func federalFormatForLoserBracketRound() -> MatchFormat {
         switch self {
         case .p25:
             return .superTie
@@ -710,7 +712,7 @@ public enum TournamentLevel: Int, Hashable, Codable, CaseIterable, Identifiable
             case 13...16:
                 return [175,150,138,113,100,88,75,63,53,45,38,25,13,8,3]
             case 17...20:
-                return [188,163,150,138,123,113,100,88,75,63,58,50,45,38,30,25,13,8,3]
+                return [188,163,150,138,125,113,100,88,75,63,58,50,45,38,30,25,13,8,3]
             case 21...24:
                 return [188,175,163,150,138,125,118,108,100,93,83,75,70,63,58,50,45,38,30,25,13,8,3]
             case 25...28:
@@ -1199,6 +1201,7 @@ public enum TeamPosition: Int, Identifiable, Hashable, Codable, CaseIterable {
 public enum SetFormat: Int, Hashable, Codable {
     case nine
     case four
+    case three
     case six
     case superTieBreak
     case megaTieBreak
@@ -1225,6 +1228,10 @@ public enum SetFormat: Int, Hashable, Codable {
             if teamOne == 5 || teamTwo == 5 {
                 return true
             }
+        case .three:
+            if teamOne == 4 || teamTwo == 4 {
+                return true
+            }
         case .six:
             if teamOne == 7 || teamTwo == 7 {
                 return true
@@ -1243,6 +1250,8 @@ public enum SetFormat: Int, Hashable, Codable {
             return 8
         case .four:
             return 4
+        case .three:
+            return 3
         case .six:
             return 6
         case .superTieBreak, .megaTieBreak:
@@ -1260,6 +1269,10 @@ public enum SetFormat: Int, Hashable, Codable {
             if teamOneScore == 4 {
                 return []
             }
+        case .three:
+            if teamOneScore == 3 {
+                return []
+            }
         case .six:
             if teamOneScore == 6 {
                 return []
@@ -1282,6 +1295,8 @@ public enum SetFormat: Int, Hashable, Codable {
             return [9, 8, 7, 6, 5, 4, 3, 2, 1, 0]
         case .four:
             return [5, 4, 3, 2, 1, 0]
+        case .three:
+            return [4, 3, 2, 1, 0]
         case .six:
             return [7, 6, 5, 4, 3, 2, 1, 0]
         case .superTieBreak:
@@ -1297,6 +1312,8 @@ public enum SetFormat: Int, Hashable, Codable {
             return 9
         case .four:
             return 4
+        case .three:
+            return 4
         case .six:
             return 6
         case .superTieBreak:
@@ -1364,15 +1381,15 @@ public enum MatchFormat: Int, Hashable, Codable, CaseIterable, Identifiable {
             return 2
         case .nineGames, .nineGamesDecisivePoint:
             return 3
-        case .superTie:
+        case .singleSetOfFourGames, .singleSetOfFourGamesDecisivePoint:
             return 4
-        case .megaTie:
+        case .superTie:
             return 5
-        case .twoSetsOfSuperTie:
+        case .megaTie:
             return 6
-        case .singleSet, .singleSetDecisivePoint:
+        case .twoSetsOfSuperTie:
             return 7
-        case .singleSetOfFourGames, .singleSetOfFourGamesDecisivePoint:
+        case .singleSet, .singleSetDecisivePoint:
             return 8
         }
     }
@@ -1395,15 +1412,15 @@ public enum MatchFormat: Int, Hashable, Codable, CaseIterable, Identifiable {
             return 3
         case .nineGamesDecisivePoint:
             return 3
-        case .superTie:
+        case .singleSetOfFourGames, .singleSetOfFourGamesDecisivePoint:
             return 4
-        case .megaTie:
+        case .superTie:
             return 5
-        case .twoSetsOfSuperTie:
+        case .megaTie:
             return 6
-        case .singleSet, .singleSetDecisivePoint:
+        case .twoSetsOfSuperTie:
             return 7
-        case .singleSetOfFourGames, .singleSetOfFourGamesDecisivePoint:
+        case .singleSet, .singleSetDecisivePoint:
             return 8
         }
     }
@@ -1641,7 +1658,7 @@ public enum MatchFormat: Int, Hashable, Codable, CaseIterable, Identifiable {
         case .megaTie:
             return "supertie de 15 points"
         case .singleSetOfFourGames, .singleSetOfFourGamesDecisivePoint:
-            return "1 set de 4 jeux, tiebreak à 4/4"
+            return "1 set de 4 jeux, tiebreak à 3/3"
         }
     }
     
@@ -1670,8 +1687,10 @@ public enum MatchFormat: Int, Hashable, Codable, CaseIterable, Identifiable {
         switch self {
         case .twoSets, .twoSetsSuperTie, .twoSetsDecisivePoint, .twoSetsDecisivePointSuperTie, .singleSet, .singleSetDecisivePoint:
             return .six
-        case .twoSetsOfFourGames, .twoSetsOfFourGamesDecisivePoint, .singleSetOfFourGames, .singleSetOfFourGamesDecisivePoint:
+        case .twoSetsOfFourGames, .twoSetsOfFourGamesDecisivePoint:
             return .four
+        case .singleSetOfFourGames, .singleSetOfFourGamesDecisivePoint:
+            return .three
         case .nineGames, .nineGamesDecisivePoint:
             return .nine
         case .superTie, .twoSetsOfSuperTie:
@@ -1850,6 +1869,16 @@ public enum RoundRule {
         }
     }
     
+    public static func cumulatedNumberOfMatches(forTeams teams: Int) -> Int {
+        var i = teams / 2
+        var loserTeams = teams / 2
+        while loserTeams > 1 {
+            i += Self.cumulatedNumberOfMatches(forTeams: loserTeams)
+            loserTeams = loserTeams / 2
+        }
+        return i
+    }
+    
     public static func teamsInFirstRound(forTeams teams: Int) -> Int {
         Int(pow(2.0, ceil(log2(Double(teams)))))
     }
@@ -1880,12 +1909,16 @@ public enum RoundRule {
     }
     
     public static func numberOfMatches(forRoundIndex roundIndex: Int) -> Int {
-        Int(pow(2.0, Double(roundIndex)))
+        (1 << roundIndex)
+    }
+    
+    public static func baseIndex(forRoundIndex roundIndex: Int) -> Int {
+        numberOfMatches(forRoundIndex: roundIndex) - 1
     }
     
     static func matchIndexWithinRound(fromMatchIndex matchIndex: Int) -> Int {
         let roundIndex = roundIndex(fromMatchIndex: matchIndex)
-        let matchIndexWithinRound = matchIndex - (Int(pow(2.0, Double(roundIndex))) - 1)
+        let matchIndexWithinRound = matchIndex - baseIndex(forRoundIndex: roundIndex)
         return matchIndexWithinRound
     }
     
@@ -1909,7 +1942,7 @@ public enum RoundRule {
             }
             return "Quart de finale"
         default:
-            return "\(Int(pow(2.0, Double(roundIndex))))ème"
+            return "\((1 << roundIndex))ème"
         }
     }
 }

PadelClubDataTests/Config.swift

@@ -0,0 +1,34 @@
+//
+//  Config.swift
+//  PadelClubData
+//
+//  Created by Laurent Morvillier on 21/05/2025.
+//
+
+@testable import PadelClubData
+
+class Config {
+    
+    var secure: Bool
+    var domain: String
+    
+    init(secure: Bool, domain: String) {
+        self.secure = secure
+        self.domain = domain
+    }
+    
+    static var server: Config {
+        
+        let bundle = Bundle(for: self)
+        
+        let secure = PListReader.readBool(plist: "config", key: "secure_server", bundle: bundle)
+        let domain = PListReader.readString(plist: "config", key: "server_domain", bundle: bundle)
+        
+        if let secure, let domain {
+            return Config(secure: secure, domain: domain)
+        }
+        
+        fatalError("no server configuration")
+    }
+    
+}

PadelClubDataTests/DeletionTests.swift

@@ -18,11 +18,14 @@ struct DeletionTests {
     
     init() async throws {
         
+        let conf = Config.server
+        
         FileManager.default.deleteDirectoryInDocuments(directoryName: "storage")
         FileManager.default.deleteDirectoryInDocuments(directoryName: "storage-2")
         
         self.secondStoreCenter = StoreCenter(directoryName: "storage-2")
-        self.secondStoreCenter.configureURLs(secureScheme: false, domain: "127.0.0.1:8000", webSockets: false, useSynchronization: true)
+        
+        self.secondStoreCenter.configureURLs(secureScheme: conf.secure, domain: conf.domain, webSockets: false, useSynchronization: true)
         self.secondStoreCenter.tokenKeychain = MockKeychainStore(fileName: "storage-2/token.json")
         self.secondStoreCenter.deviceKeychain = MockKeychainStore(fileName: "storage-2/device.json")
         try self.secondStoreCenter.deviceKeychain.add(value: UUID().uuidString)
@@ -34,7 +37,7 @@ struct DeletionTests {
             try await self.login(storeCenter: self.secondStoreCenter, username: self.username1, password: self.password1)
         }
         
-        StoreCenter.main.configureURLs(secureScheme: false, domain: "127.0.0.1:8000", webSockets: false, useSynchronization: true)
+        StoreCenter.main.configureURLs(secureScheme: conf.secure, domain: conf.domain, webSockets: false, useSynchronization: true)
         StoreCenter.main.tokenKeychain = MockKeychainStore(fileName: "storage/token.json")
         StoreCenter.main.deviceKeychain = MockKeychainStore(fileName: "storage/device.json")
         try StoreCenter.main.deviceKeychain.add(value: UUID().uuidString)
@@ -247,12 +250,20 @@ struct DeletionTests {
         #expect(clubColB.count == 1)
         #expect(eventColB.count == 0)
         #expect(tournamentColB.count == 0)
-        #expect(groupStageColB.count == 0)
+        
-        #expect(roundColB.count == 0)
+        do {
-        #expect(matchColB.count == 0)
+            let _ = try self.secondStoreCenter.store(identifier: tournament.id)
-        #expect(teamRegistrationColB.count == 0)
+            Issue.record("should go in the catch because the store has been destroyed")
-        #expect(teamScoreColB.count == 0)
+        } catch {
-        #expect(playerRegistrationColB.count == 0)
+            #expect(1 == 1)
+        }
+        
+//        #expect(groupStageColB.count == 0)
+//        #expect(roundColB.count == 0)
+//        #expect(matchColB.count == 0)
+//        #expect(teamRegistrationColB.count == 0)
+//        #expect(teamScoreColB.count == 0)
+//        #expect(playerRegistrationColB.count == 0)
         
     }
 }
@@ -279,10 +290,10 @@ actor BoolChecker {
                 return
             }
             
-            print("sleep...")
+//            print("sleep...")
             
             // Wait for 100ms before next check
-            try? await Task.sleep(for: .milliseconds(100))
+            try? await Task.sleep(for: .milliseconds(1000))
         }
         
         // Throw error if timeout is reached

PadelClubDataTests/PadelClubDataTests.swift

@@ -0,0 +1,101 @@
+//
+//  PadelClubDataTests.swift
+//  PadelClubDataTests
+//
+//  Created by Laurent Morvillier on 15/04/2025.
+//
+
+import Testing
+@testable import PadelClubData
+@testable import LeStorage
+
+enum TestError: Error {
+    case notAuthenticated
+    case sameDeviceId
+    case missingEvent
+    case missingTournament
+}
+
+struct PadelClubDataTests {
+    
+    let username: String = "UserDataTests"
+    let password: String = "MyPass1234--"
+    
+    init() async throws {
+        
+        let conf = Config.server
+
+        StoreCenter.main.configureURLs(secureScheme: conf.secure, domain: conf.domain)
+        StoreCenter.main.tokenKeychain = MockKeychainStore(fileName: "token.json")
+        try await self.login()
+    }
+    
+    mutating func login() async throws {
+        let _: CustomUser = try await StoreCenter.main.service().login(username: self.username, password: self.password)
+    }
+    
+    @Test func testAuthentication() {
+        #expect(StoreCenter.main.isAuthenticated)
+    }
+    
+    @Test func createTournament() async throws {
+        
+        guard let userId = StoreCenter.main.userId else {
+            throw TestError.notAuthenticated
+        }
+        
+        // Cleanup
+        let eventCol: SyncedCollection<Event> = await  StoreCenter.main.mainStore.asyncLoadingSynchronizedCollection()
+//        let events: [Event] = try await StoreCenter.main.service().get()
+        try await eventCol.deleteAsync(contentOfs: Array(eventCol))
+        #expect(eventCol.count == 0)
+        
+        let tournamentCol: SyncedCollection<Tournament> = await  StoreCenter.main.mainStore.asyncLoadingSynchronizedCollection()
+//        let tournaments: [Tournament] = try await StoreCenter.main.service().get()
+        try await tournamentCol.deleteAsync(contentOfs: Array(tournamentCol))
+        #expect(tournamentCol.count == 0)
+
+        // Create
+        let event: Event = Event(creator: userId, club: nil, name: "test_createTournament")
+        try await eventCol.addOrUpdateAsync(instance: event)
+        
+        let tournament: Tournament = Tournament.fake()
+        tournament.event = event.id
+        try await tournamentCol.addOrUpdateAsync(instance: tournament)
+
+        // Test server content
+        try await eventCol.loadOnceAsync()
+        #expect(eventCol.count == 1)
+        
+        try await tournamentCol.loadOnceAsync()
+        #expect(tournamentCol.count == 1)
+
+    }
+    
+    @Test func dualStoreCenter() async throws {
+        
+        let conf = Config.server
+
+        let secondStoreServer = StoreCenter()
+        secondStoreServer.configureURLs(secureScheme: conf.secure, domain: conf.domain)
+        secondStoreServer.tokenKeychain = MockKeychainStore(fileName: "token.json")
+
+        let _: CustomUser = try await secondStoreServer.service().login(username: self.username, password: self.password)
+
+        #expect(StoreCenter.main.isAuthenticated)
+        #expect(secondStoreServer.isAuthenticated)
+        
+    }
+    
+    @Test func testWebsocketSynchronization() async throws {
+
+        let secondStoreServer = StoreCenter()
+        secondStoreServer.configureURLs(secureScheme: false, domain: "127.0.0.1:8000")
+        secondStoreServer.tokenKeychain = MockKeychainStore(fileName: "token.json")
+
+        let events = DataStore.shared.events
+        try await DataStore.shared.events.deleteAsync(contentOfs: Array(events))
+
+    }
+    
+}

PadelClubDataTests/SynchronizationTests.swift

@@ -23,11 +23,13 @@ struct SynchronizationTests {
     
     init() async throws {
         
+        let conf = Config.server
+
         FileManager.default.deleteDirectoryInDocuments(directoryName: "storage")
         FileManager.default.deleteDirectoryInDocuments(directoryName: "storage-2")
         
         self.secondStoreCenter = StoreCenter(directoryName: "storage-2")
-        self.secondStoreCenter.configureURLs(secureScheme: false, domain: "127.0.0.1:8000", webSockets: false, useSynchronization: true)
+        self.secondStoreCenter.configureURLs(secureScheme: conf.secure, domain: conf.domain, webSockets: false, useSynchronization: true)
         self.secondStoreCenter.tokenKeychain = MockKeychainStore(fileName: "storage-2/token.json")
         self.secondStoreCenter.deviceKeychain = MockKeychainStore(fileName: "storage-2/device.json")
         try self.secondStoreCenter.deviceKeychain.add(value: UUID().uuidString)
@@ -39,7 +41,7 @@ struct SynchronizationTests {
             try await self.login(storeCenter: self.secondStoreCenter)
         }
         
-        StoreCenter.main.configureURLs(secureScheme: false, domain: "127.0.0.1:8000", webSockets: false, useSynchronization: true)
+        StoreCenter.main.configureURLs(secureScheme: conf.secure, domain: conf.domain, webSockets: false, useSynchronization: true)
         StoreCenter.main.tokenKeychain = MockKeychainStore(fileName: "storage/token.json")
         StoreCenter.main.deviceKeychain = MockKeychainStore(fileName: "storage/device.json")
         try StoreCenter.main.deviceKeychain.add(value: UUID().uuidString)
@@ -73,13 +75,14 @@ struct SynchronizationTests {
         
         // Cleanup
         let eventCollection1: SyncedCollection<Event> = await StoreCenter.main.mainStore.asyncLoadingSynchronizedCollection()
+        try await eventCollection1.loadOnceAsync()
         #expect(eventCollection1.hasLoaded == true)
         
         try await eventCollection1.deleteAsync(contentOfs: Array(eventCollection1))
         
         let eventCollection2: SyncedCollection<Event> = await  self.secondStoreCenter.mainStore.asyncLoadingSynchronizedCollection()
         #expect(eventCollection2.hasLoaded == true)
-        eventCollection2.clear()
+        eventCollection2.reset()
 
         // cleanup sync residues
         let _ = try await self.secondStoreCenter.testSynchronizeOnceAsync()
@@ -120,13 +123,13 @@ struct SynchronizationTests {
         let eventCollectionA: SyncedCollection<Event> = await StoreCenter.main.mainStore.asyncLoadingSynchronizedCollection()
         try await eventCollectionA.deleteAsync(contentOfs: Array(eventCollectionA))
         let eventCollectionB: SyncedCollection<Event> = await  self.secondStoreCenter.mainStore.asyncLoadingSynchronizedCollection()
-        eventCollectionB.clear()
+        eventCollectionB.reset()
         
         // Setup clubs collections
         let clubCollectionA: SyncedCollection<Club> = await StoreCenter.main.mainStore.asyncLoadingSynchronizedCollection()
         try await clubCollectionA.deleteAsync(contentOfs: Array(clubCollectionA))
         let clubCollectionB: SyncedCollection<Club> = await  self.secondStoreCenter.mainStore.asyncLoadingSynchronizedCollection()
-        clubCollectionB.clear()
+        clubCollectionB.reset()
 
         // cleanup sync residues
         let _ = try await self.secondStoreCenter.testSynchronizeOnceAsync()
@@ -184,7 +187,7 @@ struct SynchronizationTests {
         let teamRegColA: SyncedCollection<TeamRegistration> = await StoreCenter.main.mainStore.asyncLoadingSynchronizedCollection()
         try await teamRegColA.deleteAsync(contentOfs: Array(teamRegColA))
         let teamRegColB: SyncedCollection<TeamRegistration> = await  self.secondStoreCenter.mainStore.asyncLoadingSynchronizedCollection()
-        teamRegColB.clear()
+        teamRegColB.reset()
         
         // cleanup sync residues
         let _ = try await self.secondStoreCenter.testSynchronizeOnceAsync()
@@ -212,7 +215,7 @@ struct SynchronizationTests {
         
         try await eventCollectionA.deleteAsync(contentOfs: Array(eventCollectionA))
         let eventCollectionB: SyncedCollection<Event> = await  self.secondStoreCenter.mainStore.asyncLoadingSynchronizedCollection()
-        eventCollectionB.clear()
+        eventCollectionB.reset()
         
         // cleanup sync residues
         let _ = try await self.secondStoreCenter.testSynchronizeOnceAsync()
@@ -308,5 +311,61 @@ struct SynchronizationTests {
         
     }
     
+    // needs to run on a postgreSQL, otherwise fails because of sqlite database locks
+    @Test func testBuildEverything() async throws {
+        
+        // Cleanup
+
+        let tournamentColA: SyncedCollection<Tournament> = await StoreCenter.main.mainStore.asyncLoadingSynchronizedCollection()
+        let tournamentColB: SyncedCollection<Tournament> = await self.secondStoreCenter.mainStore.asyncLoadingSynchronizedCollection()
+
+        let tournamentsToDelete: [Tournament] = try await StoreCenter.main.service().get()
+        tournamentColA.delete(contentOfs: tournamentsToDelete)
+        
+        // Setup tournament + build everything
+        let tournament = Tournament()
+
+        try await tournamentColA.addOrUpdateAsync(instance: tournament)
+        try await tournament.deleteAndBuildEverythingAsync()
+        let tourStore = try StoreCenter.main.store(identifier: tournament.id)
+        
+        let gsColA: SyncedCollection<GroupStage> = try tourStore.syncedCollection()
+        let roundColA: SyncedCollection<Round> = try tourStore.syncedCollection()
+        let matchesColA: SyncedCollection<Match> = try tourStore.syncedCollection()
+        #expect(gsColA.count == 4)
+        #expect(roundColA.count == 15)
+        #expect(matchesColA.count == 56)
+        
+        // Sync with 2nd store
+        try await secondStoreCenter.testSynchronizeOnceAsync()
+        #expect(tournamentColB.count == 1)
+        
+        let tourStoreB = try secondStoreCenter.store(identifier: tournament.id)
+
+        let gsColB: SyncedCollection<GroupStage> = try tourStoreB.syncedCollection()
+        let roundColB: SyncedCollection<Round> = try tourStoreB.syncedCollection()
+        let matchesColB: SyncedCollection<Match> = try tourStoreB.syncedCollection()
+        #expect(gsColB.count == 4)
+        #expect(roundColB.count == 15)
+        #expect(matchesColB.count == 56)
+
+        // change setup + build everything
+        tournament.groupStageCount = 2
+        tournament.teamCount = 20
+        try await tournamentColA.addOrUpdateAsync(instance: tournament)
+        try await tournament.deleteAndBuildEverythingAsync()
+
+        #expect(gsColA.count == 2)
+        #expect(roundColA.count == 15)
+        #expect(matchesColA.count == 44)
+
+        // Sync with 2nd store
+        try await secondStoreCenter.testSynchronizeOnceAsync()
+        
+        #expect(gsColB.count == 2)
+        #expect(roundColB.count == 15)
+        #expect(matchesColB.count == 44)
+
+    }
     
 }