From c354aa7c9579d4265e004f752282fc31ab0780df Mon Sep 17 00:00:00 2001 From: Mayue Date: Wed, 10 May 2023 13:29:13 +0800 Subject: [PATCH 1/3] fix:update auth sdk --- .../Model/TeamDetailModel.cs | 4 ++++ .../Service/IUserService.cs | 2 +- .../Masa.Contrib.StackSdks.Auth/Service/UserService.cs | 6 +++--- .../UserServiceTest.cs | 10 +++++----- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs index a4ba3acdc..4e3144d7d 100644 --- a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs +++ b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs @@ -19,6 +19,10 @@ public class TeamDetailModel public List Members { get; set; } + public List AdminRoles { get; set; } + + public List MemberRoles { get; set; } + public TeamDetailModel() { Name = ""; diff --git a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/IUserService.cs b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/IUserService.cs index 9ef4dd96a..6c8765718 100644 --- a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/IUserService.cs +++ b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/IUserService.cs @@ -7,7 +7,7 @@ public interface IUserService { Task> GetListByTeamAsync(Guid teamId); - Task> GetListByRoleAsync(Guid roleId); + Task> GetListByRoleAsync(Guid roleId); Task> GetListByDepartmentAsync(Guid departmentId); diff --git a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Service/UserService.cs b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Service/UserService.cs index 235d435aa..2688d404e 100644 --- a/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Service/UserService.cs +++ b/src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Service/UserService.cs @@ -40,10 +40,10 @@ public async Task> GetListByDepartmentAsync(Guid departmentId) return await _caller.GetAsync>(requestUri, new { id = departmentId }) ?? new(); } - public async Task> GetListByRoleAsync(Guid roleId) + public async Task> GetListByRoleAsync(Guid roleId) { - var requestUri = $"api/staff/getListByRole"; - return await _caller.GetAsync>(requestUri, new { id = roleId }) ?? new(); + var requestUri = $"api/user/getListByRole"; + return await _caller.GetAsync>(requestUri, new { id = roleId }) ?? new(); } public async Task> GetListByTeamAsync(Guid teamId) diff --git a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/UserServiceTest.cs b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/UserServiceTest.cs index e52d5bfd8..b934c5b2e 100644 --- a/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/UserServiceTest.cs +++ b/src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/UserServiceTest.cs @@ -113,17 +113,17 @@ public async Task TestGetListByTeamAsync() [TestMethod] public async Task TestGetListByRoleAsync() { - var data = new List() + var data = new List() { - new StaffModel() + new UserModel() }; Guid roleId = Guid.NewGuid(); - var requestUri = $"api/staff/getListByRole"; + var requestUri = $"api/user/getListByRole"; var caller = new Mock(); - caller.Setup(provider => provider.GetAsync>(requestUri, It.IsAny(), default)).ReturnsAsync(data).Verifiable(); + caller.Setup(provider => provider.GetAsync>(requestUri, It.IsAny(), default)).ReturnsAsync(data).Verifiable(); var userService = GetUserService(caller); var result = await userService.GetListByRoleAsync(roleId); - caller.Verify(provider => provider.GetAsync>(requestUri, It.IsAny(), default), Times.Once); + caller.Verify(provider => provider.GetAsync>(requestUri, It.IsAny(), default), Times.Once); Assert.IsTrue(result.Count == 1); } From 3a63d4e40c166266c508ca057fbaba83da7aa58a Mon Sep 17 00:00:00 2001 From: Mayue Date: Wed, 10 May 2023 13:30:51 +0800 Subject: [PATCH 2/3] feat:add new --- .../Model/TeamDetailModel.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs index 4e3144d7d..d4c29e5b5 100644 --- a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs +++ b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs @@ -15,13 +15,13 @@ public class TeamDetailModel public TeamTypes TeamType { get; set; } - public List Admins { get; set; } + public List Admins { get; set; } = new(); - public List Members { get; set; } + public List Members { get; set; } = new(); - public List AdminRoles { get; set; } + public List AdminRoles { get; set; } = new(); - public List MemberRoles { get; set; } + public List MemberRoles { get; set; } = new(); public TeamDetailModel() { From 08133f4e72aa853ef3fd63932db9d2ff830f79e0 Mon Sep 17 00:00:00 2001 From: Mayue Date: Wed, 10 May 2023 13:32:23 +0800 Subject: [PATCH 3/3] feat:crot update --- .../Model/TeamDetailModel.cs | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs index d4c29e5b5..00de46cec 100644 --- a/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs +++ b/src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs @@ -28,8 +28,6 @@ public TeamDetailModel() Name = ""; Avatar = ""; Description = ""; - Admins = new(); - Members = new(); } public TeamDetailModel(