Skip to content

Fix GetOccurrences() not properly dealing with periodStart's TZ #842

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

Merged
merged 3 commits into from
Jul 15, 2025
Merged

Fix GetOccurrences() not properly dealing with periodStart's TZ #842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
223d5ea
Test: Reproduce #840 - GetOccurrences() doesn't properly deal with pe…
minichma Jul 15, 2025
5fdbd33
Fix #840: Fix `GetOccurrences` to properly deal with `periodStart`'s TZ
minichma Jul 15, 2025
5ef193f
Eval: Remove obsolete comment in RecurrencePatternEvaluator
minichma Jul 15, 2025
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
39 changes: 39 additions & 0 deletions Ical.Net.Tests/RecurrenceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4208,4 +4208,43 @@ public void GetOccurrences_WithPeriodStart_ShouldConsiderDurationCorrectly()

Assert.That(occurrences, Is.EqualTo(expectedDates));
}

[Test]
[TestCase("20250715T120000", "UTC", "20260715T120000", "UTC")]
[TestCase("20250715T120000", "UTC", "20260715T140000", "Etc/GMT-2")]
[TestCase("20250715T120000", "UTC", "20260715T100000", "Etc/GMT+2")]
[TestCase("20250715T120000", "UTC", "20260715T120000", null)]
[TestCase("20250715T120000", null, "20260715T120000", "Etc/GMT-2")]
[TestCase("20250715T120000", null, "20260715T120000", "Etc/GMT+2")]
[TestCase("20250715T120000", null, "20260715T120000", "UTC")]
[TestCase("20250715T120000", null, "20260715T120000", null)]

[TestCase("20250715T120000", "Etc/GMT-2", "20260715", null)]
[TestCase("20250715T120000", "Etc/GMT+2", "20260715", null)]
[TestCase("20250715T120000", null, "20260715", null)]

[TestCase("20250715", null, "20260715T235959", "UTC")]
[TestCase("20250715", null, "20260715T235959", "Etc/GMT-2")]
[TestCase("20250715", null, "20260715T235959", "Etc/GMT+2")]
[TestCase("20250715", null, "20260715T235959", null)]

[TestCase("20250715", null, "20260715", null)]

public void GetOccurrences_WithPeriodStart_ShouldConsiderTzCorrectly(string dtStartStr, string? dtStartTzId, string periodStartStr, string? periodStartTzId)
{
var evt = new CalendarEvent();
evt.RecurrenceRules.Add(new RecurrencePattern(FrequencyType.Yearly, 1) { Count = 3 });
evt.Start = new CalDateTime(dtStartStr, dtStartTzId);

var cal = new Calendar();
cal.Events.Add(evt);

var firstFewOccurrences = cal.GetOccurrences().Take(3).ToList();

var periodStart = new CalDateTime(periodStartStr, periodStartTzId);
Assert.That(cal.GetOccurrences(periodStart).First(), Is.EqualTo(firstFewOccurrences[1]));

var nextPeriodStart = periodStart.HasTime ? periodStart.AddSeconds(1) : periodStart.AddDays(1);
Assert.That(cal.GetOccurrences(nextPeriodStart).First(), Is.EqualTo(firstFewOccurrences[2]));
}
}
1 change: 0 additions & 1 deletion Ical.Net/Evaluation/RecurrencePatternEvaluator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,6 @@ private RecurrencePattern ProcessRecurrencePattern(CalDateTime referenceDate)
private IEnumerable<CalDateTime> GetDates(CalDateTime seed, CalDateTime? periodStart, RecurrencePattern pattern,
EvaluationOptions? options)
{
// In the first step, we work with DateTime values, so we need to convert the CalDateTime to DateTime
var originalDate = seed;
var seedCopy = seed;
var periodStartDt = periodStart?.ToTimeZone(seed.TzId);
Expand Down
7 changes: 0 additions & 7 deletions Ical.Net/Evaluation/RecurrenceUtil.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,8 @@ public static IEnumerable<Occurrence> GetOccurrences(IRecurrable recurrable, Cal
return [];
}

// Ensure the start time is associated with the object being queried
var start = recurrable.Start;

// Change the time zone of periodStart as needed
// so they can be used during the evaluation process.

if (periodStart != null)
periodStart = new CalDateTime(periodStart.Date, periodStart.Time, start.TzId);

var periods = evaluator.Evaluate(start, periodStart, options);
if (periodStart != null)
{
Expand Down
Loading