update scheduleconfig

Author: YunchuWang

src/ScheduledTasks/Entity/Schedule.cs

@@ -305,7 +305,7 @@ public void ResumeSchedule(TaskEntityContext context)
     public void RunSchedule(TaskEntityContext context, string executionToken)
     {
         ScheduleConfiguration scheduleConfig = Verify.NotNull(this.State.ScheduleConfiguration, nameof(this.State.ScheduleConfiguration));
-        TimeSpan interval = scheduleConfig.Interval ?? throw new InvalidOperationException("Schedule interval must be specified.");
+        TimeSpan interval = scheduleConfig.Interval;
 
         if (executionToken != this.State.ExecutionToken)
         {
@@ -364,17 +364,12 @@ public void RunSchedule(TaskEntityContext context, string executionToken)
 
     static DateTimeOffset ComputeNextRunTime(ScheduleConfiguration scheduleConfig, DateTimeOffset lastRunAt)
     {
-        if (!scheduleConfig.Interval.HasValue)
-        {
-            throw new InvalidOperationException("Interval must be set to compute next run time.");
-        }
-
         // Calculate number of intervals between last run and now
         TimeSpan timeSinceLastRun = DateTimeOffset.UtcNow - lastRunAt;
-        int intervalsElapsed = (int)(timeSinceLastRun.Ticks / scheduleConfig.Interval.Value.Ticks);
+        int intervalsElapsed = (int)(timeSinceLastRun.Ticks / scheduleConfig.Interval.Ticks);
 
         // Compute and return the next run time
-        return lastRunAt + TimeSpan.FromTicks(scheduleConfig.Interval.Value.Ticks * (intervalsElapsed + 1));
+        return lastRunAt + TimeSpan.FromTicks(scheduleConfig.Interval.Ticks * (intervalsElapsed + 1));
     }
 
     void StartOrchestrationIfNotRunning(TaskEntityContext context)

src/ScheduledTasks/Models/ScheduleConfiguration.cs

@@ -9,35 +9,46 @@ namespace Microsoft.DurableTask.ScheduledTasks;
 class ScheduleConfiguration
 {
     string orchestrationName;
-    TimeSpan? interval;
+    TimeSpan interval;
 
     /// <summary>
     /// Initializes a new instance of the <see cref="ScheduleConfiguration"/> class.
     /// </summary>
+    /// <param name="scheduleId">The ID of the schedule.</param>
     /// <param name="orchestrationName">The name of the orchestration to schedule.</param>
-    /// <param name="scheduleId">The ID of the schedule, or null to generate one.</param>
-    public ScheduleConfiguration(string orchestrationName, string scheduleId)
+    /// <param name="interval">The interval between schedule executions. Must be positive and at least 1 second.</param>
+#pragma warning disable CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
+    public ScheduleConfiguration(string scheduleId, string orchestrationName, TimeSpan interval)
+#pragma warning restore CS8618 // Non-nullable field must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring as nullable.
     {
-        this.orchestrationName = Check.NotNullOrEmpty(orchestrationName, nameof(orchestrationName));
-        this.ScheduleId = scheduleId ?? Guid.NewGuid().ToString("N");
+        this.ScheduleId = Check.NotNullOrEmpty(scheduleId, nameof(scheduleId));
+        this.OrchestrationName = Check.NotNullOrEmpty(orchestrationName, nameof(orchestrationName));
+        if (interval <= TimeSpan.Zero)
+        {
+            throw new ArgumentException("Interval must be positive", nameof(interval));
+        }
+
+        if (interval.TotalSeconds < 1)
+        {
+            throw new ArgumentException("Interval must be at least 1 second", nameof(interval));
+        }
+
+        this.Interval = interval;
     }
 
     /// <summary>
-    /// Gets or sets the name of the orchestration function to schedule.
+    /// Gets or Sets the name of the orchestration function to schedule.
     /// </summary>
     public string OrchestrationName
     {
         get => this.orchestrationName;
-        set
-        {
-            this.orchestrationName = Check.NotNullOrEmpty(value, nameof(value));
-        }
+        set => this.orchestrationName = Check.NotNullOrEmpty(value, nameof(this.OrchestrationName));
     }
 
     /// <summary>
     /// Gets the ID of the schedule.
     /// </summary>
-    public string ScheduleId { get; init; }
+    public string ScheduleId { get; }
 
     /// <summary>
     /// Gets or sets the input to the orchestration function.
@@ -62,22 +73,17 @@ public string OrchestrationName
     /// <summary>
     /// Gets or sets the interval between schedule executions.
     /// </summary>
-    public TimeSpan? Interval
+    public TimeSpan Interval
     {
         get => this.interval;
         set
         {
-            if (!value.HasValue)
-            {
-                return;
-            }
-
-            if (value.Value <= TimeSpan.Zero)
+            if (value <= TimeSpan.Zero)
             {
                 throw new ArgumentException("Interval must be positive", nameof(value));
             }
 
-            if (value.Value.TotalSeconds < 1)
+            if (value.TotalSeconds < 1)
             {
                 throw new ArgumentException("Interval must be at least 1 second", nameof(value));
             }
@@ -98,13 +104,14 @@ public TimeSpan? Interval
     /// <returns>A new schedule configuration.</returns>
     public static ScheduleConfiguration FromCreateOptions(ScheduleCreationOptions createOptions)
     {
-        return new ScheduleConfiguration(createOptions.OrchestrationName, createOptions.ScheduleId)
+        Check.NotNull(createOptions, nameof(createOptions));
+
+        return new ScheduleConfiguration(createOptions.ScheduleId, createOptions.OrchestrationName, createOptions.Interval)
         {
             OrchestrationInput = createOptions.OrchestrationInput,
             OrchestrationInstanceId = createOptions.OrchestrationInstanceId,
             StartAt = createOptions.StartAt,
             EndAt = createOptions.EndAt,
-            Interval = createOptions.Interval,
             StartImmediatelyIfLate = createOptions.StartImmediatelyIfLate,
         };
     }
@@ -151,7 +158,7 @@ public HashSet<string> Update(ScheduleUpdateOptions updateOptions)
 
         if (updateOptions.Interval.HasValue)
         {
-            this.Interval = updateOptions.Interval;
+            this.Interval = updateOptions.Interval.Value;
             updatedFields.Add(nameof(this.Interval));
         }