Address code review feedback: fix force unwrap, improve filtering and initialization

Co-authored-by: bgoncal <5808343+bgoncal@users.noreply.github.com>

Author: Copilot

Sources/App/Settings/AppleWatch/ComplicationFamilySelectViewController.swift

@@ -63,14 +63,14 @@ class ComplicationFamilySelectViewController: HAFormViewController, RowControlle
                     }
 
                     $0.presentationMode = .show(controllerProvider: .callback { [allowMultiple] in
-                        var complication = WatchComplicationGRDB()
-                        complication.Family = family
-
-                        if !allowMultiple {
-                            // if the user hasn't upgraded to watchOS 7 yet, we want to preserve our migration behavior
-                            // so any watchOS 6-created complications have a predicable globally-unique identifier
-                            complication.identifier = family.rawValue
-                        }
+                        let identifier = allowMultiple ? UUID().uuidString : family.rawValue
+                        // Initialize with proper family and template to avoid inconsistent state
+                        let template = family.templates.first ?? .ModularSmallSimpleText
+                        var complication = WatchComplicationGRDB(
+                            identifier: identifier,
+                            rawFamily: family.rawValue,
+                            rawTemplate: template.rawValue
+                        )
 
                         return ComplicationEditViewController(config: complication)
                     }, onDismiss: { [weak self] vc in

Sources/Shared/API/Models/WatchComplicationGRDB+Queries.swift

@@ -70,11 +70,14 @@ extension WatchComplicationGRDB {
 
         try Current.database().write { db in
             // Find complications with serverIdentifiers that don't match any current servers
-            // This includes complications with nil serverIdentifier or identifiers not in the current server list
-            let serverIdColumn = Column(DatabaseTables.WatchComplication.serverIdentifier.rawValue)
-            let orphanedComplications = try WatchComplicationGRDB
-                .filter(serverIdColumn == nil || !serverIdentifiers.contains(serverIdColumn))
-                .fetchAll(db)
+            // Fetch all complications and filter in Swift for clarity
+            let allComplications = try WatchComplicationGRDB.fetchAll(db)
+            let orphanedComplications = allComplications.filter { complication in
+                guard let serverId = complication.serverIdentifier else {
+                    return true // nil serverIdentifier is orphaned
+                }
+                return !serverIdentifiers.contains(serverId)
+            }
 
             if !orphanedComplications.isEmpty {
                 Current.Log.info("Migrating \(orphanedComplications.count) orphaned watch complications to \(replacementServer.identifier)")

Sources/Shared/API/Models/WatchComplicationGRDB.swift

@@ -38,7 +38,8 @@ public struct WatchComplicationGRDB: Codable, FetchableRecord, PersistableRecord
             if let t = ComplicationTemplate(rawValue: rawTemplate) {
                 return t
             }
-            return Family.templates.first!
+            // Fallback to first template for the family, or modularSmall template if family has no templates
+            return Family.templates.first ?? ComplicationGroupMember.modularSmall.templates.first ?? .ModularSmallSimpleText
         }
         set {
             rawTemplate = newValue.rawValue

Sources/Shared/Database/Tables/WatchComplicationTable.swift

@@ -38,10 +38,10 @@ final class WatchComplicationTable: DatabaseTableProtocol {
         Current.Log.info("Migrating \(realmComplications.count) watch complications from Realm to GRDB")
 
         try database.write { db in
-            for realmComplication in realmComplications {
-                let grdbComplication = WatchComplicationGRDB(from: realmComplication)
-                try grdbComplication.insert(db)
-            }
+            // Convert Realm complications to GRDB complications
+            let grdbComplications = realmComplications.map { WatchComplicationGRDB(from: $0) }
+            // Batch insert for better performance
+            try grdbComplications.forEach { try $0.insert(db) }
         }
 
         Current.Log.info("Successfully migrated \(realmComplications.count) watch complications to GRDB")