From e6ba0bc351a9c27bf151164dac7cf861f80c0430 Mon Sep 17 00:00:00 2001 From: liangshiwei Date: Mon, 20 Nov 2023 17:29:30 +0800 Subject: [PATCH] Rename GetListByRoleAsync to GetListByRoleIdAsync --- .../Volo/Abp/Identity/IOrganizationUnitRepository.cs | 2 +- .../Volo/Abp/Identity/IdentityRoleManager.cs | 2 +- .../EfCoreOrganizationUnitRepository.cs | 2 +- .../Identity/MongoDB/MongoOrganizationUnitRepository.cs | 2 +- .../Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs | 8 ++++---- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs index 6a938b34bd..4d37887570 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IOrganizationUnitRepository.cs @@ -41,7 +41,7 @@ public interface IOrganizationUnitRepository : IBasicRepository> GetListByRoleAsync( + Task> GetListByRoleIdAsync( Guid roleId, bool includeDetails = false, CancellationToken cancellationToken = default diff --git a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs index c4ad4d2b42..38de74e800 100644 --- a/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs +++ b/modules/identity/src/Volo.Abp.Identity.Domain/Volo/Abp/Identity/IdentityRoleManager.cs @@ -90,7 +90,7 @@ public class IdentityRoleManager : RoleManager, IDomainService } var userIdList = await UserRepository.GetUserIdListByRoleIdAsync(role.Id, cancellationToken: CancellationToken); - var orgList = await OrganizationUnitRepository.GetListByRoleAsync(role.Id, includeDetails: false, cancellationToken: CancellationToken); + var orgList = await OrganizationUnitRepository.GetListByRoleIdAsync(role.Id, includeDetails: false, cancellationToken: CancellationToken); var result = await base.DeleteAsync(role); if (result.Succeeded) { diff --git a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs index e356025475..9086716124 100644 --- a/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.EntityFrameworkCore/Volo/Abp/Identity/EntityFrameworkCore/EfCoreOrganizationUnitRepository.cs @@ -69,7 +69,7 @@ public class EfCoreOrganizationUnitRepository .ToListAsync(GetCancellationToken(cancellationToken)); } - public virtual async Task> GetListByRoleAsync( + public virtual async Task> GetListByRoleIdAsync( Guid roleId, bool includeDetails = false, CancellationToken cancellationToken = default) diff --git a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs index 58324dc11c..f085b2eedc 100644 --- a/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs +++ b/modules/identity/src/Volo.Abp.Identity.MongoDB/Volo/Abp/Identity/MongoDB/MongoOrganizationUnitRepository.cs @@ -53,7 +53,7 @@ public class MongoOrganizationUnitRepository .ToListAsync(GetCancellationToken(cancellationToken)); } - public virtual async Task> GetListByRoleAsync( + public virtual async Task> GetListByRoleIdAsync( Guid roleId, bool includeDetails = false, CancellationToken cancellationToken = default) diff --git a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs index b0daef8c05..8746c3a1fd 100644 --- a/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs +++ b/modules/identity/test/Volo.Abp.Identity.TestBase/Volo/Abp/Identity/OrganizationUnitRepository_Tests.cs @@ -67,19 +67,19 @@ public abstract class OrganizationUnitRepository_Tests : AbpIden } [Fact] - public async Task GetListByRoleAsync() + public async Task GetListByRoleIdAsync() { - var ous = await _organizationUnitRepository.GetListByRoleAsync(_testData.RoleManagerId); + var ous = await _organizationUnitRepository.GetListByRoleIdAsync(_testData.RoleManagerId); ous.Count.ShouldBe(2); ous.ShouldContain(ou => ou.DisplayName == "OU111"); ous.ShouldContain(ou => ou.DisplayName == "OU222"); - ous = await _organizationUnitRepository.GetListByRoleAsync(_testData.RoleModeratorId); + ous = await _organizationUnitRepository.GetListByRoleIdAsync(_testData.RoleModeratorId); ous.Count.ShouldBe(2); ous.ShouldContain(ou => ou.DisplayName == "OU111"); ous.ShouldContain(ou => ou.DisplayName == "OU222"); - ous = await _organizationUnitRepository.GetListByRoleAsync(_testData.RoleSaleId); + ous = await _organizationUnitRepository.GetListByRoleIdAsync(_testData.RoleSaleId); ous.Count.ShouldBe(0); }