Merge pull request #536 from ONLYOFFICE/bugfix/fix-clearevents-service
Bugfix/fix clearevents service
This commit is contained in:
commit
efe995786c
@ -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();
|
||||
}
|
||||
}
|
||||
|
@ -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()
|
||||
|
@ -1,7 +0,0 @@
|
||||
namespace ASC.ClearEvents.Data;
|
||||
|
||||
public class EventsContext : MessagesContext
|
||||
{
|
||||
public DbSet<DbTenant> Tenants { get; set; }
|
||||
public DbSet<DbWebstudioSettings> WebstudioSettings { get; set; }
|
||||
}
|
@ -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;
|
||||
|
@ -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) =>
|
||||
|
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user