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

add backend services for dashboard conversation

Browse source
This commit is contained in:
Chen Gong 2024-11-21 13:07:00 -06:00
parent 9876b7b43b
commit 2c77bd29ad
10 changed files with 154 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs
View file

@ -31,6 +31,8 @@ public interface IBotSharpRepository
void UpdateExistUser(string userId, User user) => throw new NotImplementedException();
void UpdateUserVerified(string userId) => throw new NotImplementedException();
void AddDashboardConversation(string userId, string conversationId) => throw new NotImplementedException();
void RemoveDashboardConversation(string userId, string conversationId) => throw new NotImplementedException();
void UpdateDashboardConversation(string userId, DashboardConversation dashConv) => throw new NotImplementedException();
void UpdateUserVerificationCode(string userId, string verficationCode) => throw new NotImplementedException();
void UpdateUserPassword(string userId, string password) => throw new NotImplementedException();
void UpdateUserEmail(string userId, string email) => throw new NotImplementedException();

2
src/Infrastructure/BotSharp.Abstraction/Users/IUserService.cs
View file

@ -23,5 +23,7 @@ public interface IUserService
Task<DateTime> GetUserTokenExpires();
Task<bool> UpdateUsersIsDisable(List<string> userIds, bool isDisable);
Task<bool> AddDashboardConversation(string userId, string conversationId);
Task<bool> RemoveDashboardConversation(string userId, string conversationId);
Task UpdateDashboardConversation(string userId, DashboardConversation dashConv);
Task<Dashboard?> GetDashboard(string userId);
}

7
src/Infrastructure/BotSharp.Abstraction/Users/Models/Dashboard.cs
View file

@ -1,8 +1,3 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace BotSharp.Abstraction.Users.Models;
@ -20,6 +15,6 @@ public class DashboardComponent
public class DashboardConversation : DashboardComponent
{
public string? ConversationId { get; set; }
public string? Instruction { get; set; } = "Default instruction: Ask bot to do something";
public string? Instruction { get; set; } = "";
}

1
src/Infrastructure/BotSharp.Abstraction/Users/Models/User.cs
View file

@ -23,7 +23,6 @@ public class User
public bool Verified { get; set; }
public string? AffiliateId { get; set; }
public bool IsDisabled { get; set; }
public List<DashboardConversation> DashboardConversations { get; set; } = [];
public DateTime UpdatedTime { get; set; } = DateTime.UtcNow;
public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
}

42
src/Infrastructure/BotSharp.Core/Repository/FileRepository/FileRepository.User.cs
View file

@ -82,6 +82,8 @@ public partial class FileRepository
// one user only has one dashboard currently
var dash = Dashboards.FirstOrDefault();
dash ??= new();
var existingConv = dash.ConversationList.FirstOrDefault(x => string.Equals(x.ConversationId, conversationId, StringComparison.OrdinalIgnoreCase));
if (existingConv != null) return;
var dashconv = new DashboardConversation
{
@ -95,4 +97,44 @@ public partial class FileRepository
var path = Path.Combine(dir, DASHBOARD_FILE);
File.WriteAllText(path, JsonSerializer.Serialize(dash, _options));
}
public void RemoveDashboardConversation(string userId, string conversationId)
{
var user = GetUserById(userId);
if (user == null) return;
// one user only has one dashboard currently
var dash = Dashboards.FirstOrDefault();
if (dash == null) return;
var dashconv = dash.ConversationList.FirstOrDefault(
c => string.Equals(c.ConversationId, conversationId, StringComparison.OrdinalIgnoreCase));
if (dashconv == null) return;
dash.ConversationList.Remove(dashconv);
var dir = Path.Combine(_dbSettings.FileRepository, USERS_FOLDER, userId);
var path = Path.Combine(dir, DASHBOARD_FILE);
File.WriteAllText(path, JsonSerializer.Serialize(dash, _options));
}
public void UpdateDashboardConversation(string userId, DashboardConversation dashConv)
{
var user = GetUserById(userId);
if (user == null) return;
// one user only has one dashboard currently
var dash = Dashboards.FirstOrDefault();
if (dash == null) return;
var curIdx = dash.ConversationList.ToList().FindIndex(
x => string.Equals(x.ConversationId, dashConv.ConversationId, StringComparison.OrdinalIgnoreCase));
if (curIdx < 0) return;
dash.ConversationList[curIdx] = dashConv;
var dir = Path.Combine(_dbSettings.FileRepository, USERS_FOLDER, userId);
var path = Path.Combine(dir, DASHBOARD_FILE);
File.WriteAllText(path, JsonSerializer.Serialize(dash, _options));
}
}

21
src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
View file

