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

fix validation and truncate message
SciSharp · Mar 25, 2024 · 4548023 · 4548023
2 parents 5f5afad + 743a902
commit 4548023
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/RoutingRuleUpdateModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/RoutingRuleUpdateModel.cs
@@ -5,7 +5,7 @@ namespace BotSharp.OpenAPI.ViewModels.Agents;
 public class RoutingRuleUpdateModel
 {
     public string Field { get; set; }
-    public string Description { get; set; }
+    public string? Description { get; set; }
     public bool Required { get; set; }
     public string? RedirectTo { get; set; }
 

diff --git a/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Conversation.cs b/src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Conversation.cs
@@ -381,23 +381,26 @@ public bool TruncateConversation(string conversationId, string messageId, bool c
         var refTime = foundDialog.Dialogs.ElementAt(foundIdx).MetaData.CreateTime;
         var stateFilter = Builders<ConversationStateDocument>.Filter.Eq(x => x.ConversationId, conversationId);
         var foundStates = _dc.ConversationStates.Find(stateFilter).FirstOrDefault();
-        // if (foundStates == null || foundStates.States.IsNullOrEmpty()) return false;
 
-        var truncatedStates = new List<StateMongoElement>();
-        foreach (var state in foundStates.States)
+        if (foundStates != null && !foundStates.States.IsNullOrEmpty())
         {
-            var values = state.Values.Where(x => x.UpdateTime < refTime).ToList();
-            if (values.Count == 0) continue;
+            var truncatedStates = new List<StateMongoElement>();
+            foreach (var state in foundStates.States)
+            {
+                var values = state.Values.Where(x => x.UpdateTime < refTime).ToList();
+                if (values.Count == 0) continue;
+
+                state.Values = values;
+                truncatedStates.Add(state);
+            }
 
-            state.Values = values;
-            truncatedStates.Add(state);
+            foundStates.States = truncatedStates;
+            _dc.ConversationStates.ReplaceOne(stateFilter, foundStates);
         }
 
         // Save
         foundDialog.Dialogs = truncatedDialogs;
-        foundStates.States = truncatedStates;
         _dc.ConversationDialogs.ReplaceOne(dialogFilter, foundDialog);
-        _dc.ConversationStates.ReplaceOne(stateFilter, foundStates);
 
         // Remove logs
         if (cleanLog)