Skip to content

Fix afterOccurrences to be calculated from startDate in RecurrenceRule #1634

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.

Sign up for GitHub

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

Open
baekteun wants to merge 1 commit into
base: main
Choose a base branch
from
+43 −0
Open

Fix afterOccurrences to be calculated from startDate in RecurrenceRule #1634

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions Sources/FoundationEssentials/Calendar/Calendar_Recurrence.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -373,6 +373,11 @@ extension Calendar {
// If a range has been specified, we should skip a few extra
// occurrences until we reach the start date
if let baseRecurrenceLowerBound, nextDate < baseRecurrenceLowerBound {
resultsFound += 1
if let limit = recurrence.end.occurrences, resultsFound >= limit {
finished = true
return
}
continue
}
anchor = nextDate
Expand Down
38 changes: 38 additions & 0 deletions Tests/FoundationInternationalizationTests/CalendarRecurrenceRuleTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,42 @@ private struct CalendarRecurrenceRuleTests {
]
#expect(results == expectedResults)
}

@Test func afterOccurrenceMatchingDays() {
let recurrenceRule = Calendar.RecurrenceRule.init(
calendar: gregorian,
frequency: .daily,
end: .afterOccurrences(3)
)

let startDate = Date(timeIntervalSince1970: 1764576000.0) // 2025-12-01T00:00:00-0800

let rangeStartDate = Date(timeIntervalSince1970: 1765353600.0) // 2025-12-10T00:00:00-0800
let rangeEndDate = Date(timeIntervalSince1970: 1766217600.0) // 2025-12-20T00:00:00-0800

let result = Array(recurrenceRule.recurrences(of: startDate, in: rangeStartDate..<rangeEndDate))

#expect(result.isEmpty)
}

@Test func afterOccurrencesReturnsInRangeOccurrences() {
let recurrenceRule = Calendar.RecurrenceRule.init(
calendar: gregorian,
frequency: .daily,
end: .afterOccurrences(4)
)

let startDate = Date(timeIntervalSince1970: 1765094400.0) // 2025-12-07T00:00:00-0800

let rangeStartDate = Date(timeIntervalSince1970: 1765267200.0) // 2025-12-09T00:00:00-0800
let rangeEndDate = Date(timeIntervalSince1970: 1765440000.0) // 2025-12-11T00:00:00-0800

let result = Array(recurrenceRule.recurrences(of: startDate, in: rangeStartDate..<rangeEndDate))
let expectedResults = [
Date(timeIntervalSince1970: 1765267200.0), // 2025-12-09T00:00:00-0800
Date(timeIntervalSince1970: 1765353600.0), // 2025-12-10T00:00:00-0800
]

#expect(result == expectedResults)
}
}