Skip to content

fix:update auth sdk #613

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
May 10, 2023
Merged

fix:update auth sdk #613

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c354aa7
fix:update auth sdk
MayueCif May 10, 2023
3a63d4e
feat:add new
MayueCif May 10, 2023
08133f4
feat:crot update
MayueCif May 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions ...ocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth.Contracts/Model/TeamDetailModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,17 +15,19 @@ public class TeamDetailModel

public TeamTypes TeamType { get; set; }

public List<StaffModel> Admins { get; set; }
public List<StaffModel> Admins { get; set; } = new();

public List<StaffModel> Members { get; set; }
public List<StaffModel> Members { get; set; } = new();

public List<RoleModel> AdminRoles { get; set; } = new();

public List<RoleModel> MemberRoles { get; set; } = new();

public TeamDetailModel()
{
Name = "";
Avatar = "";
Description = "";
Admins = new();
Members = new();
}

public TeamDetailModel(
Expand Down
2 changes: 1 addition & 1 deletion src/BuildingBlocks/StackSdks/Auth/Masa.BuildingBlocks.StackSdks.Auth/Service/IUserService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ public interface IUserService
{
Task<List<StaffModel>> GetListByTeamAsync(Guid teamId);

Task<List<StaffModel>> GetListByRoleAsync(Guid roleId);
Task<List<UserModel>> GetListByRoleAsync(Guid roleId);

Task<List<StaffModel>> GetListByDepartmentAsync(Guid departmentId);

Expand Down
6 changes: 3 additions & 3 deletions src/Contrib/StackSdks/Masa.Contrib.StackSdks.Auth/Service/UserService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,10 @@ public async Task<List<StaffModel>> GetListByDepartmentAsync(Guid departmentId)
return await _caller.GetAsync<object, List<StaffModel>>(requestUri, new { id = departmentId }) ?? new();
}

public async Task<List<StaffModel>> GetListByRoleAsync(Guid roleId)
public async Task<List<UserModel>> GetListByRoleAsync(Guid roleId)
{
var requestUri = $"api/staff/getListByRole";
return await _caller.GetAsync<object, List<StaffModel>>(requestUri, new { id = roleId }) ?? new();
var requestUri = $"api/user/getListByRole";
return await _caller.GetAsync<object, List<UserModel>>(requestUri, new { id = roleId }) ?? new();
}

public async Task<List<StaffModel>> GetListByTeamAsync(Guid teamId)
Expand Down
10 changes: 5 additions & 5 deletions src/Contrib/StackSdks/Tests/Masa.Contrib.StackSdks.Auth.Tests/UserServiceTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,17 +113,17 @@ public async Task TestGetListByTeamAsync()
[TestMethod]
public async Task TestGetListByRoleAsync()
{
var data = new List<StaffModel>()
var data = new List<UserModel>()
{
new StaffModel()
new UserModel()
};
Guid roleId = Guid.NewGuid();
var requestUri = $"api/staff/getListByRole";
var requestUri = $"api/user/getListByRole";
var caller = new Mock<ICaller>();
caller.Setup(provider => provider.GetAsync<object, List<StaffModel>>(requestUri, It.IsAny<object>(), default)).ReturnsAsync(data).Verifiable();
caller.Setup(provider => provider.GetAsync<object, List<UserModel>>(requestUri, It.IsAny<object>(), default)).ReturnsAsync(data).Verifiable();
var userService = GetUserService(caller);
var result = await userService.GetListByRoleAsync(roleId);
caller.Verify(provider => provider.GetAsync<object, List<StaffModel>>(requestUri, It.IsAny<object>(), default), Times.Once);
caller.Verify(provider => provider.GetAsync<object, List<UserModel>>(requestUri, It.IsAny<object>(), default), Times.Once);
Assert.IsTrue(result.Count == 1);
}

Expand Down