From 1bf8ecdc38e7ea1c18511f5e16c9c62fb9ec9f7e Mon Sep 17 00:00:00 2001
From: Jicheng Lu <103353@smsassist.com>
Date: Mon, 28 Aug 2023 00:36:11 -0500
Subject: [PATCH] refine get agent

---
 .../Agents/Services/AgentService.CreateAgent.cs             | 3 ++-
 .../BotSharp.Core/Agents/Services/AgentService.GetAgents.cs | 3 ++-
 .../BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs    | 6 ++++++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs
index bdccf367..ef7443ae 100644
--- a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs
+++ b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.CreateAgent.cs
@@ -27,9 +27,10 @@ public partial class AgentService
         record.CreatedTime = DateTime.UtcNow;
         record.UpdatedTime = DateTime.UtcNow;
 
+        var user = db.User.FirstOrDefault(x => x.ExternalId == _user.Id);
         var userAgentRecord = new UserAgentRecord
         {
-            UserId = _user.Id,
+            UserId = user?.Id ?? ObjectId.GenerateNewId().ToString(),
             AgentId = record.Id,
             CreatedTime = DateTime.UtcNow,
             UpdatedTime = DateTime.UtcNow
diff --git a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs
index 02e96f05..b3a21240 100644
--- a/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs
+++ b/src/Infrastructure/BotSharp.Core/Agents/Services/AgentService.GetAgents.cs
@@ -11,7 +11,8 @@ public partial class AgentService
         var db = _services.GetRequiredService<IBotSharpRepository>();
         var query = from a in db.Agent
                     join ua in db.UserAgent on a.Id equals ua.AgentId
-                    where ua.UserId == _user.Id
+                    join u in db.User on ua.UserId equals u.Id
+                    where u.ExternalId == _user.Id
                     select a.ToAgent();
         return query.ToList();
     }
diff --git a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs
index 5a2b8969..ed84c879 100644
--- a/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs
+++ b/src/Infrastructure/BotSharp.OpenAPI/ViewModels/Agents/AgentViewModel.cs
@@ -7,6 +7,9 @@ public class AgentViewModel
     public string Id { get; set; }
     public string Name { get; set; }
     public string Description { get; set; }
+    public string Instruction { get; set; }
+    public string Functions { get; set; }
+    public List<string> Routes { get; set; }
     public DateTime UpdatedDateTime { get; set; }
 
     public static AgentViewModel FromAgent(Agent agent)
@@ -16,6 +19,9 @@ public class AgentViewModel
             Id = agent.Id,
             Name = agent.Name,
             Description = agent.Description,
+            Instruction = agent.Instruction,
+            Functions = agent.Functions,
+            Routes = agent.Routes,
             UpdatedDateTime = agent.UpdatedDateTime
         };
     }