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

fix GetOldEventsAsync

Browse Source
This commit is contained in:
Anton Suhorukov 2023-05-21 00:34:05 +03:00
parent e1bbd9a389
commit fab1e08cc5
1 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,15 +90,15 @@ public class ClearEventsService : IHostedService, IDisposable
private async Task GetOldEventsAsync<T>(Expression<Func<MessagesContext, DbSet<T>>> func, string settings) where T : MessageEvent private async Task GetOldEventsAsync<T>(Expression<Func<MessagesContext, DbSet<T>>> func, string settings) where T : MessageEvent
{ {
List<T> ids;
var compile = func.Compile(); var compile = func.Compile();
do
{
using var scope = _serviceScopeFactory.CreateScope(); using var scope = _serviceScopeFactory.CreateScope();
using var ef = scope.ServiceProvider.GetService<IDbContextFactory<MessagesContext>>().CreateDbContext(); using var ef = scope.ServiceProvider.GetService<IDbContextFactory<MessagesContext>>().CreateDbContext();
var table = compile.Invoke(ef); var table = compile.Invoke(ef);
int count;
var ae = table do
{
count = await table
.Join(ef.Tenants, r => r.TenantId, r => r.Id, (audit, tenant) => audit) .Join(ef.Tenants, r => r.TenantId, r => r.Id, (audit, tenant) => audit)
.Select(r => new .Select(r => new
{ {
@ -112,18 +112,10 @@ public class ClearEventsService : IHostedService, IDisposable
.Where(a => a.TenantId == r.TenantId && a.Id == TenantAuditSettings.Guid) .Where(a => a.TenantId == r.TenantId && a.Id == TenantAuditSettings.Guid)
.Select(r => JsonExtensions.JsonValue(nameof(r.Data).ToLower(), settings)) .Select(r => JsonExtensions.JsonValue(nameof(r.Data).ToLower(), settings))
.FirstOrDefault() ?? TenantAuditSettings.MaxLifeTime.ToString()))) .FirstOrDefault() ?? TenantAuditSettings.MaxLifeTime.ToString())))
.Take(1000); .Select(r => r.ef)
.Take(1000)
ids = await ae.Select(r => r.ef).ToListAsync(); .ExecuteDeleteAsync();
if (!ids.Any())
{
return;
} }
while(count == 1000);
table.RemoveRange(ids);
await ef.SaveChangesAsync();
} while (ids.Any());
} }
} }