Merge pull request #930 from iceljc/master

refine agent task

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Tasks/Models/AgentTask.cs

@@ -2,10 +2,13 @@ namespace BotSharp.Abstraction.Tasks.Models;
 
 public class AgentTask
 {
+    [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
     public string Id { get; set; } = string.Empty;
     public string Name { get; set; } = string.Empty;
     public string? Description { get; set; }
     public bool Enabled { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
     public string Content { get; set; } = string.Empty;
 
     [JsonIgnore(Condition = JsonIgnoreCondition.Always)]
@@ -19,9 +22,15 @@ public class AgentTask
     /// </summary>
     public string Status { get; set; } = TaskStatus.New;
 
-    public DateTime? LastExecutedDateTime { get; set; }
-    public DateTime? NextExecutionDateTime { get; set; }
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public DateTime? LastExecutionTime { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    public DateTime? NextExecutionTime { get; set; }
+
+    [JsonPropertyName("created_time")]
+    public DateTime CreatedTime { get; set; }
 
-    public DateTime CreatedDateTime { get; set; }
-    public DateTime UpdatedDateTime { get; set; }
+    [JsonPropertyName("updated_time")]
+    public DateTime UpdatedTime { get; set; }
 }

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

@@ -97,7 +97,7 @@ public async Task<List<AgentTask>> GetTasks()
                 Status = TaskStatus.Scheduled,
                 Enabled = !x.Disabled,
                 Description = cron.Description,
-                LastExecutedDateTime = cron.LastExecutionTime
+                LastExecutionTime = cron.LastExecutionTime
             }));
         }
 

src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs

@@ -185,8 +185,8 @@ private List<AgentTask> GetTasksFromFile(string fileDir)
                 Enabled = parsedTask.Enabled,
                 Content = parsedTask.Content,
                 AgentId = agentId,
-                CreatedDateTime = parsedTask.CreatedDateTime,
-                UpdatedDateTime = parsedTask.UpdatedDateTime
+                CreatedTime = parsedTask.CreatedTime,
+                UpdatedTime = parsedTask.UpdatedTime
             };
             tasks.Add(task);
         }

src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.AgentTask.cs

@@ -129,8 +129,8 @@ public void InsertAgentTask(AgentTask task)
             Name = task.Name,
             Description = task.Description,
             Enabled = task.Enabled,
-            CreatedDateTime = DateTime.UtcNow,
-            UpdatedDateTime = DateTime.UtcNow
+            CreatedTime = DateTime.UtcNow,
+            UpdatedTime = DateTime.UtcNow
         };
 
         var fileContent = BuildAgentTaskFileContent(metaData, task.Content);
@@ -163,8 +163,8 @@ public void UpdateAgentTask(AgentTask task, AgentTaskField field)
             Name = parsedTask.Name,
             Description = parsedTask.Description,
             Enabled = parsedTask.Enabled,
-            CreatedDateTime = parsedTask.CreatedDateTime,
-            UpdatedDateTime = DateTime.UtcNow
+            CreatedTime = parsedTask.CreatedTime,
+            UpdatedTime = DateTime.UtcNow
         };
         var content = parsedTask.Content;
 

src/Infrastructure/BotSharp.Core/Tasks/Services/AgentTaskService.cs

@@ -31,7 +31,7 @@ public async Task<PagedItems<AgentTask>> GetTasks(AgentTaskFilter filter)
 
             return new PagedItems<AgentTask>
             {
-                Items = items.OrderByDescending(x => x.UpdatedDateTime)
+                Items = items.OrderByDescending(x => x.UpdatedTime)
                             .Skip(filter.Pager.Offset).Take(filter.Pager.Size),
                 Count = items.Count()
             };

src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentTaskViewModel.cs

@@ -13,11 +13,11 @@ public class AgentTaskViewModel
 
     public string Status { get; set; } = null!;
 
-    [JsonPropertyName("created_datetime")]
-    public DateTime CreatedDateTime { get; set; }
+    [JsonPropertyName("created_time")]
+    public DateTime CreatedTime { get; set; }
 
-    [JsonPropertyName("updated_datetime")]
-    public DateTime UpdatedDateTime { get; set; }
+    [JsonPropertyName("updated_time")]
+    public DateTime UpdatedTime { get; set; }
 
     [JsonPropertyName("agent_id")]
     public string AgentId { get; set; } = null!;
@@ -37,8 +37,8 @@ public static AgentTaskViewModel From(AgentTask task)
             AgentId = task.AgentId,
             AgentName = task.Agent?.Name,
             Status = task.Status,
-            CreatedDateTime = task.CreatedDateTime,
-            UpdatedDateTime = task.UpdatedDateTime
+            CreatedTime = task.CreatedTime,
+            UpdatedTime = task.UpdatedTime
         };
     }
 }

src/Plugins/BotSharp.Plugin.MongoStorage/Collections/AgentTaskDocument.cs

@@ -23,8 +23,8 @@ public static AgentTask ToDomainModel(AgentTaskDocument model)
             Enabled = model.Enabled,
             AgentId = model.AgentId,
             Status = model.Status,
-            CreatedDateTime = model.CreatedTime,
-            UpdatedDateTime = model.UpdatedTime
+            CreatedTime = model.CreatedTime,
+            UpdatedTime = model.UpdatedTime
         };
     }
 
@@ -38,8 +38,8 @@ public static AgentTaskDocument ToMongoModel(AgentTask model)
             Enabled = model.Enabled,
             AgentId = model.AgentId,
             Status = model.Status,
-            CreatedTime = model.CreatedDateTime,
-            UpdatedTime = model.UpdatedDateTime
+            CreatedTime = model.CreatedTime,
+            UpdatedTime = model.UpdatedTime
         };
     }
 }