Merge pull request #1300 from iceljc/master

fix conv file mongo doc id and add time

Author: iceljc

src/Infrastructure/BotSharp.Abstraction/Conversations/Models/ConversationFile.cs

@@ -2,6 +2,16 @@ namespace BotSharp.Abstraction.Conversations.Models;
 
 public class ConversationFile
 {
+    [JsonPropertyName("conversation_id")]
     public string ConversationId { get; set; }
+
+    [JsonPropertyName("thumbnail")]
+    [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingNull)]
     public string? Thumbnail { get; set; }
+
+    [JsonPropertyName("created_time")]
+    public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
+
+    [JsonPropertyName("updated_time")]
+    public DateTime UpdatedTime { get; set; } = DateTime.UtcNow;
 }

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

@@ -6,13 +6,17 @@ public class ConversationFileDocument : MongoBase
 {
     public string ConversationId { get; set; }
     public string? Thumbnail { get; set; }
+    public DateTime CreatedTime { get; set; }
+    public DateTime UpdatedTime { get; set; }
 
     public static ConversationFile ToDomainModel(ConversationFileDocument model)
     {
         return new ConversationFile
         {
             ConversationId = model.ConversationId,
-            Thumbnail = model.Thumbnail
+            Thumbnail = model.Thumbnail,
+            CreatedTime = model.CreatedTime,
+            UpdatedTime = model.UpdatedTime
         };
     }
 
@@ -21,7 +25,9 @@ public static ConversationFileDocument ToMongoModel(ConversationFile model)
         return new ConversationFileDocument
         {
             ConversationId = model.ConversationId,
-            Thumbnail = model.Thumbnail
+            Thumbnail = model.Thumbnail,
+            CreatedTime = model.CreatedTime,
+            UpdatedTime = model.UpdatedTime
         };
     }
 }

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

@@ -805,21 +805,28 @@ public async Task<bool> SaveConversationFiles(List<ConversationFile> files)
         try
         {
             var builder = Builders<ConversationFileDocument>.Filter;
-            var operations = files.Where(x => !string.IsNullOrEmpty(x.ConversationId))
-                                  .Select(file =>
-                                  {
-                                      var fileDoc = ConversationFileDocument.ToMongoModel(file);
-                                      var filter = builder.Eq(x => x.ConversationId, file.ConversationId);
-                                      return new ReplaceOneModel<ConversationFileDocument>(filter, fileDoc)
-                                      {
-                                          IsUpsert = true
-                                      };
-                                  })
-                                  .ToList();
-
-            if (!operations.IsNullOrEmpty())
+            var ops = files.Where(x => !string.IsNullOrEmpty(x.ConversationId))
+                           .Select(file =>
+                           {
+                               var updateBuilder = Builders<ConversationFileDocument>.Update
+                                   .Set(y => y.Thumbnail, file.Thumbnail)
+                                   .Set(y => y.UpdatedTime, DateTime.UtcNow)
+                                   .SetOnInsert(y => y.Id, Guid.NewGuid().ToString())
+                                   .SetOnInsert(y => y.ConversationId, file.ConversationId)
+                                   .SetOnInsert(y => y.CreatedTime, DateTime.UtcNow);
+
+                               var filter = builder.Eq(y => y.ConversationId, file.ConversationId);
+
+                               return new UpdateOneModel<ConversationFileDocument>(
+                                   filter,
+                                   updateBuilder
+                               ) { IsUpsert = true };
+                           })
+                           .ToList();
+
+            if (!ops.IsNullOrEmpty())
             {
-                await _dc.ConversationFiles.BulkWriteAsync(operations, new BulkWriteOptions { IsOrdered = false });
+                await _dc.ConversationFiles.BulkWriteAsync(ops, new BulkWriteOptions { IsOrdered = false });
             }
 
             return true;