Merge pull request #655 from Qtoss-AI/master

improvement

Author: Oceania2018

src/Infrastructure/BotSharp.Abstraction/Knowledges/IKnowledgeHook.cs

@@ -5,7 +5,7 @@ public interface IKnowledgeHook
     Task<List<KnowledgeChunk>> CollectChunkedKnowledge()
         => Task.FromResult(new List<KnowledgeChunk>());
 
-    Task<List<string>> GetRelevantKnowledges()
+    Task<List<string>> GetRelevantKnowledges(string text)
         => Task.FromResult(new List<string>());
 
     Task<List<string>> GetGlobalKnowledges()

src/Infrastructure/BotSharp.Abstraction/Knowledges/IKnowledgeService.cs

@@ -15,6 +15,7 @@ public interface IKnowledgeService
     Task<bool> DeleteVectorCollectionAllData(string collectionName);
     Task<bool> CreateVectorCollectionData(string collectionName, VectorCreateModel create);
     Task<bool> UpdateVectorCollectionData(string collectionName, VectorUpdateModel update);
+    Task<bool> UpsertVectorCollectionData(string collectionName, VectorUpdateModel update);
     #endregion
 
     #region Graph

src/Infrastructure/BotSharp.Abstraction/Messaging/Models/RichContent/Template/GenericTemplateMessage.cs

@@ -5,6 +5,9 @@ public class GenericTemplateMessage<T> : IRichMessage, ITemplateMessage
     [JsonPropertyName("rich_type")]
     public string RichType => RichTypeEnum.GenericTemplate;
 
+    /// <summary>
+    /// Use model refined content if leaving blank
+    /// </summary>
     [JsonPropertyName("text")]
     [Translate]
     public string Text { get; set; } = string.Empty;

src/Infrastructure/BotSharp.Abstraction/Planning/IPlanningHook.cs

@@ -4,6 +4,7 @@ public interface IPlanningHook
 {
     Task<string> GetSummaryAdditionalRequirements(string planner)
         => Task.FromResult(string.Empty);
+
     Task OnPlanningCompleted(string planner, RoleDialogModel msg)
         => Task.CompletedTask;
 }

src/Infrastructure/BotSharp.Abstraction/Repositories/IBotSharpRepository.cs

@@ -21,14 +21,18 @@ public interface IBotSharpRepository
     #region User
     User? GetUserByEmail(string email) => throw new NotImplementedException();
     User? GetUserByPhone(string phone) => throw new NotImplementedException();
-    User? GetUserById(string id) => throw new NotImplementedException();
+    User? GetAffiliateUserByPhone(string phone) => throw new NotImplementedException();
+    User? GetUserById(string id) => throw new NotImplementedException();   
+    List<User> GetUserByIds(List<string> ids) => throw new NotImplementedException();
+    User? GetUserByAffiliateId(string affiliateId) => throw new NotImplementedException();
     User? GetUserByUserName(string userName) => throw new NotImplementedException();
     void CreateUser(User user) => throw new NotImplementedException();
     void UpdateUserVerified(string userId) => 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();
     void UpdateUserPhone(string userId, string Iphone) => throw new NotImplementedException();
+    void UpdateUserIsDisable(string userId, bool isDisable) => throw new NotImplementedException();
     #endregion
 
     #region Agent

src/Infrastructure/BotSharp.Abstraction/Users/Enums/UserRole.cs

@@ -13,9 +13,9 @@ public class UserRole
     public const string CSR = "csr";
 
     /// <summary>
-    /// Client
+    /// Authorized user
     /// </summary>
-    public const string Client = "client";
+    public const string User = "user";
 
     /// <summary>
     /// Back office operations

src/Infrastructure/BotSharp.Abstraction/Users/Enums/UserSource.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace BotSharp.Abstraction.Users.Enums
+{
+    public static class UserSource
+    {
+        public const string Internal = "internal";
+    }
+}

src/Infrastructure/BotSharp.Abstraction/Users/Enums/UserType.cs

@@ -0,0 +1,8 @@
+namespace BotSharp.Abstraction.Users.Enums;
+
+public class UserType
+{
+    public const string Internal = "internal";
+    public const string Client = "client";
+    public const string Affiliate = "affiliate";
+}

src/Infrastructure/BotSharp.Abstraction/Users/IUserService.cs

@@ -8,6 +8,7 @@ public interface IUserService
     Task<User> GetUser(string id);
     Task<User> CreateUser(User user);
     Task<Token> ActiveUser(UserActivationModel model);
+    Task<Token?> GetAffiliateToken(string authorization);
     Task<Token?> GetToken(string authorization);
     Task<User> GetMyProfile();
     Task<bool> VerifyUserNameExisting(string userName);
@@ -16,4 +17,6 @@ public interface IUserService
     Task<bool> ResetUserPassword(User user);
     Task<bool> ModifyUserEmail(string email);
     Task<bool> ModifyUserPhone(string phone);
+    Task<bool> UpdatePassword(string newPassword, string verificationCode);
+    Task<DateTime> GetUserTokenExpires();
 }

src/Infrastructure/BotSharp.Abstraction/Users/Models/User.cs

@@ -12,11 +12,17 @@ public class User
     public string? Phone { get; set; }
     public string Salt { get; set; } = string.Empty;
     public string Password { get; set; } = string.Empty;
-    public string Source { get; set; } = "internal";
+    public string Source { get; set; } = UserSource.Internal;
     public string? ExternalId { get; set; }
-    public string Role { get; set; } = UserRole.Client;
+    /// <summary>
+    /// internal, client, affiliate
+    /// </summary>
+    public string Type { get; set; } = UserType.Client;
+    public string Role { get; set; } = UserRole.User;
     public string? VerificationCode { get; set; }
     public bool Verified { get; set; }
+    public string? AffiliateId { get; set; }
+    public bool IsDisabled { get; set; }
     public DateTime UpdatedTime { get; set; } = DateTime.UtcNow;
     public DateTime CreatedTime { get; set; } = DateTime.UtcNow;
 }