diff --git a/common/ASC.Data.Reassigns/ASC.Data.Reassigns.csproj b/common/ASC.Data.Reassigns/ASC.Data.Reassigns.csproj index 3b4d884414..85375fe7a4 100644 --- a/common/ASC.Data.Reassigns/ASC.Data.Reassigns.csproj +++ b/common/ASC.Data.Reassigns/ASC.Data.Reassigns.csproj @@ -12,6 +12,7 @@ + diff --git a/common/ASC.Data.Reassigns/GlobalUsings.cs b/common/ASC.Data.Reassigns/GlobalUsings.cs index 11e0bc9b1f..aa1fabf068 100644 --- a/common/ASC.Data.Reassigns/GlobalUsings.cs +++ b/common/ASC.Data.Reassigns/GlobalUsings.cs @@ -36,8 +36,9 @@ global using ASC.Data.Storage; global using ASC.MessagingSystem.Core; global using ASC.MessagingSystem.EF.Model; global using ASC.Web.Core; -global using ASC.Web.Core.Users; -global using ASC.Web.Studio.Core.Notify; +global using ASC.Web.Core.Users; +global using ASC.Web.Files.Services.WCFService; +global using ASC.Web.Studio.Core.Notify; global using Microsoft.AspNetCore.Http; global using Microsoft.Extensions.DependencyInjection; diff --git a/common/ASC.Data.Reassigns/ReassignProgressItem.cs b/common/ASC.Data.Reassigns/ReassignProgressItem.cs index e3cf368240..76429ea4be 100644 --- a/common/ASC.Data.Reassigns/ReassignProgressItem.cs +++ b/common/ASC.Data.Reassigns/ReassignProgressItem.cs @@ -44,10 +44,10 @@ public class ReassignProgressItem : DistributedTaskProgress public ReassignProgressItem( IServiceScopeFactory serviceScopeFactory, IDictionary httpHeaders, - int tenantId, Guid fromUserId, Guid toUserId, Guid currentUserId, bool deleteProfile) + int tenantId, Guid fromUserId, Guid toUserId, Guid currentUserId, bool deleteProfile) { _serviceScopeFactory = serviceScopeFactory; - _httpHeaders = httpHeaders; + _httpHeaders = httpHeaders; //_docService = Web.Files.Classes.Global.FileStorageService; //_projectsReassign = new ProjectsReassign(); @@ -73,7 +73,7 @@ public class ReassignProgressItem : DistributedTaskProgress await using var scope = _serviceScopeFactory.CreateAsyncScope(); var scopeClass = scope.ServiceProvider.GetService(); var queueWorkerRemove = scope.ServiceProvider.GetService(); - var (tenantManager, coreBaseSettings, messageService, studioNotifyService, securityContext, userManager, userPhotoManager, displayUserSettingsHelper, messageTarget, options) = scopeClass; + var (tenantManager, coreBaseSettings, messageService, fileStorageService, studioNotifyService, securityContext, userManager, userPhotoManager, displayUserSettingsHelper, messageTarget, options) = scopeClass; var logger = options.CreateLogger("ASC.Web"); await tenantManager.SetCurrentTenantAsync(_tenantId); @@ -88,7 +88,7 @@ public class ReassignProgressItem : DistributedTaskProgress logger.LogInformation("reassignment of data from documents"); - + await fileStorageService.ReassignStorageAsync(FromUser, ToUser); //_docService.ReassignStorage(_fromUserId, _toUserId); Percentage = 33; PublishChanges(); @@ -200,6 +200,7 @@ public class ReassignProgressItemScope private readonly TenantManager _tenantManager; private readonly CoreBaseSettings _coreBaseSettings; private readonly MessageService _messageService; + private readonly FileStorageService _fileStorageService; private readonly StudioNotifyService _studioNotifyService; private readonly SecurityContext _securityContext; private readonly UserManager _userManager; @@ -211,6 +212,7 @@ public class ReassignProgressItemScope public ReassignProgressItemScope(TenantManager tenantManager, CoreBaseSettings coreBaseSettings, MessageService messageService, + FileStorageService fileStorageService, StudioNotifyService studioNotifyService, SecurityContext securityContext, UserManager userManager, @@ -222,6 +224,7 @@ public class ReassignProgressItemScope _tenantManager = tenantManager; _coreBaseSettings = coreBaseSettings; _messageService = messageService; + _fileStorageService = fileStorageService; _studioNotifyService = studioNotifyService; _securityContext = securityContext; _userManager = userManager; @@ -234,6 +237,7 @@ public class ReassignProgressItemScope public void Deconstruct(out TenantManager tenantManager, out CoreBaseSettings coreBaseSettings, out MessageService messageService, + out FileStorageService fileStorageService, out StudioNotifyService studioNotifyService, out SecurityContext securityContext, out UserManager userManager, @@ -245,6 +249,7 @@ public class ReassignProgressItemScope tenantManager = _tenantManager; coreBaseSettings = _coreBaseSettings; messageService = _messageService; + fileStorageService = _fileStorageService; studioNotifyService = _studioNotifyService; securityContext = _securityContext; userManager = _userManager;