Merge pull request #359 from iceljc/features/refine-conversation

Features/refine conversation

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/ConversationFilter.cs

@@ -11,6 +11,7 @@ public class ConversationFilter
     public string? Status { get; set; }
     public string? Channel { get; set; }
     public string? UserId { get; set; }
+    public DateTime? StartTime { get; set; }
 
     /// <summary>
     /// Agent task id

src/Infrastructure/BotSharp.Abstraction/Routing/Models/RoutingRule.cs

@@ -22,7 +22,11 @@ public class RoutingRule
 
     public bool Required { get; set; }
 
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? RedirectTo { get; set; }
+
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
+    [JsonPropertyName("redirect_to_agent")]
     public string? RedirectToAgentName { get; set; }
 
     public override string ToString()

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

@@ -256,12 +256,34 @@ public PagedItems<Conversation> GetConversations(ConversationFilter filter)
                 if (record == null) continue;
 
                 var matched = true;
-                if (filter?.Id != null) matched = matched && record.Id == filter.Id;
-                if (filter?.AgentId != null) matched = matched && record.AgentId == filter.AgentId;
-                if (filter?.Status != null) matched = matched && record.Status == filter.Status;
-                if (filter?.Channel != null) matched = matched && record.Channel == filter.Channel;
-                if (filter?.UserId != null) matched = matched && record.UserId == filter.UserId;
-                if (filter?.TaskId != null) matched = matched && record.TaskId == filter.TaskId;
+                if (filter?.Id != null)
+                {
+                    matched = matched && record.Id == filter.Id;
+                }
+                if (filter?.AgentId != null)
+                {
+                    matched = matched && record.AgentId == filter.AgentId;
+                }
+                if (filter?.Status != null)
+                {
+                    matched = matched && record.Status == filter.Status;
+                }
+                if (filter?.Channel != null)
+                {
+                    matched = matched && record.Channel == filter.Channel;
+                }
+                if (filter?.UserId != null)
+                {
+                    matched = matched && record.UserId == filter.UserId;
+                }
+                if (filter?.TaskId != null)
+                {
+                    matched = matched && record.TaskId == filter.TaskId;
+                }
+                if (filter?.StartTime != null)
+                {
+                    matched = matched && record.CreatedTime >= filter.StartTime.Value;
+                }
 
                 // Check states
                 if (filter != null && !filter.States.IsNullOrEmpty())

src/Infrastructure/BotSharp.Logger/Hooks/RateLimitConversationHook.cs

@@ -52,7 +52,8 @@ public override async Task OnMessageReceived(RoleDialogModel message)
         var convService = _services.GetRequiredService<IConversationService>();
         var results = await convService.GetConversations(new ConversationFilter
         {
-            UserId = user.Id
+            UserId = user.Id,
+            StartTime = DateTime.UtcNow.AddHours(-24),
         });
 
         if (results.Count > rateLimit.MaxConversationPerDay)

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

@@ -4,8 +4,10 @@ namespace BotSharp.OpenAPI.ViewModels.Agents;
 
 public class RoutingRuleUpdateModel
 {
-    public string Field { get; set; }
+    public string? Field { get; set; }
     public string? Description { get; set; }
+    public string? Type { get; set; }
+    public string? FieldType { get; set; }
     public bool Required { get; set; }
     public string? RedirectTo { get; set; }
 
@@ -20,6 +22,8 @@ public static RoutingRule ToDomainElement(RoutingRuleUpdateModel model)
         { 
             Field = model.Field,
             Description = model.Description,
+            Type = model.Type,
+            FieldType = model.FieldType,
             Required = model.Required,
             RedirectTo = model.RedirectTo
         };

src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Conversation.cs

@@ -232,15 +232,37 @@ public PagedItems<Conversation> GetConversations(ConversationFilter filter)
         var builder = Builders<ConversationDocument>.Filter;
         var filters = new List<FilterDefinition<ConversationDocument>>() { builder.Empty };
 
-        if (!string.IsNullOrEmpty(filter.Id)) filters.Add(builder.Eq(x => x.Id, filter.Id));
-        if (!string.IsNullOrEmpty(filter.AgentId)) filters.Add(builder.Eq(x => x.AgentId, filter.AgentId));
-        if (!string.IsNullOrEmpty(filter.Status)) filters.Add(builder.Eq(x => x.Status, filter.Status));
-        if (!string.IsNullOrEmpty(filter.Channel)) filters.Add(builder.Eq(x => x.Channel, filter.Channel));
-        if (!string.IsNullOrEmpty(filter.UserId)) filters.Add(builder.Eq(x => x.UserId, filter.UserId));
-        if (!string.IsNullOrEmpty(filter.TaskId)) filters.Add(builder.Eq(x => x.TaskId, filter.TaskId));
+        if (!string.IsNullOrEmpty(filter?.Id))
+        {
+            filters.Add(builder.Eq(x => x.Id, filter.Id));
+        }
+        if (!string.IsNullOrEmpty(filter?.AgentId))
+        {
+            filters.Add(builder.Eq(x => x.AgentId, filter.AgentId));
+        }
+        if (!string.IsNullOrEmpty(filter?.Status))
+        {
+            filters.Add(builder.Eq(x => x.Status, filter.Status));
+        }
+        if (!string.IsNullOrEmpty(filter?.Channel))
+        {
+            filters.Add(builder.Eq(x => x.Channel, filter.Channel));
+        }
+        if (!string.IsNullOrEmpty(filter?.UserId))
+        {
+            filters.Add(builder.Eq(x => x.UserId, filter.UserId));
+        }
+        if (!string.IsNullOrEmpty(filter?.TaskId))
+        {
+            filters.Add(builder.Eq(x => x.TaskId, filter.TaskId));
+        }
+        if (filter?.StartTime != null)
+        {
+            filters.Add(builder.Gte(x => x.CreatedTime, filter.StartTime.Value));
+        }
 
         // Check states
-        if (!filter.States.IsNullOrEmpty())
+        if (filter != null && !filter.States.IsNullOrEmpty())
         {
             var targetConvIds = new List<string>();