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

Merge pull request #536 from ONLYOFFICE/bugfix/fix-clearevents-service

Browse Source 
Bugfix/fix clearevents service
This commit is contained in:
Alexey Bannov 2022-02-17 20:51:25 +03:00 committed by GitHub
commit efe995786c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 7 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
common/ASC.Core.Common/EF/Context/MessagesContext.cs
View File

@ -6,6 +6,8 @@
{
public DbSet<AuditEvent> AuditEvents { get; set; }
public DbSet<LoginEvent> LoginEvents { get; set; }
public DbSet<DbWebstudioSettings> WebstudioSettings { get; set; }
public DbSet<DbTenant> Tenants { get; set; }
public DbSet<User> Users { get; set; }
protected override Dictionary<Provider, Func<BaseDbContext>> ProviderContext
@ -27,6 +29,8 @@
.AddAuditEvent()
.AddLoginEvents()
.AddUser()
.AddWebstudioSettings()
.AddDbTenant()
.AddDbFunction();
}
}

1
common/ASC.Core.Common/EF/Model/User/User.cs
View File

@ -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<UserGroup> Groups { get; set; }
public override object[] GetKeys()

7
common/services/ASC.ClearEvents/Data/EventsContext.cs
View File

@ -1,7 +0,0 @@
namespace ASC.ClearEvents.Data;
public class EventsContext : MessagesContext
{
public DbSet<DbTenant> Tenants { get; set; }
public DbSet<DbWebstudioSettings> WebstudioSettings { get; set; }
}

1
common/services/ASC.ClearEvents/GlobalUsings.cs
View File

@ -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;

2
common/services/ASC.ClearEvents/Program.cs
View File

@ -76,7 +76,7 @@ builder.Host.ConfigureServices((hostContext, services) =>
services.AddHostedService<ClearEventsService>();
diHelper.TryAdd<ClearEventsService>();
diHelper.TryAdd<DbContextManager<EventsContext>>();
diHelper.TryAdd<DbContextManager<MessagesContext>>();
});
builder.Host.ConfigureContainer<ContainerBuilder>((context, builder) =>

4
common/services/ASC.ClearEvents/Services/ClearEventsService.cs
View File

@ -87,14 +87,14 @@ public class ClearEventsService : IHostedService, IDisposable
}
}
private void GetOldEvents<T>(Expression<Func<EventsContext, DbSet<T>>> func, string settings) where T : MessageEvent
private void GetOldEvents<T>(Expression<Func<MessagesContext, DbSet<T>>> func, string settings) where T : MessageEvent
{
List<T> ids;
var compile = func.Compile();
do
{
using var scope = _serviceScopeFactory.CreateScope();
using var ef = scope.ServiceProvider.GetService<DbContextManager<EventsContext>>().Get("messages");
using var ef = scope.ServiceProvider.GetService<DbContextManager<MessagesContext>>().Get("messages");
var table = compile.Invoke(ef);
var ae = table