ONLYOFFICE · pavelbannov · Oct 26, 2021 · Oct 7, 2021 · Oct 7, 2021 · Oct 7, 2021
diff --git a/ASC.Tools.sln b/ASC.Tools.sln
@@ -0,0 +1,37 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31815.197
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Core.Common", "common\ASC.Core.Common\ASC.Core.Common.csproj", "{A51D0454-4AFA-46DE-89D4-B03D37E1816C}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AutoMigrationCreator", "common\Tools\AutoMigrationCreator\AutoMigrationCreator.csproj", "{D779E2D7-1060-43D3-B8F2-F76A73CCFEBC}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ASC.Files.Core", "products\ASC.Files\Core\ASC.Files.Core.csproj", "{B3D98EF4-B9A3-4082-AE78-7CF4C5CF5211}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|Any CPU = Debug|Any CPU
+		Release|Any CPU = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A51D0454-4AFA-46DE-89D4-B03D37E1816C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D779E2D7-1060-43D3-B8F2-F76A73CCFEBC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D779E2D7-1060-43D3-B8F2-F76A73CCFEBC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D779E2D7-1060-43D3-B8F2-F76A73CCFEBC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D779E2D7-1060-43D3-B8F2-F76A73CCFEBC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B3D98EF4-B9A3-4082-AE78-7CF4C5CF5211}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B3D98EF4-B9A3-4082-AE78-7CF4C5CF5211}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B3D98EF4-B9A3-4082-AE78-7CF4C5CF5211}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B3D98EF4-B9A3-4082-AE78-7CF4C5CF5211}.Release|Any CPU.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {3A1E5FB1-22F6-4394-BFF3-8733F4A23003}
+	EndGlobalSection
+EndGlobal
diff --git a/build/build.backend.bat b/build/build.backend.bat
@@ -1,3 +1,4 @@
+call build/createMigrations.bat
 PUSHD %~dp0..
 dotnet build ASC.Web.sln  /fl1 /flp1:LogFile=build/ASC.Web.log;Verbosity=Normal
 
@@ -8,4 +9,6 @@ if %errorlevel% == 0 (
 		echo "%%~nxf"
 		call build\scripts\%%~nxf
 	)
-)
+)
+
+pause
diff --git a/build/createMigrations.bat b/build/createMigrations.bat
@@ -0,0 +1,5 @@
+@echo "MIGRATIONS"
+@echo off
+
+PUSHD %~dp0..\common\Tools\AutoMigrationCreator
+dotnet run --project AutoMigrationCreator.csproj
diff --git a/common/ASC.Core.Common/EF/Context/AccountLinkContext.cs b/common/ASC.Core.Common/EF/Context/AccountLinkContext.cs
@@ -21,7 +21,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlAccountLinkContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlAccountLinkContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlAccountLinkContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/AuditTrailContext.cs b/common/ASC.Core.Common/EF/Context/AuditTrailContext.cs
@@ -29,8 +29,8 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
             {
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
-                    { Provider.MySql, () => new MySqlCoreDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlCoreDbContext() } ,
+                    { Provider.MySql, () => new MySqlAuditTrailContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlAuditTrailContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/BaseDbContext.cs b/common/ASC.Core.Common/EF/Context/BaseDbContext.cs
@@ -11,7 +11,7 @@ namespace ASC.Core.Common.EF
 {
     public enum Provider
     {
-        Postgre,
+        PostgreSql,
         MySql
     }
 
@@ -26,7 +26,7 @@ public BaseDbContext(DbContextOptions options) : base(options)
 
         internal string MigrateAssembly { get; set; }
         internal ILoggerFactory LoggerFactory { get; set; }
-        internal ConnectionStringSettings ConnectionStringSettings { get; set; }
+        public ConnectionStringSettings ConnectionStringSettings { get; set; }
         protected internal Provider Provider { get; set; }
 
         public static ServerVersion ServerVersion = ServerVersion.Parse("8.0.25");
@@ -70,7 +70,7 @@ protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
                         }
                     });
                     break;
-                case Provider.Postgre:
+                case Provider.PostgreSql:
                     optionsBuilder.UseNpgsql(ConnectionStringSettings.ConnectionString);
                     break;
             }
@@ -84,7 +84,7 @@ public Provider GetProviderByConnectionString()
                 case "MySql.Data.MySqlClient":
                     return Provider.MySql;
                 case "Npgsql":
-                    return Provider.Postgre;
+                    return Provider.PostgreSql;
                 default:
                     break;
             }

diff --git a/common/ASC.Core.Common/EF/Context/CoreDbContext.cs b/common/ASC.Core.Common/EF/Context/CoreDbContext.cs
@@ -23,7 +23,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlCoreDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlCoreDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlCoreDbContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/DbContext.cs b/common/ASC.Core.Common/EF/Context/DbContext.cs
@@ -30,7 +30,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlDbContext() } ,
                 };
             }
         }
@@ -39,7 +39,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
             ModelBuilderWrapper
                    .From(modelBuilder, Provider)
                    .AddMobileAppInstall()
-                   .AddDbipLocation();
+                   .AddDbipLocation()
+                   .AddRegions();
         }
     }
 

diff --git a/common/ASC.Core.Common/EF/Context/FeedDbContext.cs b/common/ASC.Core.Common/EF/Context/FeedDbContext.cs
@@ -23,7 +23,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlFeedDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlFeedDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlFeedDbContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/FilesDbContext.cs b/common/ASC.Core.Common/EF/Context/FilesDbContext.cs
@@ -20,7 +20,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlFilesDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlFilesDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlFilesDbContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/MailDbContext.cs b/common/ASC.Core.Common/EF/Context/MailDbContext.cs
@@ -29,7 +29,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlMailDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlMailDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlMailDbContext() } ,
                 };
             }
         }
@@ -39,7 +39,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)
                 .From(modelBuilder, Provider)
                 .AddMailbox()
                 .AddMailboxProvider()
-                .AddServerServer();
+                .AddServerServer()
+                .AddGreyListingWhiteList();
         }
     }
     public static class MailDbExtension

diff --git a/common/ASC.Core.Common/EF/Context/MessagesContext.cs b/common/ASC.Core.Common/EF/Context/MessagesContext.cs
@@ -21,7 +21,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlMessagesContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlMessagesContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlMessagesContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/NotifyDbContext.cs b/common/ASC.Core.Common/EF/Context/NotifyDbContext.cs
@@ -21,7 +21,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlNotifyDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlNotifyDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlNotifyDbContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/ResourceDbContext.cs b/common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
@@ -27,7 +27,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlResourceDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlResourceDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlResourceDbContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/TelegramDbContext.cs b/common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
@@ -26,7 +26,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlTelegramDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlTelegramDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlTelegramDbContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/TenantDbContext.cs b/common/ASC.Core.Common/EF/Context/TenantDbContext.cs
@@ -32,7 +32,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlTenantDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlTenantDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlTenantDbContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/UserDbContext.cs b/common/ASC.Core.Common/EF/Context/UserDbContext.cs
@@ -8,8 +8,13 @@
 
 namespace ASC.Core.Common.EF
 {
-    public class MySqlUserDbContext : UserDbContext{}
-    public class PostgreUserDbContext : UserDbContext{}
+    public class MySqlUserDbContext : UserDbContext { }
+
+
+    public class PostgreSqlUserDbContext : UserDbContext
+    {
+
+    }
 
     public class UserDbContext : BaseDbContext
     {
@@ -29,7 +34,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlUserDbContext() } ,
-                    { Provider.Postgre, () => new PostgreUserDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlUserDbContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/VoipDbContext.cs b/common/ASC.Core.Common/EF/Context/VoipDbContext.cs
@@ -22,7 +22,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlVoipDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlVoipDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlVoipDbContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs b/common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
@@ -22,7 +22,7 @@ protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
                 return new Dictionary<Provider, Func<BaseDbContext>>()
                 {
                     { Provider.MySql, () => new MySqlWebstudioDbContext() } ,
-                    { Provider.Postgre, () => new PostgreSqlWebstudioDbContext() } ,
+                    { Provider.PostgreSql, () => new PostgreSqlWebstudioDbContext() } ,
                 };
             }
         }

diff --git a/common/ASC.Core.Common/EF/Model/AccountLinks.cs b/common/ASC.Core.Common/EF/Model/AccountLinks.cs
@@ -24,7 +24,7 @@ public static ModelBuilderWrapper AddAccountLinks(this ModelBuilderWrapper model
         {
             modelBuilder
                 .Add(MySqlAddAccountLinks, Provider.MySql)
-                .Add(PgSqlAddAccountLinks, Provider.Postgre);
+                .Add(PgSqlAddAccountLinks, Provider.PostgreSql);
             return modelBuilder;
         }
         public static void MySqlAddAccountLinks(this ModelBuilder modelBuilder)

diff --git a/common/ASC.Core.Common/EF/Model/Audit/AuditEvent.cs b/common/ASC.Core.Common/EF/Model/Audit/AuditEvent.cs
@@ -13,7 +13,7 @@ public static ModelBuilderWrapper AddAuditEvent(this ModelBuilderWrapper modelBu
         {
             modelBuilder
                 .Add(MySqlAddAuditEvent, Provider.MySql)
-                .Add(PgSqlAddAuditEvent, Provider.Postgre);
+                .Add(PgSqlAddAuditEvent, Provider.PostgreSql);
             return modelBuilder;
         }
         public static void MySqlAddAuditEvent(this ModelBuilder modelBuilder)

diff --git a/common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs b/common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
@@ -14,7 +14,7 @@ public static ModelBuilderWrapper AddLoginEvents(this ModelBuilderWrapper modelB
         {
             modelBuilder
                 .Add(MySqlAddLoginEvents, Provider.MySql)
-                .Add(PgSqlAddLoginEvents, Provider.Postgre);
+                .Add(PgSqlAddLoginEvents, Provider.PostgreSql);
             return modelBuilder;
         }
         public static void MySqlAddLoginEvents(this ModelBuilder modelBuilder)

diff --git a/common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs b/common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
@@ -32,7 +32,7 @@ public static ModelBuilderWrapper AddCrmContact(this ModelBuilderWrapper modelBu
         {
             modelBuilder
                 .Add(MySqlAddCrmContact, Provider.MySql)
-                .Add(PgSqlAddCrmContact, Provider.Postgre);
+                .Add(PgSqlAddCrmContact, Provider.PostgreSql);
             return modelBuilder;
         }
         public static void MySqlAddCrmContact(this ModelBuilder modelBuilder)

diff --git a/common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs b/common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
@@ -30,7 +30,7 @@ public static ModelBuilderWrapper AddDbVoipCall(this ModelBuilderWrapper modelBu
         {
             modelBuilder
                 .Add(MySqlAddDbVoipCall, Provider.MySql)
-                .Add(PgSqlAddDbVoipCall, Provider.Postgre);
+                .Add(PgSqlAddDbVoipCall, Provider.PostgreSql);
             return modelBuilder;
         }
         public static void MySqlAddDbVoipCall(this ModelBuilder modelBuilder)

diff --git a/common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs b/common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
@@ -18,7 +18,7 @@ public static ModelBuilderWrapper AddVoipNumber(this ModelBuilderWrapper modelBu
         {
             modelBuilder
                 .Add(MySqlAddVoipNumber, Provider.MySql)
-                .Add(PgSqlAddVoipNumber, Provider.Postgre);
+                .Add(PgSqlAddVoipNumber, Provider.PostgreSql);
             return modelBuilder;
         }
         public static void MySqlAddVoipNumber(this ModelBuilder modelBuilder)

diff --git a/common/ASC.Core.Common/EF/Model/Core/Acl.cs b/common/ASC.Core.Common/EF/Model/Core/Acl.cs
@@ -27,7 +27,7 @@ public static ModelBuilderWrapper AddAcl(this ModelBuilderWrapper modelBuilder)
         {
             modelBuilder
                 .Add(MySqlAddAcl, Provider.MySql)
-                .Add(PgSqlAddAcl, Provider.Postgre)
+                .Add(PgSqlAddAcl, Provider.PostgreSql)
                 .HasData(
                     new Acl { Tenant = -1, Subject = Guid.Parse("5d5b7260-f7f7-49f1-a1c9-95fbb6a12604"), Action = Guid.Parse("ef5e6790-f346-4b6e-b662-722bc28cb0db"), Object = "", AceType = 0 },
                     new Acl { Tenant = -1, Subject = Guid.Parse("5d5b7260-f7f7-49f1-a1c9-95fbb6a12604"), Action = Guid.Parse("f11e8f3f-46e6-4e55-90e3-09c22ec565bd"), Object = "", AceType = 0 },

diff --git a/common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs b/common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
@@ -23,7 +23,7 @@ public static ModelBuilderWrapper AddCoreSettings(this ModelBuilderWrapper model
         {
             modelBuilder
                 .Add(MySqlAddCoreSettings, Provider.MySql)
-                .Add(PgSqlAddCoreSettings, Provider.Postgre)
+                .Add(PgSqlAddCoreSettings, Provider.PostgreSql)
                 .HasData(
                     new DbCoreSettings { Tenant = -1, Id = "CompanyWhiteLabelSettings", Value = new byte[] { 245, 71, 4, 138, 72, 101, 23, 21, 135, 217, 206, 188, 138, 73, 108, 96, 29, 150, 3, 31, 44, 28, 62, 145, 96, 53, 57, 66, 238, 118, 93, 172, 211, 22, 244, 181, 244, 40, 146, 67, 111, 196, 162, 27, 154, 109, 248, 255, 211, 188, 64, 54, 180, 126, 58, 90, 27, 76, 136, 27, 38, 96, 152, 105, 254, 187, 104, 72, 189, 136, 192, 46, 234, 198, 164, 204, 179, 232, 244, 4, 41, 8, 18, 240, 230, 225, 36, 165, 82, 190, 129, 165, 140, 100, 187, 139, 211, 201, 168, 192, 237, 225, 249, 66, 18, 129, 222, 12, 122, 248, 39, 51, 164, 188, 229, 21, 232, 86, 148, 196, 221, 167, 142, 34, 101, 43, 162, 137, 31, 206, 149, 120, 249, 114, 133, 168, 30, 18, 254, 223, 93, 101, 88, 97, 30, 58, 163, 224, 62, 173, 220, 170, 152, 40, 124, 100, 165, 81, 7, 87, 168, 129, 176, 12, 51, 69, 230, 252, 30, 34, 182, 7, 202, 45, 117, 60, 99, 241, 237, 148, 201, 35, 102, 219, 160, 228, 194, 230, 219, 22, 244, 74, 138, 176, 145, 0, 122, 167, 80, 93, 23, 228, 21, 48, 100, 60, 31, 250, 232, 34, 248, 249, 159, 210, 227, 12, 13, 239, 130, 223, 101, 196, 51, 36, 80, 127, 62, 92, 104, 228, 197, 226, 43, 232, 164, 12, 36, 66, 52, 133 } , LastModified = DateTime.UtcNow },
                     new DbCoreSettings { Tenant = -1, Id = "FullTextSearchSettings", Value = new byte[] { 8, 120, 207, 5, 153, 181, 23, 202, 162, 211, 218, 237, 157, 6, 76, 62, 220, 238, 175, 67, 31, 53, 166, 246, 66, 220, 173, 160, 72, 23, 227, 81, 50, 39, 187, 177, 222, 110, 43, 171, 235, 158, 16, 119, 178, 207, 49, 140, 72, 152, 20, 84, 94, 135, 117, 1, 246, 51, 251, 190, 148, 2, 44, 252, 221, 2, 91, 83, 149, 151, 58, 245, 16, 148, 52, 8, 187, 86, 150, 46, 227, 93, 163, 95, 47, 131, 116, 207, 95, 209, 38, 149, 53, 148, 73, 215, 206, 251, 194, 199, 189, 17, 42, 229, 135, 82, 23, 154, 162, 165, 158, 94, 23, 128, 30, 88, 12, 204, 96, 250, 236, 142, 189, 211, 214, 18, 196, 136, 102, 102, 217, 109, 108, 240, 96, 96, 94, 100, 201, 10, 31, 170, 128, 192 }, LastModified = DateTime.UtcNow },

diff --git a/common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs b/common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
@@ -23,7 +23,7 @@ public static ModelBuilderWrapper AddSubscriptionMethod(this ModelBuilderWrapper
         {
             modelBuilder
                 .Add(MySqlAddSubscriptionMethod, Provider.MySql)
-                .Add(PgSqlAddSubscriptionMethod, Provider.Postgre)
+                .Add(PgSqlAddSubscriptionMethod, Provider.PostgreSql)
                 .HasData(
                 new DbSubscriptionMethod { Source = "asc.web.studio", Action = "send_whats_new", Recipient = "c5cc67d1-c3e8-43c0-a3ad-3928ae3e5b5e", Sender = "email.sender", Tenant = -1 },
                 new DbSubscriptionMethod { Source = "6504977c-75af-4691-9099-084d3ddeea04", Action = "new feed", Recipient = "c5cc67d1-c3e8-43c0-a3ad-3928ae3e5b5e", Sender = "email.sender|messanger.sender", Tenant = -1 },

diff --git a/common/ASC.Core.Common/EF/Model/Core/Subscription.cs b/common/ASC.Core.Common/EF/Model/Core/Subscription.cs
@@ -24,7 +24,7 @@ public static ModelBuilderWrapper AddSubscription(this ModelBuilderWrapper model
         {
             modelBuilder
                 .Add(MySqlAddSubscription, Provider.MySql)
-                .Add(PgSqlAddSubscription, Provider.Postgre)
+                .Add(PgSqlAddSubscription, Provider.PostgreSql)
                 .HasData(
                 new Subscription { Source = "asc.web.studio", Action = "send_whats_new", Recipient = "c5cc67d1-c3e8-43c0-a3ad-3928ae3e5b5e", Object = "", Tenant = -1 },
                 new Subscription { Source = "6504977c-75af-4691-9099-084d3ddeea04", Action = "new feed", Recipient = "c5cc67d1-c3e8-43c0-a3ad-3928ae3e5b5e", Object = "", Tenant = -1 },

diff --git a/common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs b/common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
@@ -19,7 +19,7 @@ public static ModelBuilderWrapper AddDbWebstudioIndex(this ModelBuilderWrapper m
         {
             modelBuilder
                 .Add(MySqlAddDbWebstudioIndex, Provider.MySql)
-                .Add(PgSqlAddDbWebstudioIndex, Provider.Postgre);
+                .Add(PgSqlAddDbWebstudioIndex, Provider.PostgreSql);
             return modelBuilder;
         }
         public static void MySqlAddDbWebstudioIndex(this ModelBuilder modelBuilder)