From 0bd332d2a9220896aadb6dd35f1feb71bb2c9db9 Mon Sep 17 00:00:00 2001
From: Anton Sukhorukov <anton.sukhorukov@onlyoffice.com>
Date: Tue, 27 Jun 2023 12:18:04 +0300
Subject: [PATCH] fix migrations

---
 common/ASC.Data.Storage/StorageFactory.cs                   | 4 ++--
 common/ASC.IPSecurity/Models/IPRestriction.cs               | 2 +-
 .../20230621124714_MigrationContext_Upgrade1.cs             | 2 ++
 products/ASC.Files/Core/Helpers/Global.cs                   | 4 ++--
 web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs     | 6 +++---
 5 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/common/ASC.Data.Storage/StorageFactory.cs b/common/ASC.Data.Storage/StorageFactory.cs
index 4ff89bb507..f27fa1ab29 100644
--- a/common/ASC.Data.Storage/StorageFactory.cs
+++ b/common/ASC.Data.Storage/StorageFactory.cs
@@ -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);
     }
diff --git a/common/ASC.IPSecurity/Models/IPRestriction.cs b/common/ASC.IPSecurity/Models/IPRestriction.cs
index 5db2762a8c..a73e678adc 100644
--- a/common/ASC.IPSecurity/Models/IPRestriction.cs
+++ b/common/ASC.IPSecurity/Models/IPRestriction.cs
@@ -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
diff --git a/migrations/mysql/MigrationContext/20230621124714_MigrationContext_Upgrade1.cs b/migrations/mysql/MigrationContext/20230621124714_MigrationContext_Upgrade1.cs
index 443cbc702f..f1f6b3014a 100644
--- a/migrations/mysql/MigrationContext/20230621124714_MigrationContext_Upgrade1.cs
+++ b/migrations/mysql/MigrationContext/20230621124714_MigrationContext_Upgrade1.cs
@@ -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",
diff --git a/products/ASC.Files/Core/Helpers/Global.cs b/products/ASC.Files/Core/Helpers/Global.cs
index 15833f8b03..b6848cf984 100644
--- a/products/ASC.Files/Core/Helpers/Global.cs
+++ b/products/ASC.Files/Core/Helpers/Global.cs
@@ -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);
     }
 }
 
diff --git a/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs b/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
index 74a24e1ca7..17b01b85a6 100644
--- a/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
+++ b/web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
@@ -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)
         {