Union/ProjectLighthouse
1
0
Fork 0
mirror of https://github.com/LBPUnion/ProjectLighthouse.git synced 2025-07-24 06:01:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Don't dismiss already dismissed cases in repeating task (#897)

Browse source 
* Don't dismiss already dismissed cases in repeating task

* Implement unit test to cover patch

* Remove unnecessary null check
This commit is contained in:
koko 2023-09-13 09:04:12 -04:00 • committed by GitHub
parent 22c220c432
commit 665f9d9d34
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 33 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ProjectLighthouse.Tests/Unit/ModerationTests.cs
View file

@ -15,22 +15,22 @@ public class ModerationTests
public async void DismissExpiredCases_ShouldDismissExpiredCase() public async void DismissExpiredCases_ShouldDismissExpiredCase()
{ {
await using DatabaseContext database = await MockHelper.GetTestDatabase(); await using DatabaseContext database = await MockHelper.GetTestDatabase();
ModerationCaseEntity @case = new() ModerationCaseEntity @case = new()
{ {
CaseId = 1, CaseId = 1,
ExpiresAt = DateTime.UnixEpoch, ExpiresAt = DateTime.UnixEpoch,
CreatorUsername = "unitTestUser", CreatorUsername = "unitTestUser",
}; };
database.Cases.Add(@case); database.Cases.Add(@case);
await database.SaveChangesAsync(); await database.SaveChangesAsync();
DismissExpiredCasesTask task = new(); DismissExpiredCasesTask task = new();
await task.Run(database); await task.Run(database);
Assert.Null(await database.Cases.FirstOrDefaultAsync(c => c.CaseId == 1 && c.DismissedAt == null)); Assert.NotNull(await database.Cases.FirstOrDefaultAsync(c => c.CaseId == 1 && c.DismissedAt != null));
} }
[Fact] [Fact]
@ -54,4 +54,29 @@ public class ModerationTests
Assert.NotNull(await database.Cases.FirstOrDefaultAsync(c => c.CaseId == 2 && c.DismissedAt == null)); Assert.NotNull(await database.Cases.FirstOrDefaultAsync(c => c.CaseId == 2 && c.DismissedAt == null));
} }
[Fact]
public async void DismissExpiredCases_ShouldNotDismissAlreadyDismissedCase()
{
await using DatabaseContext database = await MockHelper.GetTestDatabase();
ModerationCaseEntity @case = new()
{
CaseId = 3,
ExpiresAt = DateTime.UnixEpoch,
DismissedAt = DateTime.UnixEpoch,
CreatorUsername = "unitTestUser",
};
database.Cases.Add(@case);
await database.SaveChangesAsync();
DismissExpiredCasesTask task = new();
await task.Run(database);
// check that the case was not dismissed again by comparing original time to new time
Assert.NotNull(
await database.Cases.FirstOrDefaultAsync(c => c.CaseId == 3 && c.DismissedAt == DateTime.UnixEpoch));
}
} }

5
ProjectLighthouse/Administration/Maintenance/RepeatingTasks/DismissExpiredCasesTask.cs
View file

@ -19,8 +19,9 @@ public class DismissExpiredCasesTask : IRepeatingTask
public async Task Run(DatabaseContext database) public async Task Run(DatabaseContext database)
{ {
List<ModerationCaseEntity> expiredCases = List<ModerationCaseEntity> expiredCases = await database.Cases
await database.Cases.Where(c => c.ExpiresAt != null && c.ExpiresAt < DateTime.UtcNow).ToListAsync(); .Where(c => c.DismissedAt == null && c.ExpiresAt != null && c.ExpiresAt < DateTime.UtcNow)
.ToListAsync();
if (expiredCases.Count == 0) if (expiredCases.Count == 0)
{ {