AZEN-SGG/Kavita
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed Delete Series + Issue Covers from Kavita+ (#3784)

Browse source
This commit is contained in:
Joe Milazzo 2025-05-03 13:46:40 -06:00 • committed by GitHub
parent 3a0d33ca13
commit bc41b0256e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
38 changed files with 2189 additions and 1596 deletions
Download patch file Download diff file Expand all files Collapse all files

14
API.Tests/Extensions/ChapterListExtensionsTests.cs
View file

@ -142,7 +142,7 @@ public class ChapterListExtensionsTests
CreateChapter("darker than black", "1", CreateFile("/manga/darker than black.cbz", MangaFormat.Archive), false),
};
Assert.Equal(chapterList.First(), chapterList.GetFirstChapterWithFiles());
Assert.Equal(chapterList[0], chapterList.GetFirstChapterWithFiles());
}
[Fact]
@ -150,13 +150,13 @@ public class ChapterListExtensionsTests
{
var chapterList = new List<Chapter>()
{
CreateChapter("darker than black", API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter, CreateFile("/manga/darker than black.cbz", MangaFormat.Archive), true),
CreateChapter("darker than black", Parser.DefaultChapter, CreateFile("/manga/darker than black.cbz", MangaFormat.Archive), true),
CreateChapter("darker than black", "1", CreateFile("/manga/darker than black.cbz", MangaFormat.Archive), false),
};
chapterList.First().Files = new List<MangaFile>();
chapterList[0].Files = new List<MangaFile>();
Assert.Equal(chapterList.Last(), chapterList.GetFirstChapterWithFiles());
Assert.Equal(chapterList[^1], chapterList.GetFirstChapterWithFiles());
}
@ -181,7 +181,7 @@ public class ChapterListExtensionsTests
CreateChapter("detective comics", API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter, CreateFile("/manga/detective comics #001.cbz", MangaFormat.Archive), true)
};
chapterList[0].ReleaseDate = new DateTime(10, 1, 1);
chapterList[0].ReleaseDate = new DateTime(10, 1, 1, 0, 0, 0, DateTimeKind.Utc);
chapterList[1].ReleaseDate = DateTime.MinValue;
Assert.Equal(0, chapterList.MinimumReleaseYear());
@ -196,8 +196,8 @@ public class ChapterListExtensionsTests
CreateChapter("detective comics", API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter, CreateFile("/manga/detective comics #001.cbz", MangaFormat.Archive), true)
};
chapterList[0].ReleaseDate = new DateTime(2002, 1, 1);
chapterList[1].ReleaseDate = new DateTime(2012, 2, 1);
chapterList[0].ReleaseDate = new DateTime(2002, 1, 1, 0, 0, 0, DateTimeKind.Utc);
chapterList[1].ReleaseDate = new DateTime(2012, 2, 1, 0, 0, 0, DateTimeKind.Utc);
Assert.Equal(2002, chapterList.MinimumReleaseYear());
}

234
API.Tests/Extensions/SeriesFilterTests.cs
View file

@ -24,9 +24,9 @@ public class SeriesFilterTests : AbstractDbTest
{
protected override async Task ResetDb()
{
_context.Series.RemoveRange(_context.Series);
_context.AppUser.RemoveRange(_context.AppUser);
await _context.SaveChangesAsync();
Context.Series.RemoveRange(Context.Series);
Context.AppUser.RemoveRange(Context.AppUser);
await Context.SaveChangesAsync();
}
#region HasProgress
@ -54,18 +54,18 @@ public class SeriesFilterTests : AbstractDbTest
.WithLibrary(library)
.Build();
_context.Users.Add(user);
_context.Library.Add(library);
await _context.SaveChangesAsync();
Context.Users.Add(user);
Context.Library.Add(library);
await Context.SaveChangesAsync();
// Create read progress on Partial and Full
var readerService = new ReaderService(_unitOfWork, Substitute.For<ILogger<ReaderService>>(),
var readerService = new ReaderService(UnitOfWork, Substitute.For<ILogger<ReaderService>>(),
Substitute.For<IEventHub>(), Substitute.For<IImageService>(),
Substitute.For<IDirectoryService>(), Substitute.For<IScrobblingService>());
// Select Partial and set pages read to 5 on first chapter
var partialSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2);
var partialSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2);
var partialChapter = partialSeries.Volumes.First().Chapters.First();
Assert.True(await readerService.SaveReadingProgress(new ProgressDto()
@ -78,7 +78,7 @@ public class SeriesFilterTests : AbstractDbTest
}, user.Id));
// Select Full and set pages read to 10 on first chapter
var fullSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(3);
var fullSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(3);
var fullChapter = fullSeries.Volumes.First().Chapters.First();
Assert.True(await readerService.SaveReadingProgress(new ProgressDto()
@ -98,7 +98,7 @@ public class SeriesFilterTests : AbstractDbTest
{
var user = await SetupHasProgress();
var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.LessThan, 50, user.Id)
var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.LessThan, 50, user.Id)
.ToListAsync();
Assert.Single(queryResult);
@ -111,7 +111,7 @@ public class SeriesFilterTests : AbstractDbTest
var user = await SetupHasProgress();
// Query series with progress <= 50%
var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.LessThanEqual, 50, user.Id)
var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.LessThanEqual, 50, user.Id)
.ToListAsync();
Assert.Equal(2, queryResult.Count);
@ -125,7 +125,7 @@ public class SeriesFilterTests : AbstractDbTest
var user = await SetupHasProgress();
// Query series with progress > 50%
var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.GreaterThan, 50, user.Id)
var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.GreaterThan, 50, user.Id)
.ToListAsync();
Assert.Single(queryResult);
@ -138,7 +138,7 @@ public class SeriesFilterTests : AbstractDbTest
var user = await SetupHasProgress();
// Query series with progress == 100%
var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.Equal, 100, user.Id)
var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.Equal, 100, user.Id)
.ToListAsync();
Assert.Single(queryResult);
@ -151,7 +151,7 @@ public class SeriesFilterTests : AbstractDbTest
var user = await SetupHasProgress();
// Query series with progress < 100%
var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.LessThan, 100, user.Id)
var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.LessThan, 100, user.Id)
.ToListAsync();
Assert.Equal(2, queryResult.Count);
@ -165,7 +165,7 @@ public class SeriesFilterTests : AbstractDbTest
var user = await SetupHasProgress();
// Query series with progress <= 100%
var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.LessThanEqual, 100, user.Id)
var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.LessThanEqual, 100, user.Id)
.ToListAsync();
Assert.Equal(3, queryResult.Count);
@ -188,16 +188,16 @@ public class SeriesFilterTests : AbstractDbTest
.WithLibrary(library)
.Build();
_context.Users.Add(user);
_context.Library.Add(library);
await _context.SaveChangesAsync();
Context.Users.Add(user);
Context.Library.Add(library);
await Context.SaveChangesAsync();
var readerService = new ReaderService(_unitOfWork, Substitute.For<ILogger<ReaderService>>(),
var readerService = new ReaderService(UnitOfWork, Substitute.For<ILogger<ReaderService>>(),
Substitute.For<IEventHub>(), Substitute.For<IImageService>(),
Substitute.For<IDirectoryService>(), Substitute.For<IScrobblingService>());
// Set progress to 99.99% (99/100 pages read)
var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
var chapter = series.Volumes.First().Chapters.First();
Assert.True(await readerService.SaveReadingProgress(new ProgressDto()
@ -210,7 +210,7 @@ public class SeriesFilterTests : AbstractDbTest
}, user.Id));
// Query series with progress < 100%
var queryResult = await _context.Series.HasReadingProgress(true, FilterComparison.LessThan, 100, user.Id)
var queryResult = await Context.Series.HasReadingProgress(true, FilterComparison.LessThan, 100, user.Id)
.ToListAsync();
Assert.Single(queryResult);
@ -246,9 +246,9 @@ public class SeriesFilterTests : AbstractDbTest
.WithLibrary(library)
.Build();
_context.Users.Add(user);
_context.Library.Add(library);
await _context.SaveChangesAsync();
Context.Users.Add(user);
Context.Library.Add(library);
await Context.SaveChangesAsync();
return user;
}
@ -258,7 +258,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasLanguage();
var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.Equal, ["en"]).ToListAsync();
var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.Equal, ["en"]).ToListAsync();
Assert.Single(foundSeries);
Assert.Equal("en", foundSeries[0].Metadata.Language);
}
@ -268,7 +268,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasLanguage();
var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.NotEqual, ["en"]).ToListAsync();
var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.NotEqual, ["en"]).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.DoesNotContain(foundSeries, s => s.Metadata.Language == "en");
}
@ -278,7 +278,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasLanguage();
var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.Contains, ["en", "fr"]).ToListAsync();
var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.Contains, ["en", "fr"]).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Metadata.Language == "en");
Assert.Contains(foundSeries, s => s.Metadata.Language == "fr");
@ -289,7 +289,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasLanguage();
var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.NotContains, ["en", "fr"]).ToListAsync();
var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.NotContains, ["en", "fr"]).ToListAsync();
Assert.Single(foundSeries);
Assert.Equal("es", foundSeries[0].Metadata.Language);
}
@ -300,11 +300,11 @@ public class SeriesFilterTests : AbstractDbTest
await SetupHasLanguage();
// Since "MustContains" matches all the provided languages, no series should match in this case.
var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.MustContains, ["en", "fr"]).ToListAsync();
var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.MustContains, ["en", "fr"]).ToListAsync();
Assert.Empty(foundSeries);
// Single language should work.
foundSeries = await _context.Series.HasLanguage(true, FilterComparison.MustContains, ["en"]).ToListAsync();
foundSeries = await Context.Series.HasLanguage(true, FilterComparison.MustContains, ["en"]).ToListAsync();
Assert.Single(foundSeries);
Assert.Equal("en", foundSeries[0].Metadata.Language);
}
@ -314,7 +314,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasLanguage();
var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.Matches, ["e"]).ToListAsync();
var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.Matches, ["e"]).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains("en", foundSeries.Select(s => s.Metadata.Language));
Assert.Contains("es", foundSeries.Select(s => s.Metadata.Language));
@ -325,7 +325,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasLanguage();
var foundSeries = await _context.Series.HasLanguage(false, FilterComparison.Equal, ["en"]).ToListAsync();
var foundSeries = await Context.Series.HasLanguage(false, FilterComparison.Equal, ["en"]).ToListAsync();
Assert.Equal(3, foundSeries.Count);
}
@ -334,7 +334,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasLanguage();
var foundSeries = await _context.Series.HasLanguage(true, FilterComparison.Equal, new List<string>()).ToListAsync();
var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.Equal, new List<string>()).ToListAsync();
Assert.Equal(3, foundSeries.Count);
}
@ -345,7 +345,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () =>
{
await _context.Series.HasLanguage(true, FilterComparison.GreaterThan, ["en"]).ToListAsync();
await Context.Series.HasLanguage(true, FilterComparison.GreaterThan, ["en"]).ToListAsync();
});
}
@ -379,9 +379,9 @@ public class SeriesFilterTests : AbstractDbTest
.WithLibrary(library)
.Build();
_context.Users.Add(user);
_context.Library.Add(library);
await _context.SaveChangesAsync();
Context.Users.Add(user);
Context.Library.Add(library);
await Context.SaveChangesAsync();
return user;
}
@ -391,7 +391,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAverageRating();
var series = await _context.Series.HasAverageRating(true, FilterComparison.Equal, 100).ToListAsync();
var series = await Context.Series.HasAverageRating(true, FilterComparison.Equal, 100).ToListAsync();
Assert.Single(series);
Assert.Equal("Full", series[0].Name);
}
@ -401,7 +401,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAverageRating();
var series = await _context.Series.HasAverageRating(true, FilterComparison.GreaterThan, 50).ToListAsync();
var series = await Context.Series.HasAverageRating(true, FilterComparison.GreaterThan, 50).ToListAsync();
Assert.Single(series);
Assert.Equal("Full", series[0].Name);
}
@ -411,7 +411,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAverageRating();
var series = await _context.Series.HasAverageRating(true, FilterComparison.GreaterThanEqual, 50).ToListAsync();
var series = await Context.Series.HasAverageRating(true, FilterComparison.GreaterThanEqual, 50).ToListAsync();
Assert.Equal(2, series.Count);
Assert.Contains(series, s => s.Name == "Partial");
Assert.Contains(series, s => s.Name == "Full");
@ -422,7 +422,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAverageRating();
var series = await _context.Series.HasAverageRating(true, FilterComparison.LessThan, 50).ToListAsync();
var series = await Context.Series.HasAverageRating(true, FilterComparison.LessThan, 50).ToListAsync();
Assert.Single(series);
Assert.Equal("None", series[0].Name);
}
@ -432,7 +432,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAverageRating();
var series = await _context.Series.HasAverageRating(true, FilterComparison.LessThanEqual, 50).ToListAsync();
var series = await Context.Series.HasAverageRating(true, FilterComparison.LessThanEqual, 50).ToListAsync();
Assert.Equal(2, series.Count);
Assert.Contains(series, s => s.Name == "None");
Assert.Contains(series, s => s.Name == "Partial");
@ -443,7 +443,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAverageRating();
var series = await _context.Series.HasAverageRating(true, FilterComparison.NotEqual, 100).ToListAsync();
var series = await Context.Series.HasAverageRating(true, FilterComparison.NotEqual, 100).ToListAsync();
Assert.Equal(2, series.Count);
Assert.DoesNotContain(series, s => s.Name == "Full");
}
@ -453,7 +453,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAverageRating();
var series = await _context.Series.HasAverageRating(false, FilterComparison.Equal, 100).ToListAsync();
var series = await Context.Series.HasAverageRating(false, FilterComparison.Equal, 100).ToListAsync();
Assert.Equal(3, series.Count);
}
@ -462,7 +462,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAverageRating();
var series = await _context.Series.HasAverageRating(true, FilterComparison.Equal, -1).ToListAsync();
var series = await Context.Series.HasAverageRating(true, FilterComparison.Equal, -1).ToListAsync();
Assert.Single(series);
Assert.Equal("None", series[0].Name);
}
@ -474,7 +474,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync<KavitaException>(async () =>
{
await _context.Series.HasAverageRating(true, FilterComparison.Contains, 50).ToListAsync();
await Context.Series.HasAverageRating(true, FilterComparison.Contains, 50).ToListAsync();
});
}
@ -485,7 +485,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () =>
{
await _context.Series.HasAverageRating(true, (FilterComparison)999, 50).ToListAsync();
await Context.Series.HasAverageRating(true, (FilterComparison)999, 50).ToListAsync();
});
}
@ -519,9 +519,9 @@ public class SeriesFilterTests : AbstractDbTest
.WithLibrary(library)
.Build();
_context.Users.Add(user);
_context.Library.Add(library);
await _context.SaveChangesAsync();
Context.Users.Add(user);
Context.Library.Add(library);
await Context.SaveChangesAsync();
return user;
}
@ -531,7 +531,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasPublicationStatus();
var foundSeries = await _context.Series.HasPublicationStatus(true, FilterComparison.Equal, new List<PublicationStatus> { PublicationStatus.Cancelled }).ToListAsync();
var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.Equal, new List<PublicationStatus> { PublicationStatus.Cancelled }).ToListAsync();
Assert.Single(foundSeries);
Assert.Equal("Cancelled", foundSeries[0].Name);
}
@ -541,7 +541,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasPublicationStatus();
var foundSeries = await _context.Series.HasPublicationStatus(true, FilterComparison.Contains, new List<PublicationStatus> { PublicationStatus.Cancelled, PublicationStatus.Completed }).ToListAsync();
var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.Contains, new List<PublicationStatus> { PublicationStatus.Cancelled, PublicationStatus.Completed }).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "Cancelled");
Assert.Contains(foundSeries, s => s.Name == "Completed");
@ -552,7 +552,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasPublicationStatus();
var foundSeries = await _context.Series.HasPublicationStatus(true, FilterComparison.NotContains, new List<PublicationStatus> { PublicationStatus.Cancelled }).ToListAsync();
var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.NotContains, new List<PublicationStatus> { PublicationStatus.Cancelled }).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "OnGoing");
Assert.Contains(foundSeries, s => s.Name == "Completed");
@ -563,7 +563,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasPublicationStatus();
var foundSeries = await _context.Series.HasPublicationStatus(true, FilterComparison.NotEqual, new List<PublicationStatus> { PublicationStatus.OnGoing }).ToListAsync();
var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.NotEqual, new List<PublicationStatus> { PublicationStatus.OnGoing }).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "Cancelled");
Assert.Contains(foundSeries, s => s.Name == "Completed");
@ -574,7 +574,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasPublicationStatus();
var foundSeries = await _context.Series.HasPublicationStatus(false, FilterComparison.Equal, new List<PublicationStatus> { PublicationStatus.Cancelled }).ToListAsync();
var foundSeries = await Context.Series.HasPublicationStatus(false, FilterComparison.Equal, new List<PublicationStatus> { PublicationStatus.Cancelled }).ToListAsync();
Assert.Equal(3, foundSeries.Count);
}
@ -583,7 +583,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasPublicationStatus();
var foundSeries = await _context.Series.HasPublicationStatus(true, FilterComparison.Equal, new List<PublicationStatus>()).ToListAsync();
var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.Equal, new List<PublicationStatus>()).ToListAsync();
Assert.Equal(3, foundSeries.Count);
}
@ -594,7 +594,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync<KavitaException>(async () =>
{
await _context.Series.HasPublicationStatus(true, FilterComparison.BeginsWith, new List<PublicationStatus> { PublicationStatus.Cancelled }).ToListAsync();
await Context.Series.HasPublicationStatus(true, FilterComparison.BeginsWith, new List<PublicationStatus> { PublicationStatus.Cancelled }).ToListAsync();
});
}
@ -605,7 +605,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () =>
{
await _context.Series.HasPublicationStatus(true, (FilterComparison)999, new List<PublicationStatus> { PublicationStatus.Cancelled }).ToListAsync();
await Context.Series.HasPublicationStatus(true, (FilterComparison)999, new List<PublicationStatus> { PublicationStatus.Cancelled }).ToListAsync();
});
}
#endregion
@ -637,9 +637,9 @@ public class SeriesFilterTests : AbstractDbTest
.WithLibrary(library)
.Build();
_context.Users.Add(user);
_context.Library.Add(library);
await _context.SaveChangesAsync();
Context.Users.Add(user);
Context.Library.Add(library);
await Context.SaveChangesAsync();
return user;
}
@ -649,7 +649,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAgeRating();
var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.Equal, [AgeRating.G]).ToListAsync();
var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.Equal, [AgeRating.G]).ToListAsync();
Assert.Single(foundSeries);
Assert.Equal("G", foundSeries[0].Name);
}
@ -659,7 +659,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAgeRating();
var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.Contains, new List<AgeRating> { AgeRating.G, AgeRating.Mature }).ToListAsync();
var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.Contains, new List<AgeRating> { AgeRating.G, AgeRating.Mature }).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "G");
Assert.Contains(foundSeries, s => s.Name == "Mature");
@ -670,7 +670,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAgeRating();
var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.NotContains, new List<AgeRating> { AgeRating.Unknown }).ToListAsync();
var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.NotContains, new List<AgeRating> { AgeRating.Unknown }).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "G");
Assert.Contains(foundSeries, s => s.Name == "Mature");
@ -681,7 +681,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAgeRating();
var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.NotEqual, new List<AgeRating> { AgeRating.G }).ToListAsync();
var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.NotEqual, new List<AgeRating> { AgeRating.G }).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "Unknown");
Assert.Contains(foundSeries, s => s.Name == "Mature");
@ -692,7 +692,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAgeRating();
var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.GreaterThan, new List<AgeRating> { AgeRating.Unknown }).ToListAsync();
var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.GreaterThan, new List<AgeRating> { AgeRating.Unknown }).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "G");
Assert.Contains(foundSeries, s => s.Name == "Mature");
@ -703,7 +703,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAgeRating();
var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.GreaterThanEqual, new List<AgeRating> { AgeRating.G }).ToListAsync();
var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.GreaterThanEqual, new List<AgeRating> { AgeRating.G }).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "G");
Assert.Contains(foundSeries, s => s.Name == "Mature");
@ -714,7 +714,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAgeRating();
var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.LessThan, new List<AgeRating> { AgeRating.Mature }).ToListAsync();
var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.LessThan, new List<AgeRating> { AgeRating.Mature }).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "Unknown");
Assert.Contains(foundSeries, s => s.Name == "G");
@ -725,7 +725,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAgeRating();
var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.LessThanEqual, new List<AgeRating> { AgeRating.G }).ToListAsync();
var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.LessThanEqual, new List<AgeRating> { AgeRating.G }).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "Unknown");
Assert.Contains(foundSeries, s => s.Name == "G");
@ -736,7 +736,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAgeRating();
var foundSeries = await _context.Series.HasAgeRating(false, FilterComparison.Equal, new List<AgeRating> { AgeRating.G }).ToListAsync();
var foundSeries = await Context.Series.HasAgeRating(false, FilterComparison.Equal, new List<AgeRating> { AgeRating.G }).ToListAsync();
Assert.Equal(3, foundSeries.Count);
}
@ -745,7 +745,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasAgeRating();
var foundSeries = await _context.Series.HasAgeRating(true, FilterComparison.Equal, new List<AgeRating>()).ToListAsync();
var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.Equal, new List<AgeRating>()).ToListAsync();
Assert.Equal(3, foundSeries.Count);
}
@ -756,7 +756,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync<KavitaException>(async () =>
{
await _context.Series.HasAgeRating(true, FilterComparison.BeginsWith, new List<AgeRating> { AgeRating.G }).ToListAsync();
await Context.Series.HasAgeRating(true, FilterComparison.BeginsWith, new List<AgeRating> { AgeRating.G }).ToListAsync();
});
}
@ -767,7 +767,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync<ArgumentOutOfRangeException>(async () =>
{
await _context.Series.HasAgeRating(true, (FilterComparison)999, new List<AgeRating> { AgeRating.G }).ToListAsync();
await Context.Series.HasAgeRating(true, (FilterComparison)999, new List<AgeRating> { AgeRating.G }).ToListAsync();
});
}
@ -801,9 +801,9 @@ public class SeriesFilterTests : AbstractDbTest
.WithLibrary(library)
.Build();
_context.Users.Add(user);
_context.Library.Add(library);
await _context.SaveChangesAsync();
Context.Users.Add(user);
Context.Library.Add(library);
await Context.SaveChangesAsync();
return user;
}
@ -813,7 +813,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasReleaseYear();
var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.Equal, 2020).ToListAsync();
var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.Equal, 2020).ToListAsync();
Assert.Single(foundSeries);
Assert.Equal("2020", foundSeries[0].Name);
}
@ -823,7 +823,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasReleaseYear();
var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.GreaterThan, 2000).ToListAsync();
var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.GreaterThan, 2000).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "2020");
Assert.Contains(foundSeries, s => s.Name == "2025");
@ -834,7 +834,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasReleaseYear();
var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.LessThan, 2025).ToListAsync();
var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.LessThan, 2025).ToListAsync();
Assert.Equal(2, foundSeries.Count);
Assert.Contains(foundSeries, s => s.Name == "2000");
Assert.Contains(foundSeries, s => s.Name == "2020");
@ -845,7 +845,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasReleaseYear();
var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.IsInLast, 5).ToListAsync();
var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.IsInLast, 5).ToListAsync();
Assert.Equal(2, foundSeries.Count);
}
@ -854,7 +854,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasReleaseYear();
var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.IsNotInLast, 5).ToListAsync();
var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.IsNotInLast, 5).ToListAsync();
Assert.Single(foundSeries);
Assert.Contains(foundSeries, s => s.Name == "2000");
}
@ -864,7 +864,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasReleaseYear();
var foundSeries = await _context.Series.HasReleaseYear(false, FilterComparison.Equal, 2020).ToListAsync();
var foundSeries = await Context.Series.HasReleaseYear(false, FilterComparison.Equal, 2020).ToListAsync();
Assert.Equal(3, foundSeries.Count);
}
@ -873,7 +873,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasReleaseYear();
var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.Equal, null).ToListAsync();
var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.Equal, null).ToListAsync();
Assert.Equal(3, foundSeries.Count);
}
@ -889,10 +889,10 @@ public class SeriesFilterTests : AbstractDbTest
.Build())
.Build();
_context.Library.Add(library);
await _context.SaveChangesAsync();
Context.Library.Add(library);
await Context.SaveChangesAsync();
var foundSeries = await _context.Series.HasReleaseYear(true, FilterComparison.IsEmpty, 0).ToListAsync();
var foundSeries = await Context.Series.HasReleaseYear(true, FilterComparison.IsEmpty, 0).ToListAsync();
Assert.Single(foundSeries);
Assert.Equal("EmptyYear", foundSeries[0].Name);
}
@ -925,14 +925,14 @@ public class SeriesFilterTests : AbstractDbTest
.WithLibrary(library)
.Build();
_context.Users.Add(user);
_context.Library.Add(library);
await _context.SaveChangesAsync();
Context.Users.Add(user);
Context.Library.Add(library);
await Context.SaveChangesAsync();
var ratingService = new RatingService(_unitOfWork, Substitute.For<IScrobblingService>(), Substitute.For<ILogger<RatingService>>());
var ratingService = new RatingService(UnitOfWork, Substitute.For<IScrobblingService>(), Substitute.For<ILogger<RatingService>>());
// Select 0 Rating
var zeroRating = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2);
var zeroRating = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2);
Assert.NotNull(zeroRating);
Assert.True(await ratingService.UpdateSeriesRating(user, new UpdateRatingDto()
@ -942,7 +942,7 @@ public class SeriesFilterTests : AbstractDbTest
}));
// Select 4.5 Rating
var partialRating = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(3);
var partialRating = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(3);
Assert.True(await ratingService.UpdateSeriesRating(user, new UpdateRatingDto()
{
@ -958,7 +958,7 @@ public class SeriesFilterTests : AbstractDbTest
{
var user = await SetupHasRating();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasRating(true, FilterComparison.Equal, 4.5f, user.Id)
.ToListAsync();
@ -971,7 +971,7 @@ public class SeriesFilterTests : AbstractDbTest
{
var user = await SetupHasRating();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasRating(true, FilterComparison.GreaterThan, 0, user.Id)
.ToListAsync();
@ -984,7 +984,7 @@ public class SeriesFilterTests : AbstractDbTest
{
var user = await SetupHasRating();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasRating(true, FilterComparison.LessThan, 4.5f, user.Id)
.ToListAsync();
@ -997,7 +997,7 @@ public class SeriesFilterTests : AbstractDbTest
{
var user = await SetupHasRating();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasRating(true, FilterComparison.IsEmpty, 0, user.Id)
.ToListAsync();
@ -1010,7 +1010,7 @@ public class SeriesFilterTests : AbstractDbTest
{
var user = await SetupHasRating();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasRating(true, FilterComparison.GreaterThanEqual, 4.5f, user.Id)
.ToListAsync();
@ -1023,7 +1023,7 @@ public class SeriesFilterTests : AbstractDbTest
{
var user = await SetupHasRating();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasRating(true, FilterComparison.LessThanEqual, 0, user.Id)
.ToListAsync();
@ -1101,9 +1101,9 @@ public class SeriesFilterTests : AbstractDbTest
.WithLibrary(library)
.Build();
_context.Users.Add(user);
_context.Library.Add(library);
await _context.SaveChangesAsync();
Context.Users.Add(user);
Context.Library.Add(library);
await Context.SaveChangesAsync();
return user;
}
@ -1113,7 +1113,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasName();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasName(true, FilterComparison.Equal, "My Dress-Up Darling")
.ToListAsync();
@ -1126,7 +1126,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasName();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasName(true, FilterComparison.Equal, "Ijiranaide, Nagatoro-san")
.ToListAsync();
@ -1139,7 +1139,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasName();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasName(true, FilterComparison.BeginsWith, "My Dress")
.ToListAsync();
@ -1152,7 +1152,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasName();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasName(true, FilterComparison.BeginsWith, "Sono Bisque")
.ToListAsync();
@ -1165,7 +1165,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasName();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasName(true, FilterComparison.EndsWith, "Nagatoro")
.ToListAsync();
@ -1178,7 +1178,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasName();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasName(true, FilterComparison.Matches, "Toy With Me")
.ToListAsync();
@ -1191,7 +1191,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasName();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasName(true, FilterComparison.NotEqual, "My Dress-Up Darling")
.ToListAsync();
@ -1235,9 +1235,9 @@ public class SeriesFilterTests : AbstractDbTest
.WithLibrary(library)
.Build();
_context.Users.Add(user);
_context.Library.Add(library);
await _context.SaveChangesAsync();
Context.Users.Add(user);
Context.Library.Add(library);
await Context.SaveChangesAsync();
return user;
}
@ -1247,7 +1247,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasSummary();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasSummary(true, FilterComparison.Equal, "I like hippos")
.ToListAsync();
@ -1260,7 +1260,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasSummary();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasSummary(true, FilterComparison.BeginsWith, "I like h")
.ToListAsync();
@ -1273,7 +1273,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasSummary();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasSummary(true, FilterComparison.EndsWith, "apples")
.ToListAsync();
@ -1286,7 +1286,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasSummary();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasSummary(true, FilterComparison.Matches, "like ducks")
.ToListAsync();
@ -1299,7 +1299,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasSummary();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasSummary(true, FilterComparison.NotEqual, "I like ducks")
.ToListAsync();
@ -1312,7 +1312,7 @@ public class SeriesFilterTests : AbstractDbTest
{
await SetupHasSummary();
var foundSeries = await _context.Series
var foundSeries = await Context.Series
.HasSummary(true, FilterComparison.IsEmpty, string.Empty)
.ToListAsync();