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

Merge pull request #1493 from ONLYOFFICE/bugfix/foreign-keys

Browse Source 
fix migrations
This commit is contained in:
Pavel Bannov 2023-06-27 02:36:11 -07:00 committed by GitHub
commit 24706477db
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/ASC.Data.Storage/StorageFactory.cs
View File

@ -135,10 +135,10 @@ public class StorageFactory
_coreBaseSettings = coreBaseSettings;
}
public async Task<IDataStore> GetStorageAsync(int? tenant, string module, string region = "current")
public async Task<IDataStore> GetStorageAsync(int tenant, string module, string region = "current")
{
var tenantQuotaController = _serviceProvider.GetService<TenantQuotaController>();
tenantQuotaController.Init(tenant.GetValueOrDefault());
tenantQuotaController.Init(tenant);
return await GetStorageAsync(tenant, module, tenantQuotaController, region);
}

2
common/ASC.IPSecurity/Models/IPRestriction.cs
View File

@ -31,7 +31,7 @@ public class IPRestriction : IpRestrictionBase, IMapFrom<TenantIpRestrictions>
{
public int Id { get; set; }
public int Tenant { get; set; }
public int TenantId { get; set; }
}
public class IpRestrictionBase

2
migrations/mysql/MigrationContext/20230621124714_MigrationContext_Upgrade1.cs
View File

@ -10,6 +10,8 @@ namespace ASC.Migrations.MySql.Migrations.Migration
/// <inheritdoc />
protected override void Up(MigrationBuilder migrationBuilder)
{
migrationBuilder.Sql("UPDATE tenants_quotarow SET tenant = -1 WHERE tenant = 0;");
migrationBuilder.AddForeignKey(
name: "FK_audit_events_tenants_tenants_tenant_id",
table: "audit_events",

4
products/ASC.Files/Core/Helpers/Global.cs
View File

@ -259,13 +259,13 @@ public class GlobalStore
public async Task<IDataStore> GetStoreAsync(bool currentTenant = true)
{
return await _storageFactory.GetStorageAsync(currentTenant ? await _tenantManager.GetCurrentTenantIdAsync() : null, FileConstant.StorageModule);
return await _storageFactory.GetStorageAsync(currentTenant ? await _tenantManager.GetCurrentTenantIdAsync() : -1, FileConstant.StorageModule);
}
public async Task<IDataStore> GetStoreTemplateAsync()
{
return await _storageFactory.GetStorageAsync(null, FileConstant.StorageTemplate);
return await _storageFactory.GetStorageAsync(-1, FileConstant.StorageTemplate);
}
}

6
web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
View File

@ -651,7 +651,7 @@ public class TenantWhiteLabelSettingsHelper
return null;
}
var partnerStorage = await _storageFactory.GetStorageAsync(null, "static_partnerdata");
var partnerStorage = await _storageFactory.GetStorageAsync(-1, "static_partnerdata");
if (partnerStorage == null)
{
@ -659,7 +659,7 @@ public class TenantWhiteLabelSettingsHelper
}
var logoPath = BuildLogoFileName(type, partnerSettings.GetExt(type), dark);
return (await partnerStorage.IsFileAsync(logoPath)) ? (await partnerStorage.GetUriAsync(logoPath)).ToString() : null;
}
@ -703,7 +703,7 @@ public class TenantWhiteLabelSettingsHelper
return null;
}
var partnerStorage = await _storageFactory.GetStorageAsync(null, "static_partnerdata");
var partnerStorage = await _storageFactory.GetStorageAsync(-1, "static_partnerdata");
if (partnerStorage == null)
{