From 84c44ea76239c7897bd90a4647d9d2b61a185c0b Mon Sep 17 00:00:00 2001 From: MaksimChegulov Date: Tue, 15 Feb 2022 18:08:04 +0300 Subject: [PATCH 1/6] Core: removed unused property that caused the service to crash --- common/ASC.Core.Common/EF/Model/User/User.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/common/ASC.Core.Common/EF/Model/User/User.cs b/common/ASC.Core.Common/EF/Model/User/User.cs index 2c6065a717..59d1f31d4a 100644 --- a/common/ASC.Core.Common/EF/Model/User/User.cs +++ b/common/ASC.Core.Common/EF/Model/User/User.cs @@ -27,7 +27,6 @@ public bool Removed { get; set; } public DateTime CreateOn { get; set; } public DateTime LastModified { get; set; } - public UserSecurity UserSecurity { get; set; } public List Groups { get; set; } public override object[] GetKeys() From 65a9c19e7eca98c2142f9ed1b56f0128bedccdbe Mon Sep 17 00:00:00 2001 From: MaksimChegulov Date: Tue, 15 Feb 2022 18:09:10 +0300 Subject: [PATCH 2/6] ClearEvents: removed unnecessary context --- common/services/ASC.ClearEvents/Data/EventsContext.cs | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 common/services/ASC.ClearEvents/Data/EventsContext.cs diff --git a/common/services/ASC.ClearEvents/Data/EventsContext.cs b/common/services/ASC.ClearEvents/Data/EventsContext.cs deleted file mode 100644 index ead0a53770..0000000000 --- a/common/services/ASC.ClearEvents/Data/EventsContext.cs +++ /dev/null @@ -1,7 +0,0 @@ -namespace ASC.ClearEvents.Data; - -public class EventsContext : MessagesContext -{ - public DbSet Tenants { get; set; } - public DbSet WebstudioSettings { get; set; } -} \ No newline at end of file From 226a38ad877eca31e36e5f489e0817692611fcb0 Mon Sep 17 00:00:00 2001 From: MaksimChegulov Date: Tue, 15 Feb 2022 18:10:12 +0300 Subject: [PATCH 3/6] Core: added DbSet's to MessagesContext --- common/ASC.Core.Common/EF/Context/MessagesContext.cs | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/common/ASC.Core.Common/EF/Context/MessagesContext.cs b/common/ASC.Core.Common/EF/Context/MessagesContext.cs index 200cfcf56f..e530df84fe 100644 --- a/common/ASC.Core.Common/EF/Context/MessagesContext.cs +++ b/common/ASC.Core.Common/EF/Context/MessagesContext.cs @@ -6,6 +6,8 @@ { public DbSet AuditEvents { get; set; } public DbSet LoginEvents { get; set; } + public DbSet WebstudioSettings { get; set; } + public DbSet Tenants { get; set; } public DbSet Users { get; set; } protected override Dictionary> ProviderContext @@ -27,6 +29,8 @@ .AddAuditEvent() .AddLoginEvents() .AddUser() + .AddWebstudioSettings() + .AddDbTenant() .AddDbFunction(); } } From a98a397e7978a7562cbb40fab357e44626599fef Mon Sep 17 00:00:00 2001 From: MaksimChegulov Date: Tue, 15 Feb 2022 18:10:31 +0300 Subject: [PATCH 4/6] ClearEvents: changed context --- .../services/ASC.ClearEvents/Services/ClearEventsService.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/services/ASC.ClearEvents/Services/ClearEventsService.cs b/common/services/ASC.ClearEvents/Services/ClearEventsService.cs index 91db22cfbd..639af24c17 100644 --- a/common/services/ASC.ClearEvents/Services/ClearEventsService.cs +++ b/common/services/ASC.ClearEvents/Services/ClearEventsService.cs @@ -87,14 +87,14 @@ public class ClearEventsService : IHostedService, IDisposable } } - private void GetOldEvents(Expression>> func, string settings) where T : MessageEvent + private void GetOldEvents(Expression>> func, string settings) where T : MessageEvent { List ids; var compile = func.Compile(); do { using var scope = _serviceScopeFactory.CreateScope(); - using var ef = scope.ServiceProvider.GetService>().Get("messages"); + using var ef = scope.ServiceProvider.GetService>().Get("messages"); var table = compile.Invoke(ef); var ae = table From 2b81fabd9c5601c78cea93bc6234f91a77bdfe6f Mon Sep 17 00:00:00 2001 From: MaksimChegulov Date: Tue, 15 Feb 2022 18:10:54 +0300 Subject: [PATCH 5/6] =?UTF-8?q?ClearEvents:=20remov=D0=B5=20unnecessary=20?= =?UTF-8?q?using?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/services/ASC.ClearEvents/GlobalUsings.cs | 1 - 1 file changed, 1 deletion(-) diff --git a/common/services/ASC.ClearEvents/GlobalUsings.cs b/common/services/ASC.ClearEvents/GlobalUsings.cs index b2f4380e8d..b8522744e2 100644 --- a/common/services/ASC.ClearEvents/GlobalUsings.cs +++ b/common/services/ASC.ClearEvents/GlobalUsings.cs @@ -8,7 +8,6 @@ global using System.Threading.Tasks; global using ASC.Api.Core; global using ASC.ClearEvents.Services; -global using ASC.ClearEvents.Data; global using ASC.Common; global using ASC.Common.Utils; global using ASC.Common.Caching; From cb972e54982d9db201813ecc6998f5a254e540f8 Mon Sep 17 00:00:00 2001 From: MaksimChegulov Date: Tue, 15 Feb 2022 18:11:08 +0300 Subject: [PATCH 6/6] ClearEvents: changed context --- common/services/ASC.ClearEvents/Program.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/services/ASC.ClearEvents/Program.cs b/common/services/ASC.ClearEvents/Program.cs index 8bd2c5ae48..65e7b7b133 100644 --- a/common/services/ASC.ClearEvents/Program.cs +++ b/common/services/ASC.ClearEvents/Program.cs @@ -76,7 +76,7 @@ builder.Host.ConfigureServices((hostContext, services) => services.AddHostedService(); diHelper.TryAdd(); - diHelper.TryAdd>(); + diHelper.TryAdd>(); }); builder.Host.ConfigureContainer((context, builder) =>