Skip to content

Fix: Duration-based scheduling is properly formed #1462

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
WhitWaldo merged 6 commits into from
Feb 20, 2025
Merged

Fix: Duration-based scheduling is properly formed #1462

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8a7ff60
Split out dueTime to separate if branch
WhitWaldo Feb 19, 2025
c428d41
When a `DaprJobSchedule` is created using a TimeSpan, it should inser…
WhitWaldo Feb 19, 2025
180c53a
Added unit test to validate duration expression in `DaprJobSchedule`
WhitWaldo Feb 19, 2025
0d759e0
Merge branch 'master' into jobs-schedule-updates
WhitWaldo Feb 19, 2025
31c93b6
Fixed unit tests
WhitWaldo Feb 19, 2025
4de60de
Merge remote-tracking branch 'origin/jobs-schedule-updates' into jobs…
WhitWaldo Feb 19, 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
Prev Previous commit
Next Next commit
Fixed unit tests 
Signed-off-by: Whit Waldo <whit.waldo@innovian.net>
  • Loading branch information
@WhitWaldo
WhitWaldo committed Feb 19, 2025
commit 31c93b69b8c52d277f9d63a137c648fd0b7b58a6
2 changes: 1 addition & 1 deletion src/Dapr.Jobs/Extensions/TimeSpanExtensions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static string ToDurationString(this TimeSpan timespan)
/// <returns>True if the string represents a parseable interval duration; false if not.</returns>
public static bool IsDurationString(this string interval)
{
interval = interval.Replace("ms", "q");
interval = interval.Replace("ms", "q").Replace("@every ", string.Empty);
return hourRegex.Match(interval).Success ||
minuteRegex.Match(interval).Success ||
secondRegex.Match(interval).Success ||
Expand Down
4 changes: 2 additions & 2 deletions test/Dapr.Jobs.Test/Models/DaprJobScheduleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public sealed class DaprJobScheduleTests
public void FromDuration_Validate()
{
var schedule = DaprJobSchedule.FromDuration(new TimeSpan(12, 8, 16));
Assert.Equal("12h8m16s", schedule.ExpressionValue);
Assert.Equal("@every 12h8m16s", schedule.ExpressionValue);
}

[Fact]
Expand Down Expand Up @@ -117,7 +117,7 @@ public void IsDurationExpression()
Assert.True(schedule.IsDurationExpression);
Assert.False(schedule.IsPointInTimeExpression);
Assert.False(schedule.IsCronExpression);
Assert.False(schedule.IsPrefixedPeriodExpression);
Assert.True(schedule.IsPrefixedPeriodExpression); //A duration expression _is_ a prefixed period with @every
}

[Fact]
Expand Down