refactor

Author: aden.chen

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

@@ -14,13 +14,13 @@ public static bool CheckNextOccurrenceEveryOneMinute(this CrontabItem item)
             });
 
             var currentTime = DateTime.UtcNow;
+            var currentMinute = new DateTime(currentTime.Year, currentTime.Month, currentTime.Day,
+                                   currentTime.Hour, currentTime.Minute, 0, DateTimeKind.Utc);
 
-            // Check if there has been an execution point within the past minute.
-            var oneMinuteAgo = currentTime.AddMinutes(-1);
-            var nextOccurrenceFromPast = schedule.GetNextOccurrence(oneMinuteAgo);
+            var oneMinuteAgo = currentMinute.AddMinutes(-1);
+            var nextOccurrence = schedule.GetNextOccurrence(oneMinuteAgo);
 
-            // If the next execution point falls within the past minute up to the present, then it matches.
-            return nextOccurrenceFromPast > oneMinuteAgo && nextOccurrenceFromPast <= currentTime;
+            return nextOccurrence == currentMinute;
         }
     }
 }

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

@@ -58,10 +58,11 @@ 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 settings = services.GetRequiredService<CrontabSettings>();
         var publisher = services.GetService<IEventPublisher>();
 
-        foreach (var item in crons)
+        foreach (var item in allowedCrons)
         {
             _logger.LogDebug($"[{DateTime.UtcNow}] Cron task ({item.Title}, {item.Cron}), Last Execution Time:  {item.LastExecutionTime}");
 

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

@@ -22,14 +22,27 @@ public CrontabController(
     [HttpPost("/crontab/{name}")]
     public async Task<bool> RunCrontab(string name)
     {
-        var found = await GetCrontabItems(name);
-        if (found.IsNullOrEmpty())
+        var cron = _services.GetRequiredService<ICrontabService>();
+        var crons = await cron.GetCrontable();
+        var found = crons.FirstOrDefault(x => x.Title.IsEqualTo(name));
+        if (found == null)
         {
             _logger.LogWarning($"Cannnot find crontab {name}");
             return false;
         }
 
-        return await ExecuteTimeArrivedItem(found.First());
+        try
+        {
+            _logger.LogWarning($"Start running crontab {name}");
+            await cron.ScheduledTimeArrived(found);
+            _logger.LogWarning($"Complete running crontab {name}");
+            return true;
+        }
+        catch (Exception ex)
+        {
+            _logger.LogError(ex, $"Error when running crontab {name}");
+            return false;
+        }
     }
 
     /// <summary>