diff --git a/common/ASC.Data.Reassigns/QueueWorker.cs b/common/ASC.Data.Reassigns/QueueWorker.cs index 68784f3ba9..53935a1190 100644 --- a/common/ASC.Data.Reassigns/QueueWorker.cs +++ b/common/ASC.Data.Reassigns/QueueWorker.cs @@ -35,12 +35,11 @@ namespace ASC.Data.Reassigns public class QueueWorker where T : DistributedTaskProgress { - protected readonly DistributedTaskQueue Queue; - protected IHttpContextAccessor HttpContextAccessor { get; } protected IServiceProvider ServiceProvider { get; } public object SynchRoot = new object(); + protected readonly DistributedTaskQueue Queue; public QueueWorker( IHttpContextAccessor httpContextAccessor, @@ -113,6 +112,7 @@ namespace ASC.Data.Reassigns { var result = ServiceProvider.GetService(); result.Init(tenantId, fromUserId, toUserId, currentUserId, deleteProfile); + return result; }) as ReassignProgressItem; } @@ -135,6 +135,7 @@ namespace ASC.Data.Reassigns { var result = ServiceProvider.GetService(); result.Init(tenantId, user, currentUserId, notify); + return result; }) as RemoveProgressItem; } diff --git a/common/ASC.Data.Reassigns/ReassignProgressItem.cs b/common/ASC.Data.Reassigns/ReassignProgressItem.cs index 83c78918ca..63e70ac648 100644 --- a/common/ASC.Data.Reassigns/ReassignProgressItem.cs +++ b/common/ASC.Data.Reassigns/ReassignProgressItem.cs @@ -28,28 +28,27 @@ namespace ASC.Data.Reassigns { [Transient] public class ReassignProgressItem : DistributedTaskProgress - { + { + public Guid FromUser { get; private set; } + public Guid ToUser { get; private set; } + + private readonly IServiceProvider _serviceProvider; + private readonly QueueWorkerRemove _queueWorkerRemove; private readonly IDictionary _httpHeaders; - private int _tenantId; private Guid _currentUserId; private bool _deleteProfile; //private readonly IFileStorageService _docService; - //private readonly ProjectsReassign _projectsReassign; - - public Guid FromUser { get; private set; } - public Guid ToUser { get; private set; } - private IServiceProvider ServiceProvider { get; } - private QueueWorkerRemove QueueWorkerRemove { get; } + //private readonly ProjectsReassign _projectsReassign; public ReassignProgressItem( IServiceProvider serviceProvider, IHttpContextAccessor httpContextAccessor, QueueWorkerRemove queueWorkerRemove) { - ServiceProvider = serviceProvider; - QueueWorkerRemove = queueWorkerRemove; + _serviceProvider = serviceProvider; + _queueWorkerRemove = queueWorkerRemove; _httpHeaders = QueueWorker.GetHttpHeaders(httpContextAccessor.HttpContext.Request); //_docService = Web.Files.Classes.Global.FileStorageService; @@ -76,7 +75,7 @@ namespace ASC.Data.Reassigns protected override void DoJob() { - using var scope = ServiceProvider.CreateScope(); + using var scope = _serviceProvider.CreateScope(); var scopeClass = scope.ServiceProvider.GetService(); var (tenantManager, coreBaseSettings, messageService, studioNotifyService, securityContext, userManager, userPhotoManager, displayUserSettingsHelper, messageTarget, options) = scopeClass; var logger = options.Get("ASC.Web"); @@ -181,7 +180,7 @@ namespace ASC.Data.Reassigns userPhotoManager.RemovePhoto(user.ID); userManager.DeleteUser(user.ID); - QueueWorkerRemove.Start(_tenantId, user, _currentUserId, false); + _queueWorkerRemove.Start(_tenantId, user, _currentUserId, false); if (_httpHeaders != null) messageService.Send(_httpHeaders, MessageAction.UserDeleted, messageTarget.Create(FromUser), new[] { userName }); @@ -193,16 +192,16 @@ namespace ASC.Data.Reassigns [Scope] public class ReassignProgressItemScope { - private TenantManager TenantManager { get; } - private CoreBaseSettings CoreBaseSettings { get; } - private MessageService MessageService { get; } - private StudioNotifyService StudioNotifyService { get; } - private SecurityContext SecurityContext { get; } - private UserManager UserManager { get; } - private UserPhotoManager UserPhotoManager { get; } - private DisplayUserSettingsHelper DisplayUserSettingsHelper { get; } - private MessageTarget MessageTarget { get; } - private IOptionsMonitor Options { get; } + private readonly TenantManager _tenantManager; + private readonly CoreBaseSettings _coreBaseSettings; + private readonly MessageService _messageService; + private readonly StudioNotifyService _studioNotifyService; + private readonly SecurityContext _securityContext; + private readonly UserManager _userManager; + private readonly UserPhotoManager _userPhotoManager; + private readonly DisplayUserSettingsHelper _displayUserSettingsHelper; + private readonly MessageTarget _messageTarget; + private readonly IOptionsMonitor _options; public ReassignProgressItemScope(TenantManager tenantManager, CoreBaseSettings coreBaseSettings, @@ -215,16 +214,16 @@ namespace ASC.Data.Reassigns MessageTarget messageTarget, IOptionsMonitor options) { - TenantManager = tenantManager; - CoreBaseSettings = coreBaseSettings; - MessageService = messageService; - StudioNotifyService = studioNotifyService; - SecurityContext = securityContext; - UserManager = userManager; - UserPhotoManager = userPhotoManager; - DisplayUserSettingsHelper = displayUserSettingsHelper; - MessageTarget = messageTarget; - Options = options; + _tenantManager = tenantManager; + _coreBaseSettings = coreBaseSettings; + _messageService = messageService; + _studioNotifyService = studioNotifyService; + _securityContext = securityContext; + _userManager = userManager; + _userPhotoManager = userPhotoManager; + _displayUserSettingsHelper = displayUserSettingsHelper; + _messageTarget = messageTarget; + _options = options; } public void Deconstruct(out TenantManager tenantManager, @@ -238,16 +237,16 @@ namespace ASC.Data.Reassigns out MessageTarget messageTarget, out IOptionsMonitor optionsMonitor) { - tenantManager = TenantManager; - coreBaseSettings = CoreBaseSettings; - messageService = MessageService; - studioNotifyService = StudioNotifyService; - securityContext = SecurityContext; - userManager = UserManager; - userPhotoManager = UserPhotoManager; - displayUserSettingsHelper = DisplayUserSettingsHelper; - messageTarget = MessageTarget; - optionsMonitor = Options; + tenantManager = _tenantManager; + coreBaseSettings = _coreBaseSettings; + messageService = _messageService; + studioNotifyService = _studioNotifyService; + securityContext = _securityContext; + userManager = _userManager; + userPhotoManager = _userPhotoManager; + displayUserSettingsHelper = _displayUserSettingsHelper; + messageTarget = _messageTarget; + optionsMonitor = _options; } } diff --git a/common/ASC.Data.Reassigns/RemoveProgressItem.cs b/common/ASC.Data.Reassigns/RemoveProgressItem.cs index 640640aeb5..5a10d2910c 100644 --- a/common/ASC.Data.Reassigns/RemoveProgressItem.cs +++ b/common/ASC.Data.Reassigns/RemoveProgressItem.cs @@ -27,25 +27,24 @@ namespace ASC.Data.Reassigns { [Transient] public class RemoveProgressItem : DistributedTaskProgress - { - private readonly IDictionary _httpHeaders; + { + public Guid FromUser { get; private set; } + public UserInfo User { get; private set; } + private readonly IDictionary _httpHeaders; + private readonly IServiceProvider _serviceProvider; private int _tenantId; private Guid _currentUserId; private bool _notify; - //private readonly IFileStorageService _docService; //private readonly MailGarbageEngine _mailEraser; - public Guid FromUser { get; private set; } - private IServiceProvider ServiceProvider { get; } - public UserInfo User { get; private set; } - + public RemoveProgressItem( IServiceProvider serviceProvider, IHttpContextAccessor httpContextAccessor) { _httpHeaders = QueueWorker.GetHttpHeaders(httpContextAccessor.HttpContext.Request); - ServiceProvider = serviceProvider; + _serviceProvider = serviceProvider; //_docService = Web.Files.Classes.Global.FileStorageService; @@ -69,7 +68,7 @@ namespace ASC.Data.Reassigns protected override void DoJob() { - using var scope = ServiceProvider.CreateScope(); + using var scope = _serviceProvider.CreateScope(); var scopeClass = scope.ServiceProvider.GetService(); var (tenantManager, coreBaseSettings, messageService, studioNotifyService, securityContext, userManager, messageTarget, webItemManagerSecurity, storageFactory, userFormatter, options) = scopeClass; var logger = options.Get("ASC.Web"); @@ -228,17 +227,17 @@ namespace ASC.Data.Reassigns [Scope] public class RemoveProgressItemScope { - private TenantManager TenantManager { get; } - private CoreBaseSettings CoreBaseSettings { get; } - private MessageService MessageService { get; } - private StudioNotifyService StudioNotifyService { get; } - private SecurityContext SecurityContext { get; } - private UserManager UserManager { get; } - private MessageTarget MessageTarget { get; } - private WebItemManagerSecurity WebItemManagerSecurity { get; } - private StorageFactory StorageFactory { get; } - private UserFormatter UserFormatter { get; } - private IOptionsMonitor Options { get; } + private readonly TenantManager _tenantManager; + private readonly CoreBaseSettings _coreBaseSettings; + private readonly MessageService _messageService; + private readonly StudioNotifyService _studioNotifyService; + private readonly SecurityContext _securityContext; + private readonly UserManager _userManager; + private readonly MessageTarget _messageTarget; + private readonly WebItemManagerSecurity _webItemManagerSecurity; + private readonly StorageFactory _storageFactory; + private readonly UserFormatter _userFormatter; + private readonly IOptionsMonitor _options; public RemoveProgressItemScope(TenantManager tenantManager, CoreBaseSettings coreBaseSettings, @@ -252,17 +251,17 @@ namespace ASC.Data.Reassigns UserFormatter userFormatter, IOptionsMonitor options) { - TenantManager = tenantManager; - CoreBaseSettings = coreBaseSettings; - MessageService = messageService; - StudioNotifyService = studioNotifyService; - SecurityContext = securityContext; - UserManager = userManager; - MessageTarget = messageTarget; - WebItemManagerSecurity = webItemManagerSecurity; - StorageFactory = storageFactory; - UserFormatter = userFormatter; - Options = options; + _tenantManager = tenantManager; + _coreBaseSettings = coreBaseSettings; + _messageService = messageService; + _studioNotifyService = studioNotifyService; + _securityContext = securityContext; + _userManager = userManager; + _messageTarget = messageTarget; + _webItemManagerSecurity = webItemManagerSecurity; + _storageFactory = storageFactory; + _userFormatter = userFormatter; + _options = options; } public void Deconstruct(out TenantManager tenantManager, @@ -277,17 +276,17 @@ namespace ASC.Data.Reassigns out UserFormatter userFormatter, out IOptionsMonitor optionsMonitor) { - tenantManager = TenantManager; - coreBaseSettings = CoreBaseSettings; - messageService = MessageService; - studioNotifyService = StudioNotifyService; - securityContext = SecurityContext; - userManager = UserManager; - messageTarget = MessageTarget; - webItemManagerSecurity = WebItemManagerSecurity; - storageFactory = StorageFactory; - userFormatter = UserFormatter; - optionsMonitor = Options; + tenantManager = _tenantManager; + coreBaseSettings = _coreBaseSettings; + messageService = _messageService; + studioNotifyService = _studioNotifyService; + securityContext = _securityContext; + userManager = _userManager; + messageTarget = _messageTarget; + webItemManagerSecurity = _webItemManagerSecurity; + storageFactory = _storageFactory; + userFormatter = _userFormatter; + optionsMonitor = _options; } }