@ -649,6 +649,27 @@ public class UserService : IUserService
await Task.CompletedTask;
return true;
}
public async Task<bool> RemoveDashboardConversation(string userId, string conversationId)
{
var db = _services.GetRequiredService<IBotSharpRepository>();
db.RemoveDashboardConversation(userId, conversationId);
await Task.CompletedTask;
return true;
}
public async Task UpdateDashboardConversation(string userId, DashboardConversation newDashConv)
{
var db = _services.GetRequiredService<IBotSharpRepository>();
var dashConv = db.GetDashboard(userId)?.ConversationList.FirstOrDefault(x => string.Equals(x.ConversationId, newDashConv.ConversationId));
if (dashConv == null) return;
dashConv.Name = newDashConv.Name ?? dashConv.Name;
dashConv.Instruction = newDashConv.Instruction ?? dashConv.Instruction;
db.UpdateDashboardConversation(userId, dashConv);
await Task.CompletedTask;
return;
}
public async Task<Dashboard?> GetDashboard(string userId)
{

12
src/Infrastructure/BotSharp.OpenAPI/Controllers/ConversationController.cs
View file

@ -491,7 +491,7 @@ public class ConversationController : ControllerBase
#endregion
#region miscellaneous
[HttpPut("/agent/{agentId}/conversation/{conversationId}/PinToDashboard")]
[HttpPut("/agent/{agentId}/conversation/{conversationId}/dashboard")]
public async Task<bool> PinConversationToDashboard([FromRoute] string agentId, [FromRoute] string conversationId)
{
var userService = _services.GetRequiredService<IUserService>();
@ -500,6 +500,16 @@ public class ConversationController : ControllerBase
var pinned = await userService.AddDashboardConversation(user.Id, conversationId);
return pinned;
}
[HttpDelete("/agent/{agentId}/conversation/{conversationId}/dashboard")]
public async Task<bool> UnpinConversationFromDashboard([FromRoute] string agentId, [FromRoute] string conversationId)
{
var userService = _services.GetRequiredService<IUserService>();
var user = await userService.GetUser(_user.Id);
var unpinned = await userService.RemoveDashboardConversation(user.Id, conversationId);
return unpinned;
}
#endregion
#region Private methods

26
src/Infrastructure/BotSharp.OpenAPI/Controllers/DashboardController.cs
View file

@ -43,5 +43,31 @@ public class DashboardController : ControllerBase
};
return result;
}
[HttpPost("/dashboard/component/conversation")]
public async Task UpdateDashboardConversationInstruction(string userId, UserDashboardConversationModel dashConv)
{
if (string.IsNullOrEmpty(dashConv.Name) && string.IsNullOrEmpty(dashConv.Instruction))
{
return;
}
var newDashConv = new DashboardConversation
{
Id = Guid.Empty.ToString(),
ConversationId = dashConv.ConversationId
};
if (!string.IsNullOrEmpty(dashConv.Name))
{
newDashConv.Name = dashConv.Name;
}
if (!string.IsNullOrEmpty(dashConv.Instruction))
{
newDashConv.Instruction = dashConv.Instruction;
}
var userService = _services.GetRequiredService<IUserService>();
await userService.UpdateDashboardConversation(userId, newDashConv);
return;
}
#endregion
}

2
src/Plugins/BotSharp.Plugin.MongoStorage/Collections/UserDocument.cs
View file

@ -23,6 +23,8 @@ public class UserDocument : MongoBase
public DateTime CreatedTime { get; set; }
public DateTime UpdatedTime { get; set; }
public Dashboard? Dashboard { get; set; }
public User ToUser()
{
return new User

47
src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.User.cs
View file

@ -146,4 +146,51 @@ public partial class MongoRepository
UpdateUserIsDisable(userId, isDisable);
}
}
public void AddDashboardConversation(string userId, string conversationId)
{
var user = _dc.Users.AsQueryable()
.FirstOrDefault(x => x.Id == userId || (x.ExternalId != null && x.ExternalId == userId));
if (user == null) return;
var curDash = user.Dashboard ?? new Dashboard();
curDash.ConversationList.Add(new DashboardConversation
{
Id = Guid.NewGuid().ToString(),
ConversationId = conversationId
});
var filter = Builders<UserDocument>.Filter.Eq(x => x.Id, userId);
var update = Builders<UserDocument>.Update.Set(x => x.Dashboard, curDash)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
}
public void RemoveDashboardConversation(string userId, string conversationId)
{
var user = _dc.Users.AsQueryable()
.FirstOrDefault(x => x.Id == userId || (x.ExternalId != null && x.ExternalId == userId));
if (user == null || user.Dashboard == null || user.Dashboard.ConversationList.IsNullOrEmpty()) return;
var curDash = user.Dashboard;
var unpinConv = user.Dashboard.ConversationList.FirstOrDefault(
x => string.Equals(x.ConversationId, conversationId, StringComparison.OrdinalIgnoreCase));
if (unpinConv == null) return;
curDash.ConversationList.Remove(unpinConv);
var filter = Builders<UserDocument>.Filter.Eq(x => x.Id, userId);
var update = Builders<UserDocument>.Update.Set(x => x.Dashboard, curDash)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
}
public void UpdateDashboardConversation(string userId, DashboardConversation dashConv)
{
var user = _dc.Users.AsQueryable()
.FirstOrDefault(x => x.Id == userId || (x.ExternalId != null && x.ExternalId == userId));
if (user == null || user.Dashboard == null || user.Dashboard.ConversationList.IsNullOrEmpty()) return;
var curIdx = user.Dashboard.ConversationList.ToList().FindIndex(
x => string.Equals(x.ConversationId, dashConv.ConversationId, StringComparison.OrdinalIgnoreCase));
if (curIdx < 0) return;
var filter = Builders<UserDocument>.Filter.Eq(x => x.Id, userId);
var update = Builders<UserDocument>.Update.Set(x => x.Dashboard.ConversationList[curIdx], dashConv)
.Set(x => x.UpdatedTime, DateTime.UtcNow);
}
}