From adf3c1fcba81f92068bc6dee101da72cb32ef25f Mon Sep 17 00:00:00 2001 From: Jimmy Vo Date: Tue, 4 Feb 2025 15:09:26 -0500 Subject: [PATCH] [PM-15621] Address code quality issues. --- ...eleteManagedOrganizationUserAccountCommand.cs | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteManagedOrganizationUserAccountCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteManagedOrganizationUserAccountCommand.cs index 5e8139a034..c0c8d32530 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteManagedOrganizationUserAccountCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteManagedOrganizationUserAccountCommand.cs @@ -61,7 +61,7 @@ public class DeleteManagedOrganizationUserAccountCommand : IDeleteManagedOrganiz public async Task> DeleteManyUsersAsync(Guid organizationId, IEnumerable orgUserIds, Guid? deletingUserId) { var orgUsers = await _organizationUserRepository.GetManyAsync(orgUserIds); - var users = await GetUsers(orgUsers); + var users = await GetUsersAsync(orgUsers); var managementStatus = await _getOrganizationUsersManagementStatusQuery.GetUsersOrganizationManagementStatusAsync(organizationId, orgUserIds); var hasOtherConfirmedOwners = await _hasConfirmedOwnersExceptQuery.HasConfirmedOwnersExceptAsync(organizationId, orgUserIds, includeProvider: true); @@ -99,7 +99,7 @@ public class DeleteManagedOrganizationUserAccountCommand : IDeleteManagedOrganiz } } - await HandleUserDeletions(userDeletionResults); + await HandleUserDeletionsAsync(userDeletionResults); await LogDeletedOrganizationUsersAsync(userDeletionResults); @@ -108,7 +108,7 @@ public class DeleteManagedOrganizationUserAccountCommand : IDeleteManagedOrganiz .ToList(); } - private async Task> GetUsers(ICollection orgUsers) + private async Task> GetUsersAsync(ICollection orgUsers) { var userIds = orgUsers .Where(orgUser => orgUser.UserId.HasValue) @@ -131,14 +131,14 @@ public class DeleteManagedOrganizationUserAccountCommand : IDeleteManagedOrganiz await EnsureUserIsNotSoleOrganizationOwnerAsync(user); await EnsureUserIsNotSoleProviderOwnerAsync(user); } - private void EnsureUserStatusIsNotInvited(OrganizationUser orgUser) + private static void EnsureUserStatusIsNotInvited(OrganizationUser orgUser) { if (!orgUser.UserId.HasValue || orgUser.Status == OrganizationUserStatusType.Invited) { throw new BadRequestException("You cannot delete a member with Invited status."); } } - private void PreventSelfDeletion(OrganizationUser orgUser, Guid? deletingUserId) + private static void PreventSelfDeletion(OrganizationUser orgUser, Guid? deletingUserId) { if (!(orgUser.UserId.HasValue && deletingUserId.HasValue)) { @@ -163,7 +163,7 @@ public class DeleteManagedOrganizationUserAccountCommand : IDeleteManagedOrganiz } } - private void PreventOrganizationSoleOwnerDeletion(OrganizationUser orgUser, bool hasOtherConfirmedOwners) + private static void PreventOrganizationSoleOwnerDeletion(OrganizationUser orgUser, bool hasOtherConfirmedOwners) { if (orgUser.Type != OrganizationUserType.Owner) { @@ -176,7 +176,7 @@ public class DeleteManagedOrganizationUserAccountCommand : IDeleteManagedOrganiz } } - private void EnsureUserIsManagedByOrganization(OrganizationUser orgUser, IDictionary managementStatus) + private static void EnsureUserIsManagedByOrganization(OrganizationUser orgUser, IDictionary managementStatus) { if (!managementStatus.TryGetValue(orgUser.Id, out var isManaged) || !isManaged) { @@ -218,7 +218,7 @@ public class DeleteManagedOrganizationUserAccountCommand : IDeleteManagedOrganiz await _eventService.LogOrganizationUserEventsAsync(events); } } - private async Task HandleUserDeletions(List<(Guid OrganizationUserId, OrganizationUser? orgUser, User? user, string? ErrorMessage)> userDeletionResults) + private async Task HandleUserDeletionsAsync(List<(Guid OrganizationUserId, OrganizationUser? orgUser, User? user, string? ErrorMessage)> userDeletionResults) { var usersToDelete = userDeletionResults .Where(result =>