rework notification scheduling and event completion

Package.swift

@@ -31,7 +31,7 @@ let package = Package(
         .package(url: "https://github.com/StanfordSpezi/Spezi", from: "1.8.0"),
         .package(url: "https://github.com/StanfordSpezi/SpeziViews", from: "1.7.0"),
         .package(url: "https://github.com/StanfordSpezi/SpeziStorage", from: "2.1.0"),
-        .package(url: "https://github.com/StanfordSpezi/SpeziNotifications.git", from: "1.0.2"),
+        .package(url: "https://github.com/StanfordSpezi/SpeziNotifications.git", from: "1.0.5"),
         .package(url: "https://github.com/apple/swift-algorithms.git", from: "1.2.0"),
         .package(url: "https://github.com/swiftlang/swift-syntax", from: "600.0.0-prerelease-2024-08-14"),
         .package(url: "https://github.com/pointfreeco/swift-snapshot-testing.git", from: "1.17.2")

Sources/SpeziScheduler/EventQuery.swift

@@ -60,6 +60,9 @@ public struct EventQuery {
 
     /// Binding to the `EventQuery`.
     public struct Binding {
+        /// The range for which the query fetches events.
+        public let range: Range<Date>
+
         /// An error encountered during the most recent attempt to fetch events.
         ///
         /// This property contains the error from the most recent fetch. It is `nil` if the most recent fetch succeeded.
@@ -86,7 +89,7 @@ public struct EventQuery {
 
     private let configuration: Configuration
     private let storage = Storage()
-    private var binding = Binding()
+    private var binding: Binding
 
     /// The fetched events.
     ///
@@ -107,12 +110,13 @@ public struct EventQuery {
     /// Create a new event query.
     /// - Parameters:
     ///   - range: The date range to query events for.
-    ///   - predicate: An additional ``Task`` predicate.
+    ///   - predicate: Optional `Predicate` allowing you to filter which events should be included in the query, based on their ``Task``.
     public init(
         in range: Range<Date>,
         predicate: Predicate<Task> = #Predicate { _ in true }
     ) {
-        self.configuration = Configuration(range: range, taskPredicate: predicate)
+        configuration = Configuration(range: range, taskPredicate: predicate)
+        binding = Binding(range: range)
     }
 }
 
@@ -155,23 +159,19 @@ extension EventQuery: DynamicProperty {
             // We always keep track of the set of models we are interested in. Only if that changes we query the "real thing".
             // Creating `Event` instances also incurs some overhead and sorting.
             // Querying just the identifiers can be up to 10x faster.
-            let anchor = try measure(name: "Event Anchor Query") {
-                try scheduler.queryEventsAnchor(for: configuration.range, predicate: configuration.taskPredicate)
-            }
+            let anchor = try scheduler.queryEventsAnchor(for: configuration.range, predicate: configuration.taskPredicate)
 
             guard anchor != storage.fetchedIdentifiers else {
                 binding.fetchError = nil
                 return
             }
 
-            let events = try measure(name: "Event Query") {
-                // Fetch also has a `batchSize` property we could explore in the future. It returns the results as a `FetchResultsCollection`.
-                // It isn't documented how it works exactly, however, one could assume that it lazily loads (or just initializes) model objects
-                // when iterating through the sequence. However, it probably doesn't really provide any real benefit. Users are expected to be interested
-                // in all the results they query for (after all the provide a predicate). Further, we would need to adjust the underlying
-                // type of the property wrapper to return a collection of type `FetchResultsCollection`.
-                try scheduler.queryEvents(for: configuration.range, predicate: configuration.taskPredicate)
-            }
+            // Fetch also has a `batchSize` property we could explore in the future. It returns the results as a `FetchResultsCollection`.
+            // It isn't documented how it works exactly, however, one could assume that it lazily loads (or just initializes) model objects
+            // when iterating through the sequence. However, it probably doesn't really provide any real benefit. Users are expected to be interested
+            // in all the results they query for (after all the provide a predicate). Further, we would need to adjust the underlying
+            // type of the property wrapper to return a collection of type `FetchResultsCollection`.
+            let events = try scheduler.queryEvents(for: configuration.range, predicate: configuration.taskPredicate)
 
             storage.fetchedEvents = events
             storage.fetchedIdentifiers = anchor

Sources/SpeziScheduler/Notifications/Schedule+Notifications.swift

@@ -14,7 +14,7 @@ extension Schedule {
     enum NotificationMatchingHint: Codable, Sendable, Hashable {
         case components(hour: Int, minute: Int, second: Int, weekday: Int?)
         case allDayNotification(weekday: Int?)
-
+        
         func dateComponents(calendar: Calendar, allDayNotificationTime: NotificationTime) -> DateComponents {
             switch self {
             case let .components(hour, minute, second, weekday):
@@ -25,7 +25,8 @@ extension Schedule {
             }
         }
     }
-
+
+
     static func notificationTime(for start: Date, duration: Duration, allDayNotificationTime: NotificationTime) -> Date {
         if duration.isAllDay {
             let time = allDayNotificationTime
@@ -37,7 +38,8 @@ extension Schedule {
             return start
         }
     }
-
+
+
     static func notificationMatchingHint( // swiftlint:disable:this function_parameter_count
         forMatchingInterval interval: Int,
         calendar: Calendar,

Sources/SpeziScheduler/Notifications/SchedulerNotifications+Strings.swift

@@ -25,10 +25,10 @@ extension SchedulerNotifications {
     /// The reverse dns notation use as a prefix for all notifications scheduled by SpeziScheduler.
     static nonisolated let baseNotificationId = "edu.stanford.spezi.scheduler.notification"
 
-    /// /// The reverse dns notation use as a prefix for all task-level scheduled notifications (calendar trigger).
+    /// The reverse dns notation use as a prefix for all task-level scheduled notifications (calendar trigger).
     static nonisolated let baseTaskNotificationId = "\(baseNotificationId).task"
 
-    /// /// The reverse dns notation use as a prefix for all event-level scheduled notifications (interval trigger).
+    /// The reverse dns notation use as a prefix for all event-level scheduled notifications (interval trigger).
     static nonisolated let baseEventNotificationId = "\(baseNotificationId).event"
 
     /// Retrieve the category identifier for a notification for a task, derived from its task category.