From 3ae9fbd114ae89aab02a02aacd88009788e1c0ab Mon Sep 17 00:00:00 2001 From: Brandon Date: Thu, 15 May 2025 16:07:23 -0400 Subject: [PATCH] clean up --- .../OrganizationUsers/ImportOrganizationUserCommand.cs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs index f5f9016c10..5a625e2b67 100644 --- a/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs +++ b/src/Core/AdminConsole/OrganizationFeatures/OrganizationUsers/ImportOrganizationUserCommand.cs @@ -88,19 +88,21 @@ public class ImportOrganizationUserCommand : IImportOrganizationUserCommand var events = new List<(OrganizationUserUserDetails ou, EventType e, DateTime? d)>(); - // Users await RemoveExistingExternalUsers(removeUserExternalIds, events, importUserData); + if (overwriteExisting) { await OverwriteExisting(events, importUserData); } + await RemoveExistingUsers(existingUsers, newUsers, organization, importUserData); + await AddNewUsers(organization, newUsers, eventSystemUser, importUserData); - // Groups await ImportGroups(organization, groups, eventSystemUser, importUserData); await _eventService.LogOrganizationUserEventsAsync(events.Select(e => (e.ou, e.e, eventSystemUser, e.d))); + await _referenceEventService.RaiseEventAsync( new ReferenceEvent(ReferenceEventType.DirectorySynced, organization, _currentContext)); } @@ -164,7 +166,6 @@ public class ImportOrganizationUserCommand : IImportOrganizationUserCommand foreach (var user in usersToAttach) { - var orgUserDetails = existingUsersEmailsDict[user]; var orgUser = orgUsers[existingUsersEmailsDict[user].Id]; if (orgUser != null) {