From a5055fe1207d7dd807f6c10f6ee1978aa59ff375 Mon Sep 17 00:00:00 2001 From: Brandon Date: Wed, 11 Jun 2025 12:06:22 -0400 Subject: [PATCH] fix tests --- .../Import/ImportOrganizationUsersAndGroupsCommand.cs | 8 ++++---- .../OrganizationServiceCollectionExtensions.cs | 2 +- .../ImportOrganizationUsersAndGroupsCommandTests.cs} | 9 +++++---- 3 files changed, 10 insertions(+), 9 deletions(-) rename test/Core.Test/AdminConsole/OrganizationFeatures/{OrganizationUsers/ImportOrganizationUserCommandTests.cs => Import/ImportOrganizationUsersAndGroupsCommandTests.cs} (95%) diff --git a/src/Core/AdminConsole/OrganizationFeatures/Import/ImportOrganizationUsersAndGroupsCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/Import/ImportOrganizationUsersAndGroupsCommand.cs index 13aeb80ef0..7e44815bbe 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/Import/ImportOrganizationUsersAndGroupsCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/Import/ImportOrganizationUsersAndGroupsCommand.cs @@ -338,7 +338,7 @@ public class ImportOrganizationUsersAndGroupsCommand : IImportOrganizationUsersA group.CreationDate = group.RevisionDate = DateTime.UtcNow; savedGroups.Add(await _groupRepository.CreateAsync(group)); - await UpdateUsersAsync(group, importGroupData.GroupsDict[group.ExternalId].ExternalUserIds, + await UpdateUsersAsync(group, importGroupData.GroupsDict[group.ExternalId!].ExternalUserIds, importUserData.ExistingExternalUsersIdDict); } @@ -359,7 +359,7 @@ public class ImportOrganizationUsersAndGroupsCommand : IImportOrganizationUsersA Organization organization) { var updateGroups = importGroupData.ExistingExternalGroups - .Where(g => importGroupData.GroupsDict.ContainsKey(g.ExternalId)) + .Where(g => importGroupData.GroupsDict.ContainsKey(g.ExternalId!)) .ToList(); if (updateGroups.Any()) @@ -373,7 +373,7 @@ public class ImportOrganizationUsersAndGroupsCommand : IImportOrganizationUsersA foreach (var group in updateGroups) { // Check for changes to the group, update if changed. - var updatedGroup = importGroupData.GroupsDict[group.ExternalId].Group; + var updatedGroup = importGroupData.GroupsDict[group.ExternalId!].Group; if (group.Name != updatedGroup.Name) { group.RevisionDate = DateTime.UtcNow; @@ -383,7 +383,7 @@ public class ImportOrganizationUsersAndGroupsCommand : IImportOrganizationUsersA } // compare and update user group associations - await UpdateUsersAsync(group, importGroupData.GroupsDict[group.ExternalId].ExternalUserIds, + await UpdateUsersAsync(group, importGroupData.GroupsDict[group.ExternalId!].ExternalUserIds, importUserData.ExistingExternalUsersIdDict, existingGroupUsers.ContainsKey(group.Id) ? existingGroupUsers[group.Id] : null); diff --git a/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs b/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs index 2ff64807ae..a4fcb07395 100644 --- a/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs +++ b/src/Core/OrganizationFeatures/OrganizationServiceCollectionExtensions.cs @@ -197,7 +197,7 @@ public static class OrganizationServiceCollectionExtensions services.AddScoped(); services.AddScoped(); services.AddScoped(); - services.AddScoped(); + services.AddScoped(); } // TODO: move to OrganizationSubscriptionServiceCollectionExtensions when OrganizationUser methods are moved out of diff --git a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommandTests.cs b/test/Core.Test/AdminConsole/OrganizationFeatures/Import/ImportOrganizationUsersAndGroupsCommandTests.cs similarity index 95% rename from test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommandTests.cs rename to test/Core.Test/AdminConsole/OrganizationFeatures/Import/ImportOrganizationUsersAndGroupsCommandTests.cs index bd407477b9..75afd5b971 100644 --- a/test/Core.Test/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommandTests.cs +++ b/test/Core.Test/AdminConsole/OrganizationFeatures/Import/ImportOrganizationUsersAndGroupsCommandTests.cs @@ -1,4 +1,5 @@ using Bit.Core.AdminConsole.Models.Business; +using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers; using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers; using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models; using Bit.Core.AdminConsole.Utilities.Commands; @@ -21,14 +22,14 @@ using Organization = Bit.Core.AdminConsole.Entities.Organization; namespace Bit.Core.Test.OrganizationFeatures.OrganizationUsers; -public class ImportOrganizationUserCommandTests +public class ImportOrganizationUsersAndGroupsCommandTests { private readonly IDataProtectorTokenFactory _orgUserInviteTokenDataFactory = new FakeDataProtectorTokenFactory(); [Theory, PaidOrganizationCustomize, BitAutoData] public async Task OrgImportCallsInviteOrgUserCommand( - SutProvider sutProvider, + SutProvider sutProvider, Organization org, List existingUsers, List newUsers, @@ -75,7 +76,7 @@ public class ImportOrganizationUserCommandTests [Theory, PaidOrganizationCustomize, BitAutoData] public async Task OrgImportCreateNewUsersAndMarryExistingUser( - SutProvider sutProvider, + SutProvider sutProvider, Organization org, List existingUsers, List newUsers, @@ -130,7 +131,7 @@ public class ImportOrganizationUserCommandTests } private void SetupOrganizationConfigForImport( - SutProvider sutProvider, + SutProvider sutProvider, Organization org, List existingUsers, List newUsers)