Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

New Task model using SwiftData and Schedule creation using Calendar Recurrence Rule #44

Merged
merged 53 commits into from
Oct 29, 2024

Conversation

Supereg
Copy link
Member

@Supereg Supereg commented Aug 23, 2024

New Task model using SwiftData and Schedule creation using Calendar Recurrence Rule

♻️ Current situation & Problem

This PR completely rethinks the Scheduler package.
We introduce an updated Task model that is completely backed by SwiftData. Further, we provide a new Schedule model that provides greater flexibility for formulating recurring events. Instead of formulating events based on intervals using DateComponents, we use the new RecurrenceRule infrastructure introduced with iOS 18.

Using a Schedule, you can generate a potentially infinite list of Occurrences. A Task uses the occurrences of its Schedule to generate Events. When events are marked as completed, they are associated with an Outcome. Both a Task and an Outcome can be extended with arbitrary data. This is enabled using the @Property macro, that allows to define custom properties on tasks and outcomes using a SharedRepository-backed storage implementation.

Task are stored in an versioned, append-only store. Modifying the contents of a Task (e.g., instructions, schedules, ...), appends a new Task version and marks it as effective for the specified date. This allows to modify tasks without changing previous events or occurrences. Something that was impossible with the previous implementation.

Lastly, the updated Scheduler provides additional support for UI components out of the box. We provide the new @EventQuery property wrapper that you can use in your SwiftUI views. It allows to easily and efficiently query Events directly in SwiftUI.
Additionally, we provide several, reusable UI components out of the box to visualize events in your application.

Notifications are currently no longer supported with this version of SpeziScheduler: #45 (This is now tackled in #49 which will most likely be merged alongside this PR).

An example of how to configure tasks with this new model is depicted below:

import Spezi
import SpeziScheduler

class MySchedulerModule: Module {
    @Dependency(Scheduler.self)
    private var scheduler

    init() {}

    func configure() {
        do {
            try scheduler.createOrUpdateTask(
                id: "my-daily-task",
                title: "Daily Questionnaire",
                instructions: "Please fill out the Questionnaire every day.",
                category: Task.Category("Questionnaire", systemName: "list.clipboard.fill"),
                schedule: .daily(hour: 9, minute: 0, startingAt: .today)
            )
        } catch {
            // handle error (e.g., visualize in your UI)
        }
    }
}

⚙️ Release Notes

  • New version Scheduler Store using SwiftData.
  • New Task module using Events and Outcomes.
  • New Schedule model based on RecurrenceRule allowing for greater flexibility when specifying schedules.
  • Introduces new UI components to easily visualize events.
  • New @EventQuery property wrapper to easily query events in your SwiftUI view.

Breaking Changes

  • This version of SpeziScheduler is not compatible with the previous version. All previously persisted data will be permanently deleted when using this new version. Already scheduled Notifications may currently not be removed and may be continue to be delivered.

📚 Documentation

The documentation catalog was completely restructured, highlighting all the new API and functionality.

✅ Testing

New unit and UI tests have been written to verify functionality. We aimed to set a focus on unit tests for fastest possible test execution.

📝 Code of Conduct & Contributing Guidelines

By submitting creating this pull request, you agree to follow our Code of Conduct and Contributing Guidelines:

Copy link

codecov bot commented Sep 9, 2024

Codecov Report

Attention: Patch coverage is 62.63191% with 602 lines in your changes missing coverage. Please review.

Project coverage is 63.11%. Comparing base (896eb44) to head (19139c5).
Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...s/SpeziSchedulerMacros/UserStorageEntryMacro.swift 0.00% 122 Missing ⚠️
Sources/SpeziSchedulerUI/EventScheduleList.swift 0.00% 113 Missing ⚠️
Sources/SpeziScheduler/Task/Task.swift 68.33% 51 Missing ⚠️
Sources/SpeziScheduler/Schedule/Schedule.swift 71.01% 49 Missing ⚠️
Sources/SpeziScheduler/Scheduler.swift 86.22% 39 Missing ⚠️
...es/SpeziScheduler/Schedule/Schedule+Duration.swift 52.31% 31 Missing ⚠️
Sources/SpeziScheduler/Task/Outcome.swift 20.52% 31 Missing ⚠️
.../SpeziScheduler/Task/AllowedCompletionPolicy.swift 46.67% 24 Missing ⚠️
Sources/SpeziSchedulerUI/InstructionsTile.swift 80.84% 23 Missing ⚠️
...rces/SpeziScheduler/UserInfo/UserInfoStorage.swift 64.41% 21 Missing ⚠️
... and 11 more
Additional details and impacted files

Impacted file tree graph

@@            Coverage Diff            @@
##           main      #44       +/-   ##
=========================================
+ Coverage      0   63.11%   +63.11%     
=========================================
  Files         0       24       +24     
  Lines         0     1648     +1648     
=========================================
+ Hits          0     1040     +1040     
- Misses        0      608      +608     
Files with missing lines Coverage Δ
...iScheduler/Task/Task+LocalizedStringResource.swift 100.00% <100.00%> (ø)
...SchedulerUI/Category/TaskCategoryAppearances.swift 100.00% <100.00%> (ø)
...rUI/Category/TaskCategoryAppearancesModifier.swift 100.00% <100.00%> (ø)
...es/SpeziSchedulerMacros/SpeziSchedulerMacros.swift 0.00% <0.00%> (ø)
...rces/SpeziScheduler/Schedule/Date+Extensions.swift 86.67% <86.67%> (ø)
Sources/SpeziScheduler/EventQuery.swift 96.43% <96.43%> (ø)
Sources/SpeziScheduler/UserInfo/UserInfoKey.swift 0.00% <0.00%> (ø)
Sources/SpeziScheduler/Schedule/Occurence.swift 61.91% <61.91%> (ø)
Sources/SpeziSchedulerUI/DefaultTileHeader.swift 89.34% <89.34%> (ø)
Sources/SpeziScheduler/Task/Task+Category.swift 33.34% <33.34%> (ø)
... and 14 more

Continue to review full report in Codecov by Sentry.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 896eb44...19139c5. Read the comment docs.

@Supereg Supereg changed the title Infinity Loop New Task model using SwiftData and Schedule creation using Calendar Recurrence Rule Sep 10, 2024
@Supereg Supereg mentioned this pull request Sep 10, 2024
1 task
@Supereg Supereg marked this pull request as ready for review September 10, 2024 18:00
@Supereg Supereg mentioned this pull request Sep 20, 2024
1 task
Copy link
Member

@PSchmiedmayer PSchmiedmayer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for all the work in this PR; amazing job!!

It would be amazing to update the README accordingly and address the smaller comments I had in the PR review. A huge step toward improving on the Scheduler module; amazing job!

.github/workflows/build-and-test.yml Outdated Show resolved Hide resolved
Package.swift Show resolved Hide resolved
Package.swift Outdated Show resolved Hide resolved
Sources/SpeziScheduler/EventQuery.swift Outdated Show resolved Hide resolved
Sources/SpeziScheduler/UserInfo/UserStorageEntry.swift Outdated Show resolved Hide resolved
Sources/SpeziSchedulerUI/TodayList.swift Outdated Show resolved Hide resolved
@PSchmiedmayer PSchmiedmayer added the enhancement New feature or request label Oct 21, 2024
@Supereg Supereg merged commit afb9193 into main Oct 29, 2024
11 checks passed
@Supereg Supereg deleted the feature/infinity-loop branch October 29, 2024 13:51
Supereg added a commit that referenced this pull request Oct 29, 2024
# Support for scheduling notifications

## ♻️ Current situation & Problem
The newly introduced SpeziScheduler #44 didn't include support for
notifications (see #45). This PR adds back this feature, providing
several improvements over the previous implementation.
A core challenge is that Apple limits the amount of locally scheduled
notifications to 64 request at a time. Therefore, we optimize scheduling
by applying the overall rules:
* Schedules that can be expressed using repeating calendar-based
notification triggers are scheduled that way, only ever occupying one
request for all its event occurrences.
* Otherwise, each event is scheduled individually using an
interval-based trigger. In this case we order notification request by
event occurrence. Further, we never schedule more than `30` notification
at a time and never earlier than 1 month in advance to ensure other
modules are still able to schedule local notifications. These settings
can be adjusted by manually configuring the `SchedulerNotifications` in
your `SpeziAppDelegate`
* Scheduled Notifications are updated using background tasks (if
necessary). We schedule a background task every week (or earlier if
necessary) to update the scheduled notification requests.

## ⚙️ Release Notes 
* More advanced notification scheduling that tries to reduce the amount
of notification request by using repeating notifications triggers (when
using the `daily` and `weekly` shorthand initializes of a `Schedule`)
and prioritizes event notifications by their occurrence date.
* Automatically schedule events as time-sensitive notification if their
duration is not `allDay`.
* All Task Notifications are automatically put into the same Scheduler
group.
* Support notification content customization by conforming your Standard
to the `SchedulerNotificationsConstraint`.
* Automatically present notifications while the app is running in
foreground (customize this using the `notificationPresentation` option).
* Automatically request provisional notification authorization to
schedule notification even without explicit authorization (customize
this with the `automaticallyRequestProvisionalAuthorization` option).
* A lot of other fixes and improvements.


## 📚 Documentation
Added a dedicated configuration section around notifications in the
documentation catalog. The documentation of the `SchedulerNotifications`
module highlights the necessary steps to set up notifications for your
project.

## ✅ Testing
Added the `XCTSpeziScheduler` target that provide UI components to
visualize scheduled notification requests. We use this in the UI tests
to verify that notifications are scheduled as expected. The Test App
schedules a repeating daily notification that has its first occurrence
40s after app launch. Additionally we schedule a daily repeating task
that starts 1 week after initial app launch to test event-level
scheduling.

## 📝 Code of Conduct & Contributing Guidelines 

By submitting creating this pull request, you agree to follow our [Code
of
Conduct](https://github.com/StanfordSpezi/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordSpezi/.github/blob/main/CONTRIBUTING.md):
- [x] I agree to follow the [Code of
Conduct](https://github.com/StanfordSpezi/.github/blob/main/CODE_OF_CONDUCT.md)
and [Contributing
Guidelines](https://github.com/StanfordSpezi/.github/blob/main/CONTRIBUTING.md).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
enhancement New feature or request
Projects
Archived in project
2 participants