From 524afdf05fcd98b86a4700d854eb999c681f6676 Mon Sep 17 00:00:00 2001
From: wzh425 <wuzihao425@outlook.com>
Date: Mon, 3 Jul 2023 13:40:44 +0800
Subject: [PATCH] reactor : User search using Auth sdk

---
 .../Dtos/Subjects/UserSelectDto.cs            | 46 -------------------
 .../Modules/Subjects/UserAutoComplete.razor   |  2 +-
 .../Subjects/UserAutoComplete.razor.cs        | 22 +++------
 .../Modules/SendTestMessageModal.razor.cs     |  2 +-
 4 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 src/Contracts/Masa.Mc.Contracts.Admin/Dtos/Subjects/UserSelectDto.cs

diff --git a/src/Contracts/Masa.Mc.Contracts.Admin/Dtos/Subjects/UserSelectDto.cs b/src/Contracts/Masa.Mc.Contracts.Admin/Dtos/Subjects/UserSelectDto.cs
deleted file mode 100644
index 30e9848c..00000000
--- a/src/Contracts/Masa.Mc.Contracts.Admin/Dtos/Subjects/UserSelectDto.cs
+++ /dev/null
@@ -1,46 +0,0 @@
-// Copyright (c) MASA Stack All rights reserved.
-// Licensed under the Apache License. See LICENSE.txt in the project root for license information.
-
-namespace Masa.Mc.Contracts.Admin.Dtos.Subjects;
-
-public class UserSelectDto : AutoCompleteDocument
-{
-    public Guid Id { get; set; }
-
-    public string? Name { get; set; }
-
-    public string DisplayName { get; set; }
-
-    public string Account { get; set; }
-
-    public string? PhoneNumber { get; set; }
-
-    public string? Email { get; set; }
-
-    public string Avatar { get; set; }
-
-    public UserSelectDto()
-    {
-        DisplayName = "";
-        Account = "";
-        Avatar = "";
-    }
-
-    public UserSelectDto(Guid id, string name, string displayName, string account, string phoneNumber, string email, string avatar)
-    {
-        Id = id;
-        Name = name;
-        DisplayName = displayName;
-        Account = account;
-        PhoneNumber = phoneNumber;
-        Email = email;
-        Avatar = avatar;
-    }
-
-    public override string GetDocumentId() => Id.ToString();
-
-    protected override string GetText()
-    {
-        return $"{Name},{Account},{DisplayName},{PhoneNumber},{Email}";
-    }
-}
diff --git a/src/Web/Masa.Mc.Web.Admin/Components/Modules/Subjects/UserAutoComplete.razor b/src/Web/Masa.Mc.Web.Admin/Components/Modules/Subjects/UserAutoComplete.razor
index d718bbed..c8f63bd8 100644
--- a/src/Web/Masa.Mc.Web.Admin/Components/Modules/Subjects/UserAutoComplete.razor
+++ b/src/Web/Masa.Mc.Web.Admin/Components/Modules/Subjects/UserAutoComplete.razor
@@ -3,7 +3,7 @@
 <SAutoComplete Small Value="Value"
                ValueChanged="HandleValueChanged"
                TValue="List<Guid>"
-               TItem="UserSelectDto"
+               TItem="UserSelectModel"
                TItemValue="Guid"
                OnSearchInputUpdate=OnSearchChanged
                Items="Items"
diff --git a/src/Web/Masa.Mc.Web.Admin/Components/Modules/Subjects/UserAutoComplete.razor.cs b/src/Web/Masa.Mc.Web.Admin/Components/Modules/Subjects/UserAutoComplete.razor.cs
index 3e44e623..8e5ce609 100644
--- a/src/Web/Masa.Mc.Web.Admin/Components/Modules/Subjects/UserAutoComplete.razor.cs
+++ b/src/Web/Masa.Mc.Web.Admin/Components/Modules/Subjects/UserAutoComplete.razor.cs
@@ -5,8 +5,6 @@ namespace Masa.Mc.Web.Admin.Components.Modules.Subjects;
 
 public partial class UserAutoComplete : AdminCompontentBase
 {
-    IAutoCompleteClient? _autocompleteClient;
-
     [Parameter]
     public List<Guid> Value { get; set; } = new();
 
@@ -19,18 +17,14 @@ public partial class UserAutoComplete : AdminCompontentBase
     [Parameter]
     public EventCallback<List<Guid>> ValueChanged { get; set; }
 
-    public List<UserSelectDto> Items { get; set; } = new();
+    public List<UserSelectModel> Items { get; set; } = new();
 
-    public List<UserSelectDto> UserSelect { get; set; } = new();
+    public List<UserSelectModel> UserSelect { get; set; } = new();
 
     public string Search { get; set; } = "";
 
     [Inject]
-    public IAutoCompleteClient AutoCompleteClient
-    {
-        get => _autocompleteClient ?? throw new Exception("Please inject IAutoCompleteClient");
-        set => _autocompleteClient = value;
-    }
+    public IAuthClient AuthClient { get; set; } = default!;
 
     public async Task OnSearchChanged(string search)
     {
@@ -41,16 +35,12 @@ public async Task OnSearchChanged(string search)
         }
         else if (Search == search)
         {
-            var response = await AutoCompleteClient.GetBySpecifyDocumentAsync<UserSelectDto>(search, new AutoCompleteOptions
-            {
-                Page = Page,
-                PageSize = PageSize,
-            });
-            Items = response.Data;
+            var response = await AuthClient.UserService.SearchAsync(search);
+            Items = response;
         }
     }
 
-    public string TextView(UserSelectDto user)
+    public string TextView(UserSelectModel user)
     {
         if (!string.IsNullOrEmpty(user.DisplayName)) return user.DisplayName;
         if (!string.IsNullOrEmpty(user.Account)) return user.Account;
diff --git a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/SendTestMessageModal.razor.cs b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/SendTestMessageModal.razor.cs
index 01be66ca..7a0bd42d 100644
--- a/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/SendTestMessageModal.razor.cs
+++ b/src/Web/Masa.Mc.Web.Admin/Pages/MessageTasks/Modules/SendTestMessageModal.razor.cs
@@ -64,7 +64,7 @@ private void HandleUserChange(List<Guid> userId)
         }).ToList();
     }
 
-    private string GetChannelUserIdentity(UserSelectDto user, ChannelTypes? type)
+    private string GetChannelUserIdentity(UserSelectModel user, ChannelTypes? type)
     {
         return type switch
         {