save

Author: YunchuWang

src/ScheduledTasks/Entity/Schedule.cs

@@ -62,7 +62,7 @@ public void UpdateSchedule(TaskEntityContext context, ScheduleUpdateOptions sche
         Verify.NotNull(scheduleUpdateOptions, nameof(scheduleUpdateOptions));
         Verify.NotNull(this.State.ScheduleConfiguration, nameof(this.State.ScheduleConfiguration));
 
-        HashSet<string> updatedScheduleConfigFields = this.State.UpdateConfig(scheduleUpdateOptions);
+        HashSet<string> updatedScheduleConfigFields = this.State.ScheduleConfiguration.Update(scheduleUpdateOptions);
         if (updatedScheduleConfigFields.Count == 0)
         {
             // no need to interrupt and update current schedule run as there is no change in the schedule config

src/ScheduledTasks/Models/ScheduleConfiguration.cs

@@ -120,4 +120,71 @@ public static ScheduleConfiguration FromCreateOptions(ScheduleCreationOptions cr
             StartImmediatelyIfLate = createOptions.StartImmediatelyIfLate,
         };
     }
+
+    /// <summary>
+    /// Updates this configuration with the provided update options.
+    /// </summary>
+    /// <param name="updateOptions">The options to update the configuration with.</param>
+    /// <returns>A set of field names that were updated.</returns>
+    public HashSet<string> Update(ScheduleUpdateOptions updateOptions)
+    {
+        Check.NotNull(updateOptions, nameof(updateOptions));
+        HashSet<string> updatedFields = new HashSet<string>();
+
+        if (!string.IsNullOrEmpty(updateOptions.OrchestrationName))
+        {
+            this.OrchestrationName = updateOptions.OrchestrationName;
+            updatedFields.Add(nameof(this.OrchestrationName));
+        }
+
+        if (updateOptions.OrchestrationInput == null)
+        {
+            this.OrchestrationInput = updateOptions.OrchestrationInput;
+            updatedFields.Add(nameof(this.OrchestrationInput));
+        }
+
+        if (!string.IsNullOrEmpty(updateOptions.OrchestrationInstanceId))
+        {
+            this.OrchestrationInstanceId = updateOptions.OrchestrationInstanceId;
+            updatedFields.Add(nameof(this.OrchestrationInstanceId));
+        }
+
+        if (updateOptions.StartAt.HasValue)
+        {
+            this.StartAt = updateOptions.StartAt;
+            updatedFields.Add(nameof(this.StartAt));
+        }
+
+        if (updateOptions.EndAt.HasValue)
+        {
+            this.EndAt = updateOptions.EndAt;
+            updatedFields.Add(nameof(this.EndAt));
+        }
+
+        if (updateOptions.Interval.HasValue)
+        {
+            this.Interval = updateOptions.Interval;
+            updatedFields.Add(nameof(this.Interval));
+        }
+
+        if (!string.IsNullOrEmpty(updateOptions.CronExpression))
+        {
+            this.CronExpression = updateOptions.CronExpression;
+            updatedFields.Add(nameof(this.CronExpression));
+        }
+
+        if (updateOptions.MaxOccurrence != 0)
+        {
+            this.MaxOccurrence = updateOptions.MaxOccurrence;
+            updatedFields.Add(nameof(this.MaxOccurrence));
+        }
+
+        if (updateOptions.StartImmediatelyIfLate.HasValue)
+        {
+            this.StartImmediatelyIfLate = updateOptions.StartImmediatelyIfLate.Value;
+            updatedFields.Add(nameof(this.StartImmediatelyIfLate));
+        }
+
+        return updatedFields;
+    }
 }

src/ScheduledTasks/Models/ScheduleState.cs

@@ -33,70 +33,6 @@ class ScheduleState
     /// </summary>
     internal ScheduleConfiguration? ScheduleConfiguration { get; set; }
 
-    /// <summary>
-    /// Updates the schedule configuration with the provided options.
-    /// </summary>
-    /// <param name="scheduleUpdateOptions">The update options to apply.</param>
-    /// <returns>A set of field names that were updated.</returns>
-    public HashSet<string> UpdateConfig(ScheduleUpdateOptions scheduleUpdateOptions)
-    {
-        Check.NotNull(this.ScheduleConfiguration, nameof(this.ScheduleConfiguration));
-        Check.NotNull(scheduleUpdateOptions, nameof(scheduleUpdateOptions));
-
-        HashSet<string> updatedFields = new HashSet<string>();
-
-        if (!string.IsNullOrEmpty(scheduleUpdateOptions.OrchestrationName))
-        {
-            this.ScheduleConfiguration.OrchestrationName = scheduleUpdateOptions.OrchestrationName;
-            updatedFields.Add(nameof(this.ScheduleConfiguration.OrchestrationName));
-        }
-
-        if (scheduleUpdateOptions.OrchestrationInput == null)
-        {
-            this.ScheduleConfiguration.OrchestrationInput = scheduleUpdateOptions.OrchestrationInput;
-            updatedFields.Add(nameof(this.ScheduleConfiguration.OrchestrationInput));
-        }
-
-        if (scheduleUpdateOptions.StartAt.HasValue)
-        {
-            this.ScheduleConfiguration.StartAt = scheduleUpdateOptions.StartAt;
-            updatedFields.Add(nameof(this.ScheduleConfiguration.StartAt));
-        }
-
-        if (scheduleUpdateOptions.EndAt.HasValue)
-        {
-            this.ScheduleConfiguration.EndAt = scheduleUpdateOptions.EndAt;
-            updatedFields.Add(nameof(this.ScheduleConfiguration.EndAt));
-        }
-
-        if (scheduleUpdateOptions.Interval.HasValue)
-        {
-            this.ScheduleConfiguration.Interval = scheduleUpdateOptions.Interval;
-            updatedFields.Add(nameof(this.ScheduleConfiguration.Interval));
-        }
-
-        if (!string.IsNullOrEmpty(scheduleUpdateOptions.CronExpression))
-        {
-            this.ScheduleConfiguration.CronExpression = scheduleUpdateOptions.CronExpression;
-            updatedFields.Add(nameof(this.ScheduleConfiguration.CronExpression));
-        }
-
-        if (scheduleUpdateOptions.MaxOccurrence != 0)
-        {
-            this.ScheduleConfiguration.MaxOccurrence = scheduleUpdateOptions.MaxOccurrence;
-            updatedFields.Add(nameof(this.ScheduleConfiguration.MaxOccurrence));
-        }
-
-        // Only update if the customer explicitly set a value
-        if (scheduleUpdateOptions.StartImmediatelyIfLate.HasValue)
-        {
-            this.ScheduleConfiguration.StartImmediatelyIfLate = scheduleUpdateOptions.StartImmediatelyIfLate.Value;
-            updatedFields.Add(nameof(this.ScheduleConfiguration.StartImmediatelyIfLate));
-        }
-
-        return updatedFields;
-    }
-
     /// <summary>
     /// Refreshes the execution token to invalidate pending schedule operations.
     /// </summary>