IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix migration

Browse Source
This commit is contained in:
Anton Suhorukov 2022-12-22 18:17:21 +03:00
parent 9ed6dff1be
commit 575784dd01
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
common/Tools/ASC.MigrationPersonalToDocspace/MigrationCreator.cs
View File

@ -37,6 +37,7 @@ public class MigrationCreator
private readonly StorageFactory _storageFactory;
private readonly StorageFactoryConfig _storageFactoryConfig;
private readonly ModuleProvider _moduleProvider;
private readonly CreatorDbContext _creatorDbContext;
private List<IModuleSpecifics> _modules;
private string _pathToSave;
@ -61,7 +62,8 @@ public class MigrationCreator
DbFactory dbFactory,
StorageFactory storageFactory,
StorageFactoryConfig storageFactoryConfig,
ModuleProvider moduleProvider)
ModuleProvider moduleProvider,
CreatorDbContext сreatorDbContext)
{
_hostEnvironment = hostEnvironment;
_configuration = configuration;
@ -71,6 +73,7 @@ public class MigrationCreator
_storageFactory = storageFactory;
_storageFactoryConfig = storageFactoryConfig;
_moduleProvider = moduleProvider;
_creatorDbContext = сreatorDbContext;
}
@ -104,7 +107,7 @@ public class MigrationCreator
{
try
{
var userDbContext = _dbFactory.CreateDbContext<UserDbContext>();
var userDbContext = _creatorDbContext.CreateDbContext<UserDbContext>();
return userDbContext.Users.FirstOrDefault(q => q.Tenant == _tenant && q.Status == EmployeeStatus.Active && q.UserName == _userName).Id;
}
catch (Exception)
@ -199,7 +202,7 @@ public class MigrationCreator
private List<string> GetAliases()
{
using var dbContext = _dbFactory.CreateDbContext<TenantDbContext>(_toRegion);
using var dbContext = _creatorDbContext.CreateDbContext<TenantDbContext>(_toRegion);
var tenants = dbContext.Tenants.Select(t => t.Alias).ToList();
var forbidens = dbContext.TenantForbiden.Select(tf => tf.Address).ToList();
return tenants.Union(forbidens).ToList();
@ -246,7 +249,7 @@ public class MigrationCreator
{
var files = (await GetFilesToProcess(id)).ToList();
var backupsContext = _dbFactory.CreateDbContext<BackupsContext>();
var backupsContext = _creatorDbContext.CreateDbContext<BackupsContext>();
var exclude = backupsContext.Backups.AsQueryable().Where(b => b.TenantId == _tenant && b.StorageType == 0 && b.StoragePath != null).ToList();
files = files.Where(f => !exclude.Any(e => f.Path.Replace('\\', '/').Contains($"/file_{e.StoragePath}/"))).ToList();
@ -274,7 +277,7 @@ public class MigrationCreator
.ToListAsync());
}
var filesDbContext = _dbFactory.CreateDbContext<FilesDbContext>();
var filesDbContext = _creatorDbContext.CreateDbContext<FilesDbContext>();
files = files.Where(f => UserIsFileOwner(id, f, filesDbContext)).ToList();
return files.Distinct();
}

9
common/Tools/ASC.MigrationPersonalToDocspace/MigrationRunner.cs
View File

@ -33,7 +33,8 @@ public class MigrationRunner
private readonly StorageFactory _storageFactory;
private readonly StorageFactoryConfig _storageFactoryConfig;
private readonly ModuleProvider _moduleProvider;
private readonly ILogger<RestoreDbModuleTask> _logger;
private readonly ILogger<RestoreDbModuleTask> _logger;
private readonly CreatorDbContext _creatorDbContext;
private string _backupFile;
private string _region;
@ -52,13 +53,15 @@ public class MigrationRunner
StorageFactory storageFactory,
StorageFactoryConfig storageFactoryConfig,
ModuleProvider moduleProvider,
ILogger<RestoreDbModuleTask> logger)
ILogger<RestoreDbModuleTask> logger,
CreatorDbContext creatorDbContext)
{
_dbFactory = dbFactory;
_storageFactory = storageFactory;
_storageFactoryConfig = storageFactoryConfig;
_moduleProvider = moduleProvider;
_logger = logger;
_creatorDbContext = creatorDbContext;
}
public async Task Run(string backupFile, string region)
@ -132,7 +135,7 @@ public class MigrationRunner
private void SetTenantActive(int tenantId)
{
using var dbContext = _dbFactory.CreateDbContext<TenantDbContext>(_region);
using var dbContext = _creatorDbContext.CreateDbContext<TenantDbContext>(_region);
var tenant = dbContext.Tenants.Single(t=> t.Id == tenantId);
tenant.Status = TenantStatus.Active;