mirror/Cleanuparr
1
0 Fork 0
mirror of https://github.com/Cleanuparr/Cleanuparr.git synced 2026-10-28 10:48:49 -04:00
Code Issues Packages Projects Releases Wiki Activity

fixed cycle prune deleting current seeker cycle

Browse Source
This commit is contained in:
Flaminel committed 2026-10-20 15:55:53 +03:00
1 parent 36e49d7ef4
commit 07bbed8d91
2 files changed
+54 -7
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

code/backend/Cleanuparr.Infrastructure.Tests/Events/EventCleanupServiceTests.cs
+52 -7
View File
@@ -200,13 +200,20 @@ public class EventCleanupServiceTests : IDisposable
EventCleanupService service = new EventCleanupService(_logger, _serviceProvider.GetRequiredService<IServiceScopeFactory>(), timeProvider, new DryRunActivity());
Guid oldCompletedId = Guid.NewGuid();
eventsContext.SeekerCycles.Add(new SeekerCycle
{
Id = oldCompletedId,
StartedAt = timeProvider.GetUtcNow().AddDays(-40),
CompletedAt = timeProvider.GetUtcNow().AddDays(-31),
CompletionReason = SeekerCycleCompletionReason.Completed,
});
eventsContext.SeekerCycles.AddRange(
new SeekerCycle
{
Id = oldCompletedId,
StartedAt = timeProvider.GetUtcNow().AddDays(-40),
CompletedAt = timeProvider.GetUtcNow().AddDays(-31),
CompletionReason = SeekerCycleCompletionReason.Completed,
},
new SeekerCycle
{
Id = Guid.NewGuid(),
StartedAt = timeProvider.GetUtcNow().AddDays(-1),
CompletedAt = null,
});
await eventsContext.SaveChangesAsync();
// Act
@@ -216,6 +223,44 @@ public class EventCleanupServiceTests : IDisposable
(await eventsContext.SeekerCycles.CountAsync(c => c.Id == oldCompletedId)).ShouldBe(0);
}
[Fact]
public async Task PruneSeekerCyclesAsync_KeepsNewestCycleEvenWhenOld()
{
// Arrange
using EventsContext eventsContext = TestDataContextFactory.CreateEvents();
FakeTimeProvider timeProvider = new();
EventCleanupService service = new EventCleanupService(_logger, _serviceProvider.GetRequiredService<IServiceScopeFactory>(), timeProvider, new DryRunActivity());
Guid arrInstanceId = Guid.NewGuid();
Guid olderId = Guid.NewGuid();
Guid newestId = Guid.NewGuid();
eventsContext.SeekerCycles.AddRange(
new SeekerCycle
{
Id = olderId,
ArrInstanceId = arrInstanceId,
StartedAt = timeProvider.GetUtcNow().AddDays(-50),
CompletedAt = timeProvider.GetUtcNow().AddDays(-45),
CompletionReason = SeekerCycleCompletionReason.Completed,
},
new SeekerCycle
{
Id = newestId,
ArrInstanceId = arrInstanceId,
StartedAt = timeProvider.GetUtcNow().AddDays(-40),
CompletedAt = timeProvider.GetUtcNow().AddDays(-35),
CompletionReason = SeekerCycleCompletionReason.Completed,
});
await eventsContext.SaveChangesAsync();
// Act
await service.PruneSeekerCyclesAsync(eventsContext, retentionDays: 30);
// Assert
(await eventsContext.SeekerCycles.CountAsync(c => c.Id == olderId)).ShouldBe(0);
(await eventsContext.SeekerCycles.CountAsync(c => c.Id == newestId)).ShouldBe(1);
}
[Fact]
public async Task PruneSeekerCyclesAsync_KeepsOpenAndRecentCycles()
{
code/backend/Cleanuparr.Infrastructure/Events/EventCleanupService.cs
+2
View File
@@ -223,6 +223,8 @@ public class EventCleanupService : BackgroundService
DateTimeOffset cutoff = _timeProvider.GetUtcNow().AddDays(-retentionDays);
int deleted = await eventsContext.SeekerCycles
.Where(c => c.CompletedAt != null && c.CompletedAt < cutoff)
.Where(c => eventsContext.SeekerCycles.Any(o =>
o.ArrInstanceId == c.ArrInstanceId && o.IsDryRun == c.IsDryRun && o.StartedAt > c.StartedAt))
.ExecuteDeleteAsync();
if (deleted > 0)