Refactor crontab trigger mechanism to use enum type

Author: aden.chen

src/Infrastructure/BotSharp.Abstraction/Crontab/Models/CrontabItem.cs

@@ -29,14 +29,17 @@ public class CrontabItem : ScheduleTaskArgs
     [JsonPropertyName("created_time")]
     public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
 
-    [JsonPropertyName("trigger_by_watcher")]
-    public bool TriggerByWatcher { get; set; } = true;
-
-    [JsonPropertyName("trigger_by_openapi")]
-    public bool TriggerByOpenAPI { get; set; }
+    [JsonPropertyName("trigger_type")]
+    public CronTabItemTriggerType TriggerType { get; set; } = CronTabItemTriggerType.BackgroundWatcher;
 
     public override string ToString()
     {
         return $"{Title}: {Description} [AgentId: {AgentId}, UserId: {UserId}]";
     }
 }
+
+public enum CronTabItemTriggerType
+{
+    BackgroundWatcher,
+    OpenAPI
+}

src/Infrastructure/BotSharp.Core.Crontab/Services/CrontabWatcher.cs

@@ -58,7 +58,7 @@ private async Task RunCronChecker(IServiceProvider services)
     {
         var cron = services.GetRequiredService<ICrontabService>();
         var crons = await cron.GetCrontable();
-        var allowedCrons = crons.Where(cron => cron.TriggerByWatcher).ToList();
+        var allowedCrons = crons.Where(cron => cron.TriggerType == CronTabItemTriggerType.BackgroundWatcher).ToList();
         var settings = services.GetRequiredService<CrontabSettings>();
         var publisher = services.GetService<IEventPublisher>();
 

src/Infrastructure/BotSharp.OpenAPI/Controllers/Crontab/CrontabController.cs

@@ -61,19 +61,20 @@ public async Task<CrontabSchedulingResult> SchedulingCrontab()
             if (item.CheckNextOccurrenceEveryOneMinute())
             {
                 _logger.LogInformation("Crontab: {0}, One occurrence was matched, Beginning execution...", item.Title);
-                Task.Run(() => ExecuteTimeArrivedItem(item));
+                Task.Run(() => ExecuteTimeArrivedItem(item, _services));
                 result.OccurrenceMatchedItems.Add(item.Title);
             }
         }
 
+        await Task.Delay(1000);
         return result;
     }
 
     private async Task<List<CrontabItem>> GetCrontabItems(string? title = null)
     {
         var crontabService = _services.GetRequiredService<ICrontabService>();
         var crons = await crontabService.GetCrontable();
-        var allowedCrons = crons.Where(cron => cron.TriggerByOpenAPI).ToList();
+        var allowedCrons = crons.Where(cron => cron.TriggerType == CronTabItemTriggerType.OpenAPI).ToList();
 
         if (title is null)
         {
@@ -83,15 +84,15 @@ private async Task<List<CrontabItem>> GetCrontabItems(string? title = null)
         return allowedCrons.Where(cron => cron.Title.IsEqualTo(title)).ToList();
     }
 
-    private async Task<bool> ExecuteTimeArrivedItem(CrontabItem item)
+    private async Task<bool> ExecuteTimeArrivedItem(CrontabItem item, IServiceProvider services)
     {
         try
         {
-            using var scope = _services.CreateScope();
+            using var scope = services.CreateScope();
             var crontabService = scope.ServiceProvider.GetRequiredService<ICrontabService>();
-            _logger.LogWarning($"Start running crontab {item.Title}");
+            _logger.LogInformation($"Start running crontab {item.Title}");
             await crontabService.ScheduledTimeArrived(item);
-            _logger.LogWarning($"Complete running crontab {item.Title}");
+            _logger.LogInformation($"Complete running crontab {item.Title}");
             return true;
         }
         catch (Exception ex)