before waiter refactor

YunchuWang · YunchuWang · commit e16ab9ce35c0 · 2025-02-21T14:56:41.000-08:00
diff --git a/src/ScheduledTasks/Entity/Schedule.cs b/src/ScheduledTasks/Entity/Schedule.cs
@@ -37,7 +37,6 @@ public void CreateSchedule(TaskEntityContext context, ScheduleCreationOptions sc
                 throw new ScheduleInvalidTransitionException(scheduleCreationOptions?.ScheduleId ?? string.Empty, this.State.Status, ScheduleStatus.Active, nameof(this.CreateSchedule));
             }
 
-            // CreateSchedule is allowed, we shall throw exception if any following step failed to inform caller
             if (scheduleCreationOptions == null)
             {
                 throw new ScheduleClientValidationException(string.Empty, "Schedule creation options cannot be null");
@@ -55,7 +54,7 @@ public void CreateSchedule(TaskEntityContext context, ScheduleCreationOptions sc
         }
         catch (ScheduleInvalidTransitionException scheduleInvalidTransitionEx)
         {
-            // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.CreateSchedule), ex.Message, ex);
+            this.logger.ScheduleOperationError(scheduleCreationOptions?.ScheduleId ?? string.Empty, nameof(this.CreateSchedule), scheduleInvalidTransitionEx.Message, scheduleInvalidTransitionEx);
             this.State.AddActivityLog(nameof(this.CreateSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails
             {
                 Reason = scheduleInvalidTransitionEx.Message,
@@ -66,7 +65,7 @@ public void CreateSchedule(TaskEntityContext context, ScheduleCreationOptions sc
         }
         catch (ScheduleClientValidationException scheduleClientValidationEx)
         {
-            // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.CreateSchedule), ex.Message, ex);
+            this.logger.ScheduleOperationError(scheduleCreationOptions?.ScheduleId ?? string.Empty, nameof(this.CreateSchedule), scheduleClientValidationEx.Message, scheduleClientValidationEx);
             this.State.AddActivityLog(nameof(this.CreateSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails
             {
                 Reason = scheduleClientValidationEx.Message,
@@ -147,7 +146,7 @@ public void UpdateSchedule(TaskEntityContext context, ScheduleUpdateOptions sche
         }
         catch (ScheduleInvalidTransitionException scheduleInvalidTransitionEx)
         {
-            // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.UpdateSchedule), ex.Message, ex);
+            this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.UpdateSchedule), scheduleInvalidTransitionEx.Message, scheduleInvalidTransitionEx);
             this.State.AddActivityLog(nameof(this.UpdateSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails
             {
                 Reason = scheduleInvalidTransitionEx.Message,
@@ -158,7 +157,7 @@ public void UpdateSchedule(TaskEntityContext context, ScheduleUpdateOptions sche
         }
         catch (ScheduleClientValidationException scheduleClientValidationEx)
         {
-            // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.UpdateSchedule), ex.Message, ex);
+            this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.UpdateSchedule), scheduleClientValidationEx.Message, scheduleClientValidationEx);
             this.State.AddActivityLog(nameof(this.UpdateSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails
             {
                 Reason = scheduleClientValidationEx.Message,
@@ -205,7 +204,7 @@ public void PauseSchedule(TaskEntityContext context)
         }
         catch (ScheduleInvalidTransitionException scheduleInvalidTransitionEx)
         {
-            // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.PauseSchedule), ex.Message, ex);
+            this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.PauseSchedule), scheduleInvalidTransitionEx.Message, scheduleInvalidTransitionEx);
             this.State.AddActivityLog(nameof(this.PauseSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails
             {
                 Reason = scheduleInvalidTransitionEx.Message,
@@ -216,7 +215,7 @@ public void PauseSchedule(TaskEntityContext context)
         }
         catch (ScheduleClientValidationException scheduleClientValidationEx)
         {
-            // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.PauseSchedule), ex.Message, ex);
+            this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.PauseSchedule), scheduleClientValidationEx.Message, scheduleClientValidationEx);
             this.State.AddActivityLog(nameof(this.PauseSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails
             {
                 Reason = scheduleClientValidationEx.Message,
@@ -264,7 +263,7 @@ public void ResumeSchedule(TaskEntityContext context)
         }
         catch (ScheduleInvalidTransitionException scheduleInvalidTransitionEx)
         {
-            // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.ResumeSchedule), ex.Message, ex);
+            this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.ResumeSchedule), scheduleInvalidTransitionEx.Message, scheduleInvalidTransitionEx);
             this.State.AddActivityLog(nameof(this.ResumeSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails
             {
                 Reason = scheduleInvalidTransitionEx.Message,
@@ -275,7 +274,7 @@ public void ResumeSchedule(TaskEntityContext context)
         }
         catch (ScheduleClientValidationException scheduleClientValidationEx)
         {
-            // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.ResumeSchedule), ex.Message, ex);
+            this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.ResumeSchedule), scheduleClientValidationEx.Message, scheduleClientValidationEx);
             this.State.AddActivityLog(nameof(this.ResumeSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails
             {
                 Reason = scheduleClientValidationEx.Message,

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,6 @@ public void CreateSchedule(TaskEntityContext context, ScheduleCreationOptions sc`
`37`	`37`	`throw new ScheduleInvalidTransitionException(scheduleCreationOptions?.ScheduleId ?? string.Empty, this.State.Status, ScheduleStatus.Active, nameof(this.CreateSchedule));`
`38`	`38`	`}`
`39`	`39`
`40`		`- // CreateSchedule is allowed, we shall throw exception if any following step failed to inform caller`
`41`	`40`	`if (scheduleCreationOptions == null)`
`42`	`41`	`{`
`43`	`42`	`throw new ScheduleClientValidationException(string.Empty, "Schedule creation options cannot be null");`
`@@ -55,7 +54,7 @@ public void CreateSchedule(TaskEntityContext context, ScheduleCreationOptions sc`
`55`	`54`	`}`
`56`	`55`	`catch (ScheduleInvalidTransitionException scheduleInvalidTransitionEx)`
`57`	`56`	`{`
`58`		`- // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.CreateSchedule), ex.Message, ex);`
	`57`	`+ this.logger.ScheduleOperationError(scheduleCreationOptions?.ScheduleId ?? string.Empty, nameof(this.CreateSchedule), scheduleInvalidTransitionEx.Message, scheduleInvalidTransitionEx);`
`59`	`58`	`this.State.AddActivityLog(nameof(this.CreateSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails`
`60`	`59`	`{`
`61`	`60`	`Reason = scheduleInvalidTransitionEx.Message,`
`@@ -66,7 +65,7 @@ public void CreateSchedule(TaskEntityContext context, ScheduleCreationOptions sc`
`66`	`65`	`}`
`67`	`66`	`catch (ScheduleClientValidationException scheduleClientValidationEx)`
`68`	`67`	`{`
`69`		`- // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.CreateSchedule), ex.Message, ex);`
	`68`	`+ this.logger.ScheduleOperationError(scheduleCreationOptions?.ScheduleId ?? string.Empty, nameof(this.CreateSchedule), scheduleClientValidationEx.Message, scheduleClientValidationEx);`
`70`	`69`	`this.State.AddActivityLog(nameof(this.CreateSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails`
`71`	`70`	`{`
`72`	`71`	`Reason = scheduleClientValidationEx.Message,`
`@@ -147,7 +146,7 @@ public void UpdateSchedule(TaskEntityContext context, ScheduleUpdateOptions sche`
`147`	`146`	`}`
`148`	`147`	`catch (ScheduleInvalidTransitionException scheduleInvalidTransitionEx)`
`149`	`148`	`{`
`150`		`- // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.UpdateSchedule), ex.Message, ex);`
	`149`	`+ this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.UpdateSchedule), scheduleInvalidTransitionEx.Message, scheduleInvalidTransitionEx);`
`151`	`150`	`this.State.AddActivityLog(nameof(this.UpdateSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails`
`152`	`151`	`{`
`153`	`152`	`Reason = scheduleInvalidTransitionEx.Message,`
`@@ -158,7 +157,7 @@ public void UpdateSchedule(TaskEntityContext context, ScheduleUpdateOptions sche`
`158`	`157`	`}`
`159`	`158`	`catch (ScheduleClientValidationException scheduleClientValidationEx)`
`160`	`159`	`{`
`161`		`- // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.UpdateSchedule), ex.Message, ex);`
	`160`	`+ this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.UpdateSchedule), scheduleClientValidationEx.Message, scheduleClientValidationEx);`
`162`	`161`	`this.State.AddActivityLog(nameof(this.UpdateSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails`
`163`	`162`	`{`
`164`	`163`	`Reason = scheduleClientValidationEx.Message,`
`@@ -205,7 +204,7 @@ public void PauseSchedule(TaskEntityContext context)`
`205`	`204`	`}`
`206`	`205`	`catch (ScheduleInvalidTransitionException scheduleInvalidTransitionEx)`
`207`	`206`	`{`
`208`		`- // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.PauseSchedule), ex.Message, ex);`
	`207`	`+ this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.PauseSchedule), scheduleInvalidTransitionEx.Message, scheduleInvalidTransitionEx);`
`209`	`208`	`this.State.AddActivityLog(nameof(this.PauseSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails`
`210`	`209`	`{`
`211`	`210`	`Reason = scheduleInvalidTransitionEx.Message,`
`@@ -216,7 +215,7 @@ public void PauseSchedule(TaskEntityContext context)`
`216`	`215`	`}`
`217`	`216`	`catch (ScheduleClientValidationException scheduleClientValidationEx)`
`218`	`217`	`{`
`219`		`- // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.PauseSchedule), ex.Message, ex);`
	`218`	`+ this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.PauseSchedule), scheduleClientValidationEx.Message, scheduleClientValidationEx);`
`220`	`219`	`this.State.AddActivityLog(nameof(this.PauseSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails`
`221`	`220`	`{`
`222`	`221`	`Reason = scheduleClientValidationEx.Message,`
`@@ -264,7 +263,7 @@ public void ResumeSchedule(TaskEntityContext context)`
`264`	`263`	`}`
`265`	`264`	`catch (ScheduleInvalidTransitionException scheduleInvalidTransitionEx)`
`266`	`265`	`{`
`267`		`- // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.ResumeSchedule), ex.Message, ex);`
	`266`	`+ this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.ResumeSchedule), scheduleInvalidTransitionEx.Message, scheduleInvalidTransitionEx);`
`268`	`267`	`this.State.AddActivityLog(nameof(this.ResumeSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails`
`269`	`268`	`{`
`270`	`269`	`Reason = scheduleInvalidTransitionEx.Message,`
`@@ -275,7 +274,7 @@ public void ResumeSchedule(TaskEntityContext context)`
`275`	`274`	`}`
`276`	`275`	`catch (ScheduleClientValidationException scheduleClientValidationEx)`
`277`	`276`	`{`
`278`		`- // this.logger.ScheduleOperationError(ex.ScheduleId, nameof(this.ResumeSchedule), ex.Message, ex);`
	`277`	`+ this.logger.ScheduleOperationError(this.State.ScheduleConfiguration?.ScheduleId ?? string.Empty, nameof(this.ResumeSchedule), scheduleClientValidationEx.Message, scheduleClientValidationEx);`
`279`	`278`	`this.State.AddActivityLog(nameof(this.ResumeSchedule), ScheduleOperationStatus.Failed.ToString(), new FailureDetails`
`280`	`279`	`{`
`281`	`280`	`Reason = scheduleClientValidationEx.Message,`