add user for already exist portal
This commit is contained in:
parent
207d825460
commit
a1fc302536
@ -42,8 +42,10 @@ public class MigrationCreator
|
||||
private string _pathToSave;
|
||||
private string _userName;
|
||||
private string _mail;
|
||||
private string _toRegion;
|
||||
private int _tenant;
|
||||
private string _toRegion;
|
||||
private string _toAlias;
|
||||
private string _fromAlias;
|
||||
private int _fromTenantId;
|
||||
private readonly object _locker = new object();
|
||||
private readonly int _limit = 1000;
|
||||
private readonly List<ModuleName> _namesModules = new List<ModuleName>()
|
||||
@ -55,6 +57,13 @@ public class MigrationCreator
|
||||
ModuleName.WebStudio
|
||||
};
|
||||
|
||||
private readonly List<ModuleName> _namesModulesForAlreadyExistPortal = new List<ModuleName>()
|
||||
{
|
||||
ModuleName.Core,
|
||||
ModuleName.Files,
|
||||
ModuleName.Files2,
|
||||
};
|
||||
|
||||
public string NewAlias { get; private set; }
|
||||
|
||||
public MigrationCreator(
|
||||
@ -73,9 +82,9 @@ public class MigrationCreator
|
||||
_moduleProvider = moduleProvider;
|
||||
}
|
||||
|
||||
public string Create(int tenant, string userName, string mail, string toRegion)
|
||||
public string Create(string fromAlias, string userName, string mail, string toRegion, string toAlias)
|
||||
{
|
||||
Init(tenant, userName, mail, toRegion);
|
||||
Init(fromAlias, userName, mail, toRegion, toAlias);
|
||||
|
||||
var id = GetUserId();
|
||||
var fileName = _userName + ".tar.gz";
|
||||
@ -88,49 +97,92 @@ public class MigrationCreator
|
||||
return fileName;
|
||||
}
|
||||
|
||||
private void Init(int tenant, string userName, string mail, string toRegion)
|
||||
private void Init(string fromAlias, string userName, string mail, string toRegion, string toAlias)
|
||||
{
|
||||
_modules = _moduleProvider.AllModules.Where(m => _namesModules.Contains(m.ModuleName)).ToList();
|
||||
|
||||
_pathToSave = "";
|
||||
_toRegion = toRegion;
|
||||
_userName = userName;
|
||||
_mail = mail;
|
||||
_tenant = tenant;
|
||||
_fromAlias = fromAlias;
|
||||
_toAlias = toAlias;
|
||||
|
||||
using var dbContextTenant = _dbFactory.CreateDbContext<TenantDbContext>();
|
||||
var tenant = dbContextTenant.Tenants.SingleOrDefault(q => q.Alias == _fromAlias);
|
||||
|
||||
if (tenant == null)
|
||||
{
|
||||
throw new ArgumentException("tenant was not found");
|
||||
}
|
||||
_fromTenantId = tenant.Id;
|
||||
|
||||
_modules = string.IsNullOrEmpty(_toAlias)
|
||||
? _moduleProvider.AllModules.Where(m => _namesModules.Contains(m.ModuleName)).ToList()
|
||||
: _moduleProvider.AllModules.Where(m => _namesModulesForAlreadyExistPortal.Contains(m.ModuleName)).ToList();
|
||||
}
|
||||
|
||||
private Guid GetUserId()
|
||||
{
|
||||
try
|
||||
{
|
||||
var userDbContext = _dbFactory.CreateDbContext<UserDbContext>();
|
||||
using var userDbContext = _dbFactory.CreateDbContext<UserDbContext>();
|
||||
User user = null;
|
||||
if (string.IsNullOrEmpty(_userName) || string.IsNullOrEmpty(_mail))
|
||||
{
|
||||
if (string.IsNullOrEmpty(_userName))
|
||||
{
|
||||
user = userDbContext.Users.FirstOrDefault(q => q.Tenant == _tenant && q.Status == EmployeeStatus.Active && q.Email == _mail);
|
||||
user = userDbContext.Users.FirstOrDefault(q => q.Tenant == _fromTenantId && q.Status == EmployeeStatus.Active && q.Email == _mail);
|
||||
_userName = user.UserName;
|
||||
}
|
||||
else
|
||||
{
|
||||
user = userDbContext.Users.FirstOrDefault(q => q.Tenant == _tenant && q.Status == EmployeeStatus.Active && q.UserName == _userName);
|
||||
user = userDbContext.Users.FirstOrDefault(q => q.Tenant == _fromTenantId && q.Status == EmployeeStatus.Active && q.UserName == _userName);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
user = userDbContext.Users.FirstOrDefault(q => q.Tenant == _tenant && q.Status == EmployeeStatus.Active && q.UserName == _userName && q.Email == _mail);
|
||||
user = userDbContext.Users.FirstOrDefault(q => q.Tenant == _fromTenantId && q.Status == EmployeeStatus.Active && q.UserName == _userName && q.Email == _mail);
|
||||
}
|
||||
if (!string.IsNullOrEmpty(_toAlias))
|
||||
{
|
||||
using var dbContextTenant = _dbFactory.CreateDbContext<TenantDbContext>(_toRegion);
|
||||
using var userDbContextToregion = _dbFactory.CreateDbContext<UserDbContext>(_toRegion);
|
||||
var tenant = dbContextTenant.Tenants.SingleOrDefault(t => t.Alias == _toAlias);
|
||||
if (tenant == null)
|
||||
{
|
||||
throw new ArgumentException("tenant was not found");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (userDbContextToregion.Users.Any(q => q.Tenant == tenant.Id && q.UserName == _userName || q.Email == _mail))
|
||||
{
|
||||
throw new ArgumentException("username already exist in the portal");
|
||||
}
|
||||
}
|
||||
}
|
||||
return user.Id;
|
||||
}
|
||||
catch (ArgumentException e)
|
||||
{
|
||||
throw e;
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
throw new Exception("username was not found");
|
||||
throw new ArgumentException("username was not found");
|
||||
}
|
||||
}
|
||||
|
||||
private void DoMigrationDb(Guid id, IDataWriteOperator writer)
|
||||
{
|
||||
{
|
||||
if (!string.IsNullOrEmpty(_toAlias))
|
||||
{
|
||||
using (var connection = _dbFactory.OpenConnection())
|
||||
{
|
||||
var tenantsModule = _moduleProvider.AllModules.Single(q => q.ModuleName == ModuleName.Tenants);
|
||||
var coreUserTable = tenantsModule.Tables.Single(q => q.Name == "core_user");
|
||||
ArhiveTable(coreUserTable, writer, tenantsModule, connection, id);
|
||||
}
|
||||
}
|
||||
|
||||
foreach (var module in _modules)
|
||||
{
|
||||
var tablesToProcess = module.Tables.Where(t => t.InsertMethod != InsertMethod.None).ToList();
|
||||
@ -143,55 +195,63 @@ public class MigrationCreator
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
Console.WriteLine($"backup table {table.Name}");
|
||||
using (var data = new DataTable(table.Name))
|
||||
{
|
||||
ActionInvoker.Try(
|
||||
state =>
|
||||
{
|
||||
data.Clear();
|
||||
int counts;
|
||||
var offset = 0;
|
||||
do
|
||||
{
|
||||
var t = (TableInfo)state;
|
||||
var dataAdapter = _dbFactory.CreateDataAdapter();
|
||||
dataAdapter.SelectCommand = module.CreateSelectCommand(connection.Fix(), _tenant, t, _limit, offset, id).WithTimeout(600);
|
||||
counts = ((DbDataAdapter)dataAdapter).Fill(data);
|
||||
offset += _limit;
|
||||
} while (counts == _limit);
|
||||
|
||||
},
|
||||
table,
|
||||
maxAttempts: 5,
|
||||
onFailure: error => { throw ThrowHelper.CantBackupTable(table.Name, error); });
|
||||
|
||||
foreach (var col in data.Columns.Cast<DataColumn>().Where(col => col.DataType == typeof(DateTime)))
|
||||
{
|
||||
col.DateTimeMode = DataSetDateTime.Unspecified;
|
||||
}
|
||||
|
||||
module.PrepareData(data);
|
||||
|
||||
if (data.TableName == "tenants_tenants")
|
||||
{
|
||||
ChangeAlias(data);
|
||||
ChangeName(data);
|
||||
}
|
||||
|
||||
using (var file = _tempStream.Create())
|
||||
{
|
||||
data.WriteXml(file, XmlWriteMode.WriteSchema);
|
||||
data.Clear();
|
||||
|
||||
writer.WriteEntry(KeyHelper.GetTableZipKey(module, data.TableName), file);
|
||||
}
|
||||
}
|
||||
ArhiveTable(table, writer, module, connection, id);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void ArhiveTable(TableInfo table, IDataWriteOperator writer, IModuleSpecifics module, DbConnection connection, Guid id)
|
||||
{
|
||||
Console.WriteLine($"backup table {table.Name}");
|
||||
using (var data = new DataTable(table.Name))
|
||||
{
|
||||
ActionInvoker.Try(
|
||||
state =>
|
||||
{
|
||||
data.Clear();
|
||||
int counts;
|
||||
var offset = 0;
|
||||
do
|
||||
{
|
||||
var t = (TableInfo)state;
|
||||
var dataAdapter = _dbFactory.CreateDataAdapter();
|
||||
dataAdapter.SelectCommand = module.CreateSelectCommand(connection.Fix(), _fromTenantId, t, _limit, offset, id).WithTimeout(600);
|
||||
counts = ((DbDataAdapter)dataAdapter).Fill(data);
|
||||
offset += _limit;
|
||||
} while (counts == _limit);
|
||||
|
||||
},
|
||||
table,
|
||||
maxAttempts: 5,
|
||||
onFailure: error => { throw ThrowHelper.CantBackupTable(table.Name, error); });
|
||||
|
||||
foreach (var col in data.Columns.Cast<DataColumn>().Where(col => col.DataType == typeof(DateTime)))
|
||||
{
|
||||
col.DateTimeMode = DataSetDateTime.Unspecified;
|
||||
}
|
||||
|
||||
module.PrepareData(data);
|
||||
|
||||
if (data.TableName == "tenants_tenants")
|
||||
{
|
||||
ChangeAlias(data);
|
||||
ChangeName(data);
|
||||
}
|
||||
|
||||
WriteEnrty(data, writer, module);
|
||||
}
|
||||
}
|
||||
|
||||
private void WriteEnrty(DataTable data, IDataWriteOperator writer, IModuleSpecifics module)
|
||||
{
|
||||
using (var file = _tempStream.Create())
|
||||
{
|
||||
data.WriteXml(file, XmlWriteMode.WriteSchema);
|
||||
data.Clear();
|
||||
|
||||
writer.WriteEntry(KeyHelper.GetTableZipKey(module, data.TableName), file);
|
||||
}
|
||||
}
|
||||
|
||||
private void ChangeAlias(DataTable data)
|
||||
@ -255,8 +315,8 @@ public class MigrationCreator
|
||||
private void ChangeName(DataTable data)
|
||||
{
|
||||
data.Rows[0]["name"] = "";
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private void DoMigrationStorage(Guid id, IDataWriteOperator writer)
|
||||
{
|
||||
Console.WriteLine($"start backup storage");
|
||||
@ -266,7 +326,7 @@ public class MigrationCreator
|
||||
Console.WriteLine($"start backup fileGroup: {group.Key}");
|
||||
foreach (var file in group)
|
||||
{
|
||||
var storage = _storageFactory.GetStorage(_tenant, group.Key);
|
||||
var storage = _storageFactory.GetStorage(_fromTenantId, group.Key);
|
||||
var file1 = file;
|
||||
ActionInvoker.Try(state =>
|
||||
{
|
||||
@ -307,9 +367,9 @@ public class MigrationCreator
|
||||
|
||||
var module = _storageFactoryConfig.GetModuleList().Where(m => m == "files").Single();
|
||||
|
||||
var store = _storageFactory.GetStorage(_tenant, module);
|
||||
var store = _storageFactory.GetStorage(_fromTenantId, module);
|
||||
|
||||
var dbFiles = filesDbContext.Files.Where(q => q.CreateBy == id && q.TenantId == _tenant).ToList();
|
||||
var dbFiles = filesDbContext.Files.Where(q => q.CreateBy == id && q.TenantId == _fromTenantId).ToList();
|
||||
|
||||
var tasks = new List<Task>(20);
|
||||
foreach (var dbFile in dbFiles)
|
||||
@ -331,7 +391,7 @@ public class MigrationCreator
|
||||
private async Task FindFiles(List<BackupFileInfo> list, IDataStore store, DbFile dbFile, string module)
|
||||
{
|
||||
var files = await store.ListFilesRelativeAsync(string.Empty, $"\\{GetUniqFileDirectory(dbFile.Id)}", "*.*", true)
|
||||
.Select(path => new BackupFileInfo(string.Empty, module, $"{GetUniqFileDirectory(dbFile.Id)}\\{path}", _tenant))
|
||||
.Select(path => new BackupFileInfo(string.Empty, module, $"{GetUniqFileDirectory(dbFile.Id)}\\{path}", _fromTenantId))
|
||||
.ToListAsync();
|
||||
|
||||
lock (_locker)
|
||||
|
@ -61,13 +61,29 @@ public class MigrationRunner
|
||||
_logger = logger;
|
||||
}
|
||||
|
||||
public async Task Run(string backupFile, string region)
|
||||
public async Task Run(string backupFile, string region, string fromAlias, string toAlias)
|
||||
{
|
||||
_region = region;
|
||||
_modules = _moduleProvider.AllModules.Where(m => _namesModules.Contains(m.ModuleName)).ToList();
|
||||
_backupFile = backupFile;
|
||||
var columnMapper = new ColumnMapper();
|
||||
|
||||
if (!string.IsNullOrEmpty(toAlias))
|
||||
{
|
||||
using var dbContextTenant = _dbFactory.CreateDbContext<TenantDbContext>();
|
||||
var fromTenant = dbContextTenant.Tenants.SingleOrDefault(q => q.Alias == fromAlias);
|
||||
|
||||
using var dbContextToTenant = _dbFactory.CreateDbContext<TenantDbContext>(region);
|
||||
var toTenant = dbContextToTenant.Tenants.SingleOrDefault(q => q.Alias == toAlias);
|
||||
|
||||
toTenant.Status = TenantStatus.Restoring;
|
||||
toTenant.StatusChanged = DateTime.UtcNow;
|
||||
|
||||
dbContextTenant.Tenants.Update(toTenant);
|
||||
dbContextToTenant.SaveChanges();
|
||||
|
||||
columnMapper.SetMapping("tenants_tenants", "id", fromTenant.Id, toTenant.Id);
|
||||
columnMapper.Commit();
|
||||
}
|
||||
using (var dataReader = new ZipReadOperator(_backupFile))
|
||||
{
|
||||
foreach (var module in _modules)
|
||||
|
@ -37,8 +37,7 @@ var param = Parser.Default.ParseArguments<Options>(args).Value;
|
||||
{
|
||||
FromRegion = "personal",
|
||||
ToRegion = "personal",
|
||||
Tenant = 1,
|
||||
UserName = "administrator"
|
||||
FromAlias = "localhost"
|
||||
};*/
|
||||
|
||||
var builder = WebApplication.CreateBuilder(options);
|
||||
@ -94,11 +93,12 @@ if(string.IsNullOrEmpty(param.UserName) && string.IsNullOrEmpty(param.Mail))
|
||||
var app = builder.Build();
|
||||
Console.WriteLine("backup start");
|
||||
var migrationCreator = app.Services.GetService<MigrationCreator>();
|
||||
var fileName = migrationCreator.Create(param.Tenant, param.UserName, param.Mail, param.ToRegion);
|
||||
var fileName = migrationCreator.Create(param.FromAlias, param.UserName, param.Mail, param.ToRegion, param.ToAlias);
|
||||
Console.WriteLine("backup was success");
|
||||
|
||||
Console.WriteLine("restore start");
|
||||
var migrationRunner = app.Services.GetService<MigrationRunner>();
|
||||
await migrationRunner.Run(fileName, param.ToRegion);
|
||||
await migrationRunner.Run(fileName, param.ToRegion, param.FromAlias, param.ToAlias);
|
||||
Console.WriteLine("restore was success");
|
||||
|
||||
Directory.GetFiles(AppContext.BaseDirectory).Where(f => f.Equals(fileName)).ToList().ForEach(File.Delete);
|
||||
@ -109,12 +109,14 @@ if (Directory.Exists(AppContext.BaseDirectory + "\\temp"))
|
||||
}
|
||||
|
||||
Console.WriteLine("migration was success");
|
||||
Console.WriteLine($"new alias is - {migrationCreator.NewAlias}");
|
||||
|
||||
if (!string.IsNullOrEmpty(migrationCreator.NewAlias))
|
||||
{
|
||||
Console.WriteLine($"new alias is - {migrationCreator.NewAlias}");
|
||||
}
|
||||
public sealed class Options
|
||||
{
|
||||
[Option('t', "tenant", Required = true)]
|
||||
public int Tenant { get; set; }
|
||||
[Option('a', "FromAlias", Required = true)]
|
||||
public string FromAlias { get; set; }
|
||||
|
||||
[Option('u', "username", Required = false, HelpText = "enter username or mail for find user")]
|
||||
public string UserName { get; set; }
|
||||
@ -122,9 +124,12 @@ public sealed class Options
|
||||
[Option('m', "mail", Required = false, HelpText = "enter username or mail for find user")]
|
||||
public string Mail { get; set; }
|
||||
|
||||
[Option("toregion", Required = true)]
|
||||
[Option('t' ,"toregion", Required = true)]
|
||||
public string ToRegion { get; set; }
|
||||
|
||||
[Option("fromregion", Required = false, Default = "personal")]
|
||||
[Option('f' ,"fromregion", Required = false, Default = "personal")]
|
||||
public string FromRegion { get; set; }
|
||||
|
||||
[Option("ToAlias", Required = false, HelpText = "if you wish migration to already exist portal, enter the alias")]
|
||||
public string ToAlias { get; set; }
|
||||
}
|
@ -42,7 +42,7 @@
|
||||
"property": [
|
||||
{
|
||||
"name": "$STORAGE_ROOT",
|
||||
"value": "..\\Data\\"
|
||||
"value": "..\\..\\..\\Data\\"
|
||||
}
|
||||
]
|
||||
}
|
||||
@ -90,7 +90,7 @@
|
||||
"property": [
|
||||
{
|
||||
"name": "$STORAGE_ROOT",
|
||||
"value": "..\\Data\\"
|
||||
"value": "..\\..\\..\\Data\\"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user