LeStorage fixes

PadelClub/Data/DataStore.swift

@@ -33,13 +33,13 @@ class DataStore: ObservableObject {
         }
     }
     
-    fileprivate(set) var tournaments: StoredCollection<Tournament>
+    fileprivate(set) var tournaments: SyncedCollection<Tournament>
-    fileprivate(set) var clubs: StoredCollection<Club>
+    fileprivate(set) var clubs: SyncedCollection<Club>
-    fileprivate(set) var courts: StoredCollection<Court>
+    fileprivate(set) var courts: SyncedCollection<Court>
-    fileprivate(set) var events: StoredCollection<Event>
+    fileprivate(set) var events: SyncedCollection<Event>
     fileprivate(set) var monthData: StoredCollection<MonthData>
-    fileprivate(set) var dateIntervals: StoredCollection<DateInterval>
+    fileprivate(set) var dateIntervals: SyncedCollection<DateInterval>
-    fileprivate(set) var purchases: StoredCollection<Purchase>
+    fileprivate(set) var purchases: SyncedCollection<Purchase>
 
     fileprivate var userStorage: StoredSingleton<CustomUser>
     
@@ -127,9 +127,9 @@ class DataStore: ObservableObject {
 
         if let userSingleton: StoredSingleton<CustomUser> = notification.object as? StoredSingleton<CustomUser> {
             self.user = userSingleton.item() ?? self._temporaryLocalUser.item ?? CustomUser.placeHolder()
-        } else if let clubsCollection: StoredCollection<Club> = notification.object as? StoredCollection<Club> {
+        } else if let clubsCollection: SyncedCollection<Club> = notification.object as? SyncedCollection<Club> {
             self._fixMissingClubCreatorIfNecessary(clubsCollection)
-        } else if let eventsCollection: StoredCollection<Event> = notification.object as? StoredCollection<Event> {
+        } else if let eventsCollection: SyncedCollection<Event> = notification.object as? SyncedCollection<Event> {
             self._fixMissingEventCreatorIfNecessary(eventsCollection)
         }
         
@@ -139,7 +139,7 @@ class DataStore: ObservableObject {
         
     }
     
-    fileprivate func _fixMissingClubCreatorIfNecessary(_ clubsCollection: StoredCollection<Club>) {
+    fileprivate func _fixMissingClubCreatorIfNecessary(_ clubsCollection: SyncedCollection<Club>) {
         for club in clubsCollection {
             if let userId = StoreCenter.main.userId, club.creator == nil {
                 club.creator = userId
@@ -150,7 +150,7 @@ class DataStore: ObservableObject {
         }
     }
     
-    fileprivate func _fixMissingEventCreatorIfNecessary(_ eventsCollection: StoredCollection<Event>) {
+    fileprivate func _fixMissingEventCreatorIfNecessary(_ eventsCollection: SyncedCollection<Event>) {
         for event in eventsCollection {
             if let userId = StoreCenter.main.userId, event.creator == nil {
                 event.creator = userId

PadelClub/Data/TournamentStore.swift

@@ -13,15 +13,15 @@ class TournamentStore: ObservableObject {
     
     var store: Store
     
-    fileprivate(set) var groupStages: StoredCollection<GroupStage> = StoredCollection.placeholder()
+    fileprivate(set) var groupStages: SyncedCollection<GroupStage> = SyncedCollection.placeholder()
-    fileprivate(set) var matches: StoredCollection<Match> = StoredCollection.placeholder()
+    fileprivate(set) var matches: SyncedCollection<Match> = SyncedCollection.placeholder()
-    fileprivate(set) var teamRegistrations: StoredCollection<TeamRegistration> = StoredCollection.placeholder()
+    fileprivate(set) var teamRegistrations: SyncedCollection<TeamRegistration> = SyncedCollection.placeholder()
-    fileprivate(set) var playerRegistrations: StoredCollection<PlayerRegistration> = StoredCollection.placeholder()
+    fileprivate(set) var playerRegistrations: SyncedCollection<PlayerRegistration> = SyncedCollection.placeholder()
-    fileprivate(set) var rounds: StoredCollection<Round> = StoredCollection.placeholder()
+    fileprivate(set) var rounds: SyncedCollection<Round> = SyncedCollection.placeholder()
-    fileprivate(set) var teamScores: StoredCollection<TeamScore> = StoredCollection.placeholder()
+    fileprivate(set) var teamScores: SyncedCollection<TeamScore> = SyncedCollection.placeholder()
 
     fileprivate(set) var matchSchedulers: StoredCollection<MatchScheduler> = StoredCollection.placeholder()
-    fileprivate(set) var drawLogs: StoredCollection<DrawLog> = StoredCollection.placeholder()
+    fileprivate(set) var drawLogs: SyncedCollection<DrawLog> = SyncedCollection.placeholder()
 
 //    convenience init(tournament: Tournament) {
 //        let store = StoreCenter.main.store(identifier: tournament.id)
@@ -44,6 +44,7 @@ class TournamentStore: ObservableObject {
             synchronized = sync
         }
         #endif
+        StoreCenter.main.collectionsCanSynchronize = synchronized
 
         self.groupStages = self.store.registerSynchronizedCollection(indexed: indexed)
         self.rounds = self.store.registerSynchronizedCollection(indexed: indexed)
@@ -52,7 +53,7 @@ class TournamentStore: ObservableObject {
         self.matches = self.store.registerSynchronizedCollection(indexed: indexed)
         self.teamScores = self.store.registerSynchronizedCollection(indexed: indexed)
         self.matchSchedulers = self.store.registerCollection(indexed: indexed)
-        self.drawLogs = self.store.registerCollection(indexed: indexed)
+        self.drawLogs = self.store.registerSynchronizedCollection(indexed: indexed)
 
         self.store.loadCollectionsFromServerIfNoFile()
         

PadelClub/Utils/Patcher.swift

@@ -54,6 +54,7 @@ enum Patch: String, CaseIterable {
     case cleanLogs
     case syncUpgrade
     case updateTournaments
+    case cleanPurchaseApiCalls
     
     var id: String {
         return "padelclub.app.patch.\(self.rawValue)"
@@ -85,6 +86,7 @@ class AutomaticPatcher {
         case .cleanLogs: self._cleanLogs()
         case .syncUpgrade: self._syncUpgrade()
         case .updateTournaments: self._updateTournaments()
+        case .cleanPurchaseApiCalls: self._cleanPurchaseApiCalls()
         }
     }
     
@@ -133,4 +135,9 @@ class AutomaticPatcher {
     fileprivate static func _updateTournaments() {
         DataStore.shared.tournaments.addOrUpdate(contentOfs: DataStore.shared.tournaments)
     }
+    
+    fileprivate static func _cleanPurchaseApiCalls() {
+        StoreCenter.main.resetApiCalls(type: Purchase.self)
+    }
+    
 }

PadelClub/Views/Navigation/Agenda/EventListView.swift

@@ -314,7 +314,7 @@ struct EventListView: View {
             TournamentCellView(tournament: tournament)
                 .onReceive(NotificationCenter.default.publisher(for: NSNotification.Name.CollectionDidLoad), perform: { notification in
 
-                    if let store = notification.object as? StoredCollection<TeamRegistration> {
+                    if let store = notification.object as? SyncedCollection<TeamRegistration> {
                         if store.storeId == tournament.id {
                             tournament.lastTeamRefresh = Date()
                         }

PadelClub/Views/Tournament/Subscription/Guard.swift

@@ -187,18 +187,18 @@ import LeStorage
     }
     
     var currentPlan: StoreItem? {
-        #if DEBUG
+//        #if DEBUG
-        return .monthlyUnlimited
+//        return .monthlyUnlimited
-        #elseif TESTFLIGHT
+//        #elseif TESTFLIGHT
-            return .monthlyUnlimited
+//            return .monthlyUnlimited
-        #elseif PRODTEST
+//        #elseif PRODTEST
-            return .monthlyUnlimited
+//            return .monthlyUnlimited
-        #else
+//        #else
         if let currentBestPurchase = self.currentBestPurchase, let plan = StoreItem(rawValue: currentBestPurchase.productId) {
             return plan
         }
         return nil
-        #endif
+//        #endif
     }
     
     func userFilteredPurchases() -> [StoreKit.Transaction] {
@@ -316,8 +316,8 @@ fileprivate extension StoreKit.Transaction {
             throw StoreError.missingUserId
         }
         
-        return Purchase(user: userId,
+        return Purchase(transactionId: self.originalID,
-                        transactionId: self.originalID,
+                        user: userId,
                         purchaseDate: self.purchaseDate,
                         productId: self.productID,
                         quantity: self.purchasedQuantity,

PadelClub/Views/Tournament/Subscription/Purchase.swift

@@ -24,7 +24,7 @@ class Purchase: BasePurchase {
 //    var revocationDate: Date? = nil
 //    var expirationDate: Date? = nil
     
-    init(user: String, transactionId: UInt64, purchaseDate: Date, productId: String, quantity: Int? = nil, revocationDate: Date? = nil, expirationDate: Date? = nil) {
+    init(transactionId: UInt64, user: String, purchaseDate: Date, productId: String, quantity: Int? = nil, revocationDate: Date? = nil, expirationDate: Date? = nil) {
         super.init(id: transactionId, user: user, purchaseDate: purchaseDate, productId: productId, quantity: quantity, revocationDate: revocationDate, expirationDate: expirationDate)
         
 //        self.id = transactionId