From e5c62945cf718ef55e7f3383a9a739154958bd3b Mon Sep 17 00:00:00 2001 From: Jimmy Vo Date: Tue, 15 Apr 2025 15:32:25 -0400 Subject: [PATCH] [PM-15621] Update the remaining names to 'claimed'. --- ...teClaimedOrganizationUserAccountCommand.cs | 30 ++++++------------- ...ClaimedOrganizationUserAccountValidator.cs | 2 +- .../DeleteUserValidationRequest.cs | 2 +- 3 files changed, 11 insertions(+), 23 deletions(-) diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteClaimedOrganizationUserAccountCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteClaimedOrganizationUserAccountCommand.cs index f6eac2b293..4a47b2ebbf 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteClaimedOrganizationUserAccountCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteClaimedOrganizationUserAccountCommand.cs @@ -25,14 +25,13 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz private readonly IUserService _userService; private readonly IEventService _eventService; private readonly IGetOrganizationUsersClaimedStatusQuery _getOrganizationUsersClaimedStatusQuery; - private readonly IDeleteClaimedOrganizationUserAccountValidator _deleteManagedOrganizationUserAccountValidator; + private readonly IDeleteClaimedOrganizationUserAccountValidator _deleteClaimedOrganizationUserAccountValidator; private readonly ILogger _logger; private readonly IOrganizationUserRepository _organizationUserRepository; private readonly IUserRepository _userRepository; private readonly ICurrentContext _currentContext; private readonly IReferenceEventService _referenceEventService; private readonly IPushNotificationService _pushService; - private readonly IProviderUserRepository _providerUserRepository; public DeleteClaimedOrganizationUserAccountCommand( IUserService userService, IEventService eventService, @@ -44,7 +43,7 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz IPushNotificationService pushService, IProviderUserRepository providerUserRepository, ILogger logger, - IDeleteClaimedOrganizationUserAccountValidator deleteManagedOrganizationUserAccountValidator) + IDeleteClaimedOrganizationUserAccountValidator deleteClaimedOrganizationUserAccountValidator) { _userService = userService; _eventService = eventService; @@ -54,9 +53,8 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz _currentContext = currentContext; _referenceEventService = referenceEventService; _pushService = pushService; - _providerUserRepository = providerUserRepository; _logger = logger; - _deleteManagedOrganizationUserAccountValidator = deleteManagedOrganizationUserAccountValidator; + _deleteClaimedOrganizationUserAccountValidator = deleteClaimedOrganizationUserAccountValidator; } public async Task> DeleteUserAsync(Guid organizationId, Guid organizationUserId, Guid deletingUserId) @@ -94,10 +92,10 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz { var orgUsers = await _organizationUserRepository.GetManyAsync(orgUserIds); var users = await GetUsersAsync(orgUsers); - var managementStatuses = await _getOrganizationUsersClaimedStatusQuery.GetUsersOrganizationClaimedStatusAsync(organizationId, orgUserIds); + var claimedStatuses = await _getOrganizationUsersClaimedStatusQuery.GetUsersOrganizationClaimedStatusAsync(organizationId, orgUserIds); - var requests = CreateRequests(organizationId, deletingUserId, orgUserIds, orgUsers, users, managementStatuses); - var results = await _deleteManagedOrganizationUserAccountValidator.ValidateAsync(requests); + var requests = CreateRequests(organizationId, deletingUserId, orgUserIds, orgUsers, users, claimedStatuses); + var results = await _deleteClaimedOrganizationUserAccountValidator.ValidateAsync(requests); await CancelPremiumsAsync(results.ValidResults); await HandleUserDeletionsAsync(results.ValidResults); @@ -112,37 +110,27 @@ public class DeleteClaimedOrganizationUserAccountCommand : IDeleteClaimedOrganiz IEnumerable orgUserIds, ICollection orgUsers, IEnumerable users, - IDictionary managementStatuses) + IDictionary claimedStatuses) { var requests = new List(); foreach (var orgUserId in orgUserIds) { var orgUser = orgUsers.FirstOrDefault(orgUser => orgUser.Id == orgUserId); var user = users.FirstOrDefault(user => user.Id == orgUser?.UserId); - managementStatuses.TryGetValue(orgUserId, out var isManaged); + claimedStatuses.TryGetValue(orgUserId, out var isClaimed); requests.Add(new DeleteUserValidationRequest { User = user, OrganizationUserId = orgUserId, OrganizationUser = orgUser, - IsManaged = isManaged, + IsClaimed = isClaimed, OrganizationId = organizationId, DeletingUserId = deletingUserId, }); } return requests; - // Jimmy move this to the validator - // if (orgUser.Type == OrganizationUserType.Admin && await _currentContext.OrganizationCustom(organizationId)) - // { - // throw new BadRequestException("Custom users can not delete admins."); - // } - - // if (!claimedStatus.TryGetValue(orgUser.Id, out var isClaimed) || !isClaimed) - // { - // throw new BadRequestException("Member is not claimed by the organization."); - // } } private async Task> GetUsersAsync(ICollection orgUsers) diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteClaimedOrganizationUserAccountValidator.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteClaimedOrganizationUserAccountValidator.cs index 03ee67964d..5135c3ab23 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteClaimedOrganizationUserAccountValidator.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteClaimedOrganizationUserAccountValidator.cs @@ -97,7 +97,7 @@ public class DeleteClaimedOrganizationUserAccountValidator( private static ValidationResult EnsureUserIsManagedByOrganization(DeleteUserValidationRequest request) { - if (request.IsManaged == true) + if (request.IsClaimed == true) { return new Valid(); } diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteUserValidationRequest.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteUserValidationRequest.cs index d8500e982a..cb1d701fd7 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteUserValidationRequest.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/DeleteUserValidationRequest.cs @@ -10,5 +10,5 @@ public class DeleteUserValidationRequest public OrganizationUser? OrganizationUser { get; init; } public User? User { get; init; } public Guid DeletingUserId { get; init; } - public bool? IsManaged { get; init; } + public bool? IsClaimed { get; init; } }