[PM-19145] refactor organization service.import async

bitwarden_license/src/Scim/Models/ScimUserRequestModel.cs

@@ -3,9 +3,9 @@
 using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models;
 using Bit.Core.Enums;
 using Bit.Core.Exceptions;
+using Bit.Core.Models.Business;
 using Bit.Core.Models.Data;
 using Bit.Core.Utilities;
-using OrganizationUserInvite = Bit.Core.Models.Business.OrganizationUserInvite;
 
 namespace Bit.Scim.Models;
 
@@ -44,7 +44,7 @@ public InviteOrganizationUsersRequest ToRequest(
         return new InviteOrganizationUsersRequest(
             invites:
             [
-                new Core.AdminConsole.OrganizationFeatures.OrganizationUsers.InviteUsers.Models.OrganizationUserInvite(
+                new OrganizationUserInviteCommandModel(
                         email: email,
                         externalId: ExternalIdForInvite()
                     )

src/Api/AdminConsole/Public/Controllers/OrganizationController.cs

@@ -1,10 +1,9 @@
 using System.Net;
 using Bit.Api.AdminConsole.Public.Models.Request;
 using Bit.Api.Models.Public.Response;
+using Bit.Core.AdminConsole.OrganizationFeatures.OrganizationUsers.Interfaces;
 using Bit.Core.Context;
-using Bit.Core.Enums;
 using Bit.Core.Exceptions;
-using Bit.Core.Services;
 using Bit.Core.Settings;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
@@ -15,18 +14,18 @@
 [Authorize("Organization")]
 public class OrganizationController : Controller
 {
-    private readonly IOrganizationService _organizationService;
     private readonly ICurrentContext _currentContext;
     private readonly GlobalSettings _globalSettings;
+    private readonly IImportOrganizationUserCommand _importOrganizationUserCommand;
 
     public OrganizationController(
-        IOrganizationService organizationService,
         ICurrentContext currentContext,
-        GlobalSettings globalSettings)
+        GlobalSettings globalSettings,
+        IImportOrganizationUserCommand importOrganizationUserCommand)
     {
-        _organizationService = organizationService;
         _currentContext = currentContext;
         _globalSettings = globalSettings;
+        _importOrganizationUserCommand = importOrganizationUserCommand;
     }
 
     /// <summary>
@@ -47,13 +46,12 @@
             throw new BadRequestException("You cannot import this much data at once.");
         }
 
-        await _organizationService.ImportAsync(
+        await _importOrganizationUserCommand.ImportAsync(
             _currentContext.OrganizationId.Value,
             model.Groups.Select(g => g.ToImportedGroup(_currentContext.OrganizationId.Value)),
             model.Members.Where(u => !u.Deleted).Select(u => u.ToImportedOrganizationUser()),
             model.Members.Where(u => u.Deleted).Select(u => u.ExternalId),
-            model.OverwriteExisting.GetValueOrDefault(),
-            EventSystemUser.PublicApi);
+            model.OverwriteExisting.GetValueOrDefault());
         return new OkResult();
     }
 }

src/Core/AdminConsole/Models/Data/Organizations/OrganizationGroupImportData.cs

@@ -0,0 +1,27 @@
+using Bit.Core.AdminConsole.Entities;
+using Bit.Core.AdminConsole.Models.Business;
+
+namespace Bit.Core.Models.Data.Organizations;
+
+public class OrganizationGroupImportData
+{
+    public IEnumerable<ImportedGroup> Groups { get; init; }
+    public ICollection<Group> ExistingGroups { get; init; }
+    public IEnumerable<Group> ExistingExternalGroups { get; init; }
+    public IDictionary<string, ImportedGroup> GroupsDict { get; init; }
+
+    public OrganizationGroupImportData(IEnumerable<ImportedGroup> groups, ICollection<Group> existingGroups)
+    {
+        Groups = groups;
+        GroupsDict = groups.ToDictionary(g => g.Group.ExternalId);
+        ExistingGroups = existingGroups;
+        ExistingExternalGroups = GetExistingExternalGroups(existingGroups);
+    }
+
+    private IEnumerable<Group> GetExistingExternalGroups(ICollection<Group> existingGroups)
+    {
+        return existingGroups
+            .Where(u => !string.IsNullOrWhiteSpace(u.ExternalId))
+            .ToList();
+    }
+}

src/Core/AdminConsole/Models/Data/Organizations/OrganizationUsers/OrganizationUserImportData.cs

@@ -0,0 +1,24 @@
+namespace Bit.Core.Models.Data.Organizations.OrganizationUsers;
+
+public class OrganizationUserImportData
+{
+    public HashSet<string> NewUsersSet { get; init; }
+    public ICollection<OrganizationUserUserDetails> ExistingUsers { get; init; }
+    public IEnumerable<OrganizationUserUserDetails> ExistingExternalUsers { get; init; }
+    public Dictionary<string, Guid> ExistingExternalUsersIdDict { get; init; }
+
+    public OrganizationUserImportData(ICollection<OrganizationUserUserDetails> existingUsers, HashSet<string> newUsersSet)
+    {
+        NewUsersSet = newUsersSet;
+        ExistingUsers = existingUsers;
+        ExistingExternalUsers = GetExistingExternalUsers(existingUsers);
+        ExistingExternalUsersIdDict = GetExistingExternalUsers(existingUsers).ToDictionary(u => u.ExternalId, u => u.Id);
+    }
+
+    private IEnumerable<OrganizationUserUserDetails> GetExistingExternalUsers(ICollection<OrganizationUserUserDetails> existingUsers)
+    {
+        return existingUsers
+            .Where(u => !string.IsNullOrWhiteSpace(u.ExternalId))
+            .ToList();
+    }
+}