Repair clubs and event without a creator

PadelClub/Data/DataStore.swift

@@ -11,7 +11,6 @@ import SwiftUI
 
 class DataStore: ObservableObject {
     
-//    fileprivate var _store: Store
     static let shared = DataStore()
     
     @Published var user: User = User.placeHolder() {
@@ -96,7 +95,6 @@ class DataStore: ObservableObject {
     }
     
     func saveUser() {
-
         do {
             if user.username.count > 0 {
                 try self.userStorage.update()
@@ -106,8 +104,6 @@ class DataStore: ObservableObject {
         } catch {
             Logger.error(error)
         }
-        
-        
     }
     
     @objc func collectionDidLoad(notification: Notification) {
@@ -116,11 +112,36 @@ class DataStore: ObservableObject {
             Logger.log("StoredObject<User> loaded with user = \(String(describing: userSingleton.item()))")
             
             self.user = userSingleton.item() ?? User.placeHolder()
-//            if let user = object.item() {
+        } else if let clubsCollection: StoredCollection<Club> = notification.object as? StoredCollection<Club> {
-//                self.user = user
+            self._fixMissingClubCreatorIfNecessary(clubsCollection)
-//            } else {
+        } else if let eventsCollection: StoredCollection<Event> = notification.object as? StoredCollection<Event> {
-//                self.
+            self._fixMissingEventCreatorIfNecessary(eventsCollection)
-//            }
+        }
+    }
+    
+    fileprivate func _fixMissingClubCreatorIfNecessary(_ clubsCollection: StoredCollection<Club>) {
+        for club in clubsCollection {
+            if club.creator == nil && self.user.username.count > 0 {
+                club.creator = self.user.id
+                do {
+                    try clubsCollection.addOrUpdate(instance: club)
+                } catch {
+                    Logger.error(error)
+                }
+            }
+        }
+    }
+    
+    fileprivate func _fixMissingEventCreatorIfNecessary(_ eventsCollection: StoredCollection<Event>) {
+        for event in eventsCollection {
+            if event.creator == nil && self.user.username.count > 0 {
+                event.creator = self.user.id
+                do {
+                    try eventsCollection.addOrUpdate(instance: event)
+                } catch {
+                    Logger.error(error)
+                }
+            }
         }
     }
     
@@ -154,11 +175,7 @@ class DataStore: ObservableObject {
         self.userStorage.reset()
         
         Guard.main.disconnect()
-        
+               
-    }
-    
-    fileprivate func _loadCollections() {
-        Store.main.loadCollectionFromServer()
     }
     
 }

PadelClub/Views/User/UserCreationView.swift

@@ -124,10 +124,12 @@ struct UserCreationFormView: View {
                 
                 let service = try Store.main.service()
                 let user: User = try await service.createAccount(user: userCreationForm)
-                DataStore.shared.user = user
                 
-                self.isLoading = false
+                DispatchQueue.main.async {
-                self.showLoginScreen = true
+                    DataStore.shared.user = user
+                    self.isLoading = false
+                    self.showLoginScreen = true
+                }
                 
             } catch {
                 self.isLoading = false