notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[backend/core] Fix user purge job processor errors (ISH-525)

Browse source
This commit is contained in:
Laura Hausmann 2024-10-15 02:31:52 +02:00
parent ccf1e60ad4
commit 60d112a6ad
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
1 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Iceshrimp.Backend/Core/Queues/BackgroundTaskQueue.cs
View file

@ -309,7 +309,7 @@ public class BackgroundTaskQueue(int parallelism)
} }
var fileIdQ = db.DriveFiles.Where(p => p.User == user).Select(p => p.Id); var fileIdQ = db.DriveFiles.Where(p => p.User == user).Select(p => p.Id);
var fileIdCnt = fileIdQ.CountAsync(token); var fileIdCnt = await fileIdQ.CountAsync(token);
var fileIds = fileIdQ.AsChunkedAsyncEnumerable(50, p => p); var fileIds = fileIdQ.AsChunkedAsyncEnumerable(50, p => p);
logger.LogDebug("Removing {count} files for user {id}", fileIdCnt, user.Id); logger.LogDebug("Removing {count} files for user {id}", fileIdCnt, user.Id);
await foreach (var id in fileIds) await foreach (var id in fileIds)
@ -321,16 +321,18 @@ public class BackgroundTaskQueue(int parallelism)
} }
var noteQ = db.Notes.Where(p => p.User == user).Select(p => p.Id); var noteQ = db.Notes.Where(p => p.User == user).Select(p => p.Id);
var noteCnt = noteQ.CountAsync(token); var noteCnt = await noteQ.CountAsync(token);
var noteIds = noteQ.AsChunkedAsyncEnumerable(50, p => p); var noteIds = noteQ.AsChunkedAsyncEnumerable(50, p => p);
logger.LogDebug("Removing {count} notes for user {id}", noteCnt, user.Id); logger.LogDebug("Removing {count} notes for user {id}", noteCnt, user.Id);
await foreach (var id in noteIds) await foreach (var id in noteIds)
{ {
var note = await db.Notes.AsNoTracking() var note = await db.Notes
.IncludeCommonProperties() .IncludeCommonProperties()
.FirstOrDefaultAsync(p => p.Id == id, cancellationToken: token); .FirstOrDefaultAsync(p => p.Id == id, cancellationToken: token);
if (note != null) await noteSvc.DeleteNoteAsync(note); if (note != null) await noteSvc.DeleteNoteAsync(note);
db.ChangeTracker.Clear();
} }
logger.LogDebug("User {id} purged successfully", jobData.UserId); logger.LogDebug("User {id} purged successfully", jobData.UserId);