Phase 2: SwiftData versioning and persistence facade

Author: g-cqd

.gitignore

@@ -93,3 +93,4 @@ fastlane/test_output
 iOSInjectionProject/
 AGENTS/
 AGENTS.md
+.plan/*.log

.plan/IMPLEMENTATION_PLAN.md

@@ -35,11 +35,18 @@
 - [x] Ensure all SwiftData `ModelContext` operations run on its owning executor (main actor for `@Environment` context)
 - [x] Confirm build log has zero strict-concurrency warnings for these files
 
+### Phase 1.1 — Warning cleanup (compiler + SwiftLint baseline)
+- [x] Eliminate unused-result compiler warnings (use `@discardableResult` for fluent APIs)
+- [x] Fix `CalmSound.id` decoding warning (make `id` decodable/mutable)
+- [x] Fix SwiftLint accessibility warnings (labels/hidden images; tap gestures treated as buttons)
+- [x] Fix SwiftLint `line_length` warnings (wrap long strings and interpolations)
+- [x] Confirm build log has zero compiler warnings and zero SwiftLint violations (baseline)
+
 ### Phase 2 — Data model and persistence boundary hardening
-- [ ] Decide whether `saved`/`deleted` in [TrackItem.swift](file:///Users/gc/Developer/Aemi%20Studio.nosync/Pasitea/Pasitea/Model/TrackItem.swift#L12-L60) should be persisted or `@Transient`
-- [ ] Add SwiftData schema versioning and migration strategy (if any user data exists)
-- [ ] Introduce a persistence facade (main-actor or model-actor) and route saves through it
-- [ ] Stop calling `ModelContext.save()` directly from views (only via the facade)
+- [x] Decide whether `saved`/`deleted` in [TrackItem.swift](file:///Users/gc/Developer/Aemi%20Studio.nosync/Pasitea/Pasitea/Model/TrackItem.swift#L12-L60) should be persisted or `@Transient` (removed; no longer persisted)
+- [x] Add SwiftData schema versioning and migration strategy (if any user data exists)
+- [x] Introduce a persistence facade (main-actor or model-actor) and route saves through it
+- [x] Stop calling `ModelContext.save()` directly from views (only via the facade)
 
 ### Phase 3 — Safety cleanup (crash-proofing)
 - [ ] Replace force unwrap of `TrackType(rawValue:)` in [TrackItem.swift](file:///Users/gc/Developer/Aemi%20Studio.nosync/Pasitea/Pasitea/Model/TrackItem.swift#L62-L82)

Pasitea/Model/CalmSound.swift

@@ -8,7 +8,7 @@
 import Foundation
 
 struct CalmSound: Codable, Hashable, Identifiable {
-    let id: UUID = UUID()
+    var id: UUID = UUID()
     var title: String
     var filename: String
 }

Pasitea/Model/TrackItem.swift

@@ -9,56 +9,54 @@ import Foundation
 import SwiftData
 import SwiftUI
 
-@Model
-public final class TrackItem: Identifiable {
-    @Attribute(.unique) public var id: UUID
-    public var type: TrackType.RawValue = TrackType.none.rawValue
-    public var desc: String = ""
-    public var tags: [String] = []
-    public var startDate: Date = Date.now
-    public var endDate: Date = Date.now
-    public var previousId: UUID?
-    private var saved: Bool = false
-    private var deleted: Bool = false
-
-    enum TrackItemCodingKeys: CodingKey {
-        case id
-        case type
-        case desc
-        case tags
-        case startDate
-        case endDate
-        case previousId
-    }
+public enum PasiteaSchemaV1: VersionedSchema {
+    public static var versionIdentifier: Schema.Version { Schema.Version(1, 0, 0) }
 
-    init(
-        type: TrackType = TrackType.none,
-        desc: String = "",
-        tags: [String] = [],
-        startDate: Date = Date.now,
-        endDate: Date = Date.now,
-        previousId: UUID? = nil
-    ) {
-        self.id = UUID()
-        self.type = type.rawValue
-        self.desc = desc
-        self.tags = tags
-        self.startDate = startDate
-        self.endDate = endDate
-        self.previousId = previousId ?? nil
+    public static var models: [any PersistentModel.Type] {
+        [TrackItem.self]
     }
 
-    init(_ item: TrackItem) {
-        self.id = UUID()
-        self.type = item.type
-        self.desc = item.desc
-        self.tags = item.tags
-        self.startDate = item.startDate
-        self.endDate = item.endDate
-        self.previousId = item.previousId
+    @Model
+    public final class TrackItem: Identifiable {
+        @Attribute(.unique) public var id: UUID
+        public var type: TrackType.RawValue = TrackType.none.rawValue
+        public var desc: String = ""
+        public var tags: [String] = []
+        public var startDate: Date = Date.now
+        public var endDate: Date = Date.now
+        public var previousId: UUID?
+
+        init(
+            type: TrackType = TrackType.none,
+            desc: String = "",
+            tags: [String] = [],
+            startDate: Date = Date.now,
+            endDate: Date = Date.now,
+            previousId: UUID? = nil
+        ) {
+            self.id = UUID()
+            self.type = type.rawValue
+            self.desc = desc
+            self.tags = tags
+            self.startDate = startDate
+            self.endDate = endDate
+            self.previousId = previousId ?? nil
+        }
+
+        init(_ item: TrackItem) {
+            self.id = UUID()
+            self.type = item.type
+            self.desc = item.desc
+            self.tags = item.tags
+            self.startDate = item.startDate
+            self.endDate = item.endDate
+            self.previousId = item.previousId
+        }
     }
 }
 
+public typealias TrackItem = PasiteaSchemaV1.TrackItem
+
 extension TrackItem {
     @Transient
     public var typeAsTrackType: TrackType {
@@ -82,67 +80,87 @@ extension TrackItem {
 }
 
 extension TrackItem {
+    @discardableResult
     public func addTags(_ tags: String...) -> TrackItem {
         for tag in tags {
             self.tags.append(tag)
         }
         return self
     }
 
-    public func saveInto(_ modelContext: ModelContext, _ endDate: Date? = nil) {
-        if !saved {
-            self.saved = true
-            self.endDate = endDate ?? self.endDate
-            modelContext.insert(self)
-            do {
-                try modelContext.save()
-            } catch {
-                #if DEBUG
-                print(error.localizedDescription)
-                #endif
-            }
-        }
-    }
-
-    public func deleteFrom(_ modelContext: ModelContext) {
-        if !deleted {
-            modelContext.delete(self)
-            self.deleted = true
-            do {
-                try modelContext.save()
-            } catch {
-                #if DEBUG
-                print(error.localizedDescription)
-                #endif
-            }
-        }
-    }
-
+    @discardableResult
     public func to(_ type: TrackType) -> TrackItem {
         self.type = type.rawValue
         print(self.type)
         return self
     }
 
+    @discardableResult
     public func startsAt(_ date: Date) -> TrackItem {
         self.startDate = date
         return self
     }
 
+    @discardableResult
     public func endsAt(_ date: Date) -> TrackItem {
         self.endDate = date
         return self
     }
 
+    @discardableResult
     public func startsNow() -> TrackItem {
         let date = Date.now
         self.startDate = date
         self.endDate = date
         return self
     }
 
+    @discardableResult
     public func endsNow() -> TrackItem {
         self.endDate = Date.now
         return self
     }
 }
+
+@MainActor
+struct PersistenceFacade {
+    let modelContext: ModelContext
+
+    func save(_ item: TrackItem, endDate: Date? = nil) {
+        if let endDate {
+            item.endDate = endDate
+        }
+        modelContext.insert(item)
+        do {
+            try modelContext.save()
+        } catch {
+            #if DEBUG
+            print(error.localizedDescription)
+            #endif
+        }
+    }
+
+    func delete(_ item: TrackItem) {
+        modelContext.delete(item)
+        do {
+            try modelContext.save()
+        } catch {
+            #if DEBUG
+            print(error.localizedDescription)
+            #endif
+        }
+    }
+
+    func delete(_ items: [TrackItem]) {
+        for item in items {
+            modelContext.delete(item)
+        }
+        do {
+            try modelContext.save()
+        } catch {
+            #if DEBUG
+            print(error.localizedDescription)
+            #endif
+        }
+    }
+}

Pasitea/Model/TrackItemWrapper.swift

@@ -6,24 +6,26 @@
 //
 
 import Foundation
-import SwiftData
 
-class TrackItemWrapper {
+@MainActor
+final class TrackItemWrapper {
     private var item: TrackItem
 
     init(_ item: TrackItem) {
         self.item = item
     }
 
-    public func reset(_ modelContext: ModelContext, tags: String...) -> TrackItemWrapper {
+    @discardableResult
+    public func reset(_ persistence: PersistenceFacade, tags: String...) -> TrackItemWrapper {
         for tag in tags {
             self.item.addTags(tag)
         }
-        self.item.endsNow().saveInto(modelContext)
+        persistence.save(self.item.endsNow())
         self.item = TrackItem(type: self.item.typeAsTrackType, previousId: self.item.previousId ?? self.item.id)
         return self
     }
 
+    @discardableResult
     public func startsNow(_ tags: String...) -> TrackItemWrapper {
         self.item.startsNow()
         for tag in tags {
@@ -32,15 +34,16 @@ class TrackItemWrapper {
         return self
     }
 
+    @discardableResult
     public func endsNow(_ tags: String...) -> TrackItemWrapper {
-        self.item.startsNow()
+        self.item.endsNow()
         for tag in tags {
             self.item.addTags(tag)
         }
         return self
     }
 
-    public func saveInto(_ modelContext: ModelContext) {
-        self.item.saveInto(modelContext)
+    public func save(_ persistence: PersistenceFacade) {
+        persistence.save(self.item)
     }
 }

Pasitea/PasiteaApp.swift

@@ -8,6 +8,16 @@
 import SwiftData
 import SwiftUI
 
+enum PasiteaMigrationPlan: SchemaMigrationPlan {
+    static var schemas: [any VersionedSchema.Type] {
+        [PasiteaSchemaV1.self]
+    }
+
+    static var stages: [MigrationStage] {
+        []
+    }
+}
+
 @main
 struct PasiteaApp: App {
     @State private var modelData = ModelData()
@@ -16,7 +26,7 @@ struct PasiteaApp: App {
 
     init() {
         do {
-            container = try ModelContainer(for: TrackItem.self)
+            container = try ModelContainer(for: TrackItem.self, migrationPlan: PasiteaMigrationPlan.self)
         } catch {
             #if DEBUG
             print(error.localizedDescription)

Pasitea/View/Calm/Calm - 5 Steps/CalmStepsView.swift

@@ -67,7 +67,8 @@ struct CalmStepsView: View {
                         Group {
                             Text(
                                 """
-                                The 5-4-3-2-1 method is a scientifically proven quick anxiety and stress reduction technique.
+                                The 5-4-3-2-1 method is a scientifically proven quick anxiety and stress reduction \
+                                technique.
 
                                 To calm down:
 

Pasitea/View/Calm/Calm - Breathe/BreatheFlowerAnimation.swift

@@ -6,10 +6,12 @@
 //
 
 import Combine
+import SwiftData
 import SwiftUI
 
 struct BreatheFlowerAnimation: View {
-    @Environment(\.modelContext) var modelContext
+    @Environment(\.modelContext) var modelContext: ModelContext
+    private var persistence: PersistenceFacade { PersistenceFacade(modelContext: modelContext) }
 
     @State private var isRunning = false
     @State private var isDone = false
@@ -63,21 +65,26 @@ struct BreatheFlowerAnimation: View {
                     // Middle Left Petal - Second
                     Image("flower")
                         .rotationEffect(.degrees(isFlowerOpen ? -25 : -5), anchor: .bottom)
+                        .accessibilityHidden(true)
 
                     // Middle Right Petal - Fourth
                     Image("flower")
                         .rotationEffect(.degrees(isFlowerOpen ? 25 : 5), anchor: .bottom)
+                        .accessibilityHidden(true)
 
                     // Middle Petal - Third
                     Image("flower")
+                        .accessibilityHidden(true)
 
                     // Left Petal - First
                     Image("flower")
                         .rotationEffect(.degrees(isFlowerOpen ? -50 : -10), anchor: .bottom)
+                        .accessibilityHidden(true)
 
                     // Right Petal - Fifth
                     Image("flower")
                         .rotationEffect(.degrees(isFlowerOpen ? 50 : 10), anchor: .bottom)
+                        .accessibilityHidden(true)
                 }
                 .shadow(radius: isFlowerOpen ? 20 : 0)
                 .hueRotation(Angle(degrees: isFlowerOpen ? -170 : 0))
@@ -124,7 +131,7 @@ struct BreatheFlowerAnimation: View {
                 if isRunning {
                     trackItem.startsNow()
                 } else {
-                    trackItem.reset(modelContext, tags: breatheCount.description)
+                    trackItem.reset(persistence, tags: breatheCount.description)
                 }
 
                 withAnimation(flowerAnimation) {
@@ -172,7 +179,7 @@ struct BreatheFlowerAnimation: View {
         }
         .onDisappear {
             if isRunning {
-                trackItem.endsNow().saveInto(modelContext)
+                trackItem.endsNow().save(persistence)
             }
         }
     }