Skip to content

Commit 2263cd2

Browse files
authored
Merge pull request #494 from iceljc/bugfix/fix-agent-conv-edge-cases
Bugfix/fix agent conv edge cases
2 parents dc6534f + 1e98567 commit 2263cd2

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

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

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
using BotSharp.Abstraction.Agents;
12
using BotSharp.Abstraction.Repositories.Enums;
23
using BotSharp.Abstraction.Routing.Models;
34
using BotSharp.Abstraction.Users.Enums;
5+
using Microsoft.EntityFrameworkCore.Metadata;
46
using System.IO;
57

68
namespace BotSharp.Core.Agents.Services;
@@ -11,7 +13,9 @@ public async Task UpdateAgent(Agent agent, AgentField updateField)
1113
{
1214
var userService = _services.GetRequiredService<IUserService>();
1315
var user = await userService.GetUser(_user.Id);
14-
if (user?.Role != UserRole.Admin) return;
16+
var userAgents = GetAgentsByUser(user?.Id);
17+
var editable = userAgents?.Select(x => x.Id)?.Contains(agent.Id) ?? false;
18+
if (user?.Role != UserRole.Admin && !editable) return;
1519

1620
if (agent == null || string.IsNullOrEmpty(agent.Id)) return;
1721

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -373,7 +373,6 @@ join u in Users on ua.UserId equals u.Id
373373

374374
var filter = new AgentFilter
375375
{
376-
IsPublic = true,
377376
AgentIds = agentIds
378377
};
379378
var agents = GetAgents(filter);

src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public async Task<PagedItems<ConversationViewModel>> GetConversations([FromBody]
5959
user = await userService.GetUser(item.User.Id);
6060
item.User = UserViewModel.FromUser(user);
6161
var agent = await agentService.GetAgent(item.AgentId);
62-
item.AgentName = agent?.Name;
62+
item.AgentName = agent?.Name ?? "Unkown";
6363
}
6464

6565
return new PagedItems<ConversationViewModel>
@@ -110,7 +110,7 @@ public async Task<IEnumerable<ChatResponseModel>> GetDialogs([FromRoute] string
110110
Data = message.Data,
111111
Sender = new UserViewModel
112112
{
113-
FirstName = agent.Name,
113+
FirstName = agent?.Name ?? "Unkown",
114114
Role = message.Role,
115115
},
116116
RichContent = message.SecondaryRichContent ?? message.RichContent

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,7 @@ join u in _dc.Users.AsQueryable() on ua.UserId equals u.Id
308308

309309
var filter = new AgentFilter
310310
{
311-
AgentIds = agentIds,
312-
IsPublic = true
311+
AgentIds = agentIds
313312
};
314313
var agents = GetAgents(filter);
315314
return agents;

0 commit comments

Comments
 (0)