SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1102 from iceljc/master

Browse source 
Filter conversation by agent ids
This commit is contained in:
iceljc 2025-07-15 14:42:44 -05:00 committed by GitHub
parent cb7159e56c 1662dde419
commit efe4d9fea7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 27 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/Infrastructure/BotSharp.Abstraction/Repositories/Filters/ConversationFilter.cs
View file

@ -10,6 +10,7 @@ public class ConversationFilter
public string? Title { get; set; }
public string? TitleAlias { get; set; }
public string? AgentId { get; set; }
public List<string>? AgentIds { get; set; }
public string? Status { get; set; }
public string? Channel { get; set; }
public string? ChannelId { get; set; }

11
src/Infrastructure/BotSharp.Abstraction/SideCar/Models/SideCarOptions.cs
View file

@ -7,6 +7,15 @@ public class SideCarOptions
public static SideCarOptions Empty()
{
return new SideCarOptions();
return new();
}
public static SideCarOptions InheritStates(IEnumerable<string>? targetStates = null)
{
return new()
{
IsInheritStates = true,
InheritStateKeys = targetStates
};
}
}

10
src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.Conversation.cs
View file

@ -396,6 +396,12 @@ public partial class FileRepository
Directory.CreateDirectory(dir);
}
if (filter?.AgentId != null)
{
filter.AgentIds ??= [];
filter.AgentIds.Add(filter.AgentId);
}
var totalDirs = Directory.GetDirectories(dir);
foreach (var d in totalDirs)
{
@ -419,9 +425,9 @@ public partial class FileRepository
{
matched = matched && record.TitleAlias.Contains(filter.TitleAlias);
}
if (filter?.AgentId != null)
if (filter?.AgentIds != null && filter.AgentIds.Any())
{
matched = matched && record.AgentId == filter.AgentId;
matched = matched && filter.AgentIds.Contains(record.AgentId);
}
if (filter?.Status != null)
{

10
src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.Conversation.cs
View file

@ -346,6 +346,12 @@ public partial class MongoRepository
var convBuilder = Builders<ConversationDocument>.Filter;
var convFilters = new List<FilterDefinition<ConversationDocument>>() { convBuilder.Empty };
if (filter?.AgentId != null)
{
filter.AgentIds ??= [];
filter.AgentIds.Add(filter.AgentId);
}
// Filter conversations
if (!string.IsNullOrEmpty(filter?.Id))
{
@ -359,9 +365,9 @@ public partial class MongoRepository
{
convFilters.Add(convBuilder.Regex(x => x.Title, new BsonRegularExpression(filter.TitleAlias, "i")));
}
if (!string.IsNullOrEmpty(filter?.AgentId))
if (filter?.AgentIds != null && filter.AgentIds.Any())
{
convFilters.Add(convBuilder.Eq(x => x.AgentId, filter.AgentId));
convFilters.Add(convBuilder.In(x => x.AgentId, filter.AgentIds));
}
if (!string.IsNullOrEmpty(filter?.Status))
{