From 94fc71ebd9cd75c8a09442565756e8a6cb089238 Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 15 May 2025 17:11:34 -0400 Subject: [PATCH] remove orgId param to use id already in request --- .../OrganizationUsers/ImportOrganizationUserCommand.cs | 2 +- .../InviteUsers/IInviteOrganizationUsersCommand.cs | 2 +- .../InviteUsers/InviteOrganizationUsersCommand.cs | 8 ++++---- .../ImportOrganizationUserCommandTests.cs | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs index 0cb6178de2..a39b867a92 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs @@ -215,7 +215,7 @@ public class ImportOrganizationUserCommand : IImportOrganizationUserCommand var inviteOrganization = new InviteOrganization(organization, plan); var request = new InviteOrganizationUsersRequest(invites.ToArray(), inviteOrganization, organization.Id, DateTimeOffset.UtcNow); - return await _inviteOrganizationUsersCommand.InviteImportedOrganizationUsersAsync(request, organization.Id); + return await _inviteOrganizationUsersCommand.InviteImportedOrganizationUsersAsync(request); } private async Task OverwriteExisting( diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/IInviteOrganizationUsersCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/IInviteOrganizationUsersCommand.cs index c27a803a98..7e8fd4c30a 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/IInviteOrganizationUsersCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/IInviteOrganizationUsersCommand.cs @@ -28,5 +28,5 @@ public interface IInviteOrganizationUsersCommand /// Contains the details for inviting the imported organization users. /// /// Response from InviteOrganiationUsersAsync - Task> InviteImportedOrganizationUsersAsync(InviteOrganizationUsersRequest request, Guid organizationId); + Task> InviteImportedOrganizationUsersAsync(InviteOrganizationUsersRequest request); } diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs index da48a43fef..ba53cbf9cc 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/InviteUsers/InviteOrganizationUsersCommand.cs @@ -77,7 +77,7 @@ public class InviteOrganizationUsersCommand(IEventService eventService, } } - public async Task> InviteImportedOrganizationUsersAsync(InviteOrganizationUsersRequest request, Guid organizationId) + public async Task> InviteImportedOrganizationUsersAsync(InviteOrganizationUsersRequest request) { var result = await InviteOrganizationUsersAsync(request); @@ -87,7 +87,7 @@ public class InviteOrganizationUsersCommand(IEventService eventService, return new Failure( new Error( failure.Error.Message, - new InviteOrganizationUsersResponse(failure.Error.ErroredValue.InvitedUsers, organizationId) + new InviteOrganizationUsersResponse(failure.Error.ErroredValue.InvitedUsers, request.InviteOrganization.OrganizationId) ) ); @@ -101,13 +101,13 @@ public class InviteOrganizationUsersCommand(IEventService eventService, await eventService.LogOrganizationUserEventsAsync(events); - return new Success(new InviteOrganizationUsersResponse(success.Value.InvitedUsers, organizationId) + return new Success(new InviteOrganizationUsersResponse(success.Value.InvitedUsers, request.InviteOrganization.OrganizationId) ); default: return new Failure( new InvalidResultTypeError( - new InviteOrganizationUsersResponse(organizationId))); + new InviteOrganizationUsersResponse(request.InviteOrganization.OrganizationId))); } } diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommandTests.cs index ac308bf8fd..41a8dc69d2 100644 --- a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommandTests.cs @@ -57,13 +57,13 @@ public class ImportOrganizationUserCommandTests sutProvider.GetDependency().GetManyDetailsByOrganizationAsync(org.Id).Returns(existingUsers); sutProvider.GetDependency().GetCountByOrganizationIdAsync(org.Id).Returns(existingUsers.Count); sutProvider.GetDependency().ManageUsers(org.Id).Returns(true); - sutProvider.GetDependency().InviteImportedOrganizationUsersAsync(Arg.Any(), org.Id) + sutProvider.GetDependency().InviteImportedOrganizationUsersAsync(Arg.Any()) .Returns(new Success(new InviteOrganizationUsersResponse(org.Id))); await sutProvider.Sut.ImportAsync(org.Id, newGroups, newUsers, new List(), false, EventSystemUser.PublicApi); await sutProvider.GetDependency().Received(1) - .InviteImportedOrganizationUsersAsync(Arg.Any(), org.Id); + .InviteImportedOrganizationUsersAsync(Arg.Any()); await sutProvider.GetDependency().DidNotReceiveWithAnyArgs() .UpsertAsync(default); await sutProvider.GetDependency().Received(1) @@ -109,7 +109,7 @@ public class ImportOrganizationUserCommandTests sutProvider.GetDependency().GetManyDetailsByOrganizationAsync(org.Id).Returns(existingUsers); sutProvider.GetDependency().GetCountByOrganizationIdAsync(org.Id).Returns(existingUsers.Count); sutProvider.GetDependency().GetManyAsync(Arg.Any>()).Returns(new List { new OrganizationUser { Id = reInvitedUser.Id } }); - sutProvider.GetDependency().InviteImportedOrganizationUsersAsync(Arg.Any(), org.Id) + sutProvider.GetDependency().InviteImportedOrganizationUsersAsync(Arg.Any()) .Returns(new Success(new InviteOrganizationUsersResponse(org.Id))); await sutProvider.Sut.ImportAsync(org.Id, newGroups, newUsers, new List(), false, EventSystemUser.PublicApi); @@ -126,7 +126,7 @@ public class ImportOrganizationUserCommandTests .UpsertManyAsync(Arg.Is>(users => users.Count() == 1)); await sutProvider.GetDependency().Received(1) - .InviteImportedOrganizationUsersAsync(Arg.Any(), org.Id); + .InviteImportedOrganizationUsersAsync(Arg.Any()); // Send events await sutProvider.GetDependency().Received(1)