diff --git a/API.Tests/API.Tests.csproj b/API.Tests/API.Tests.csproj
index 3a4867ec4..20e10e548 100644
--- a/API.Tests/API.Tests.csproj
+++ b/API.Tests/API.Tests.csproj
@@ -28,6 +28,7 @@
+
diff --git a/API.Tests/AbstractDbTest.cs b/API.Tests/AbstractDbTest.cs
index 77f978e7f..9c5f3e726 100644
--- a/API.Tests/AbstractDbTest.cs
+++ b/API.Tests/AbstractDbTest.cs
@@ -20,10 +20,11 @@ namespace API.Tests;
public abstract class AbstractDbTest : AbstractFsTest , IDisposable
{
- protected readonly DbConnection _connection;
- protected readonly DataContext _context;
- protected readonly IUnitOfWork _unitOfWork;
- protected readonly IMapper _mapper;
+ protected readonly DataContext Context;
+ protected readonly IUnitOfWork UnitOfWork;
+ protected readonly IMapper Mapper;
+ private readonly DbConnection _connection;
+ private bool _disposed;
protected AbstractDbTest()
{
@@ -34,17 +35,17 @@ public abstract class AbstractDbTest : AbstractFsTest , IDisposable
_connection = RelationalOptionsExtension.Extract(contextOptions).Connection;
- _context = new DataContext(contextOptions);
+ Context = new DataContext(contextOptions);
- _context.Database.EnsureCreated(); // Ensure DB schema is created
+ Context.Database.EnsureCreated(); // Ensure DB schema is created
Task.Run(SeedDb).GetAwaiter().GetResult();
var config = new MapperConfiguration(cfg => cfg.AddProfile());
- _mapper = config.CreateMapper();
+ Mapper = config.CreateMapper();
GlobalConfiguration.Configuration.UseInMemoryStorage();
- _unitOfWork = new UnitOfWork(_context, _mapper, null);
+ UnitOfWork = new UnitOfWork(Context, Mapper, null);
}
private static DbConnection CreateInMemoryDatabase()
@@ -59,34 +60,34 @@ public abstract class AbstractDbTest : AbstractFsTest , IDisposable
{
try
{
- await _context.Database.EnsureCreatedAsync();
+ await Context.Database.EnsureCreatedAsync();
var filesystem = CreateFileSystem();
- await Seed.SeedSettings(_context, new DirectoryService(Substitute.For>(), filesystem));
+ await Seed.SeedSettings(Context, new DirectoryService(Substitute.For>(), filesystem));
- var setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.CacheDirectory).SingleAsync();
+ var setting = await Context.ServerSetting.Where(s => s.Key == ServerSettingKey.CacheDirectory).SingleAsync();
setting.Value = CacheDirectory;
- setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.BackupDirectory).SingleAsync();
+ setting = await Context.ServerSetting.Where(s => s.Key == ServerSettingKey.BackupDirectory).SingleAsync();
setting.Value = BackupDirectory;
- setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.BookmarkDirectory).SingleAsync();
+ setting = await Context.ServerSetting.Where(s => s.Key == ServerSettingKey.BookmarkDirectory).SingleAsync();
setting.Value = BookmarkDirectory;
- setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.TotalLogs).SingleAsync();
+ setting = await Context.ServerSetting.Where(s => s.Key == ServerSettingKey.TotalLogs).SingleAsync();
setting.Value = "10";
- _context.ServerSetting.Update(setting);
+ Context.ServerSetting.Update(setting);
- _context.Library.Add(new LibraryBuilder("Manga")
+ Context.Library.Add(new LibraryBuilder("Manga")
.WithAllowMetadataMatching(true)
.WithFolderPath(new FolderPathBuilder(DataDirectory).Build())
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- await Seed.SeedMetadataSettings(_context);
+ await Seed.SeedMetadataSettings(Context);
return true;
}
@@ -101,8 +102,21 @@ public abstract class AbstractDbTest : AbstractFsTest , IDisposable
public void Dispose()
{
- _context.Dispose();
- _connection.Dispose();
+ Dispose(true);
+ GC.SuppressFinalize(this);
+ }
+
+ protected virtual void Dispose(bool disposing)
+ {
+ if (_disposed) return;
+
+ if (disposing)
+ {
+ Context?.Dispose();
+ _connection?.Dispose();
+ }
+
+ _disposed = true;
}
///
@@ -114,9 +128,9 @@ public abstract class AbstractDbTest : AbstractFsTest , IDisposable
{
var role = new AppRole { Id = userId, Name = roleName, NormalizedName = roleName.ToUpper() };
- await _context.Roles.AddAsync(role);
- await _context.UserRoles.AddAsync(new AppUserRole { UserId = userId, RoleId = userId });
+ await Context.Roles.AddAsync(role);
+ await Context.UserRoles.AddAsync(new AppUserRole { UserId = userId, RoleId = userId });
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
}
}
diff --git a/API.Tests/AbstractFsTest.cs b/API.Tests/AbstractFsTest.cs
index 3341a3a7c..965a7ad78 100644
--- a/API.Tests/AbstractFsTest.cs
+++ b/API.Tests/AbstractFsTest.cs
@@ -1,6 +1,7 @@
using System.IO;
+using System.IO.Abstractions;
using System.IO.Abstractions.TestingHelpers;
using API.Services.Tasks.Scanner.Parser;
diff --git a/API.Tests/Extensions/ChapterListExtensionsTests.cs b/API.Tests/Extensions/ChapterListExtensionsTests.cs
index d27903ca9..f19a0cede 100644
--- a/API.Tests/Extensions/ChapterListExtensionsTests.cs
+++ b/API.Tests/Extensions/ChapterListExtensionsTests.cs
@@ -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()
{
- 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();
+ chapterList[0].Files = new List();
- 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());
}
diff --git a/API.Tests/Extensions/SeriesFilterTests.cs b/API.Tests/Extensions/SeriesFilterTests.cs
index 577e17619..ba42be8a1 100644
--- a/API.Tests/Extensions/SeriesFilterTests.cs
+++ b/API.Tests/Extensions/SeriesFilterTests.cs
@@ -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>(),
+ var readerService = new ReaderService(UnitOfWork, Substitute.For>(),
Substitute.For(), Substitute.For(),
Substitute.For(), Substitute.For());
// 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>(),
+ var readerService = new ReaderService(UnitOfWork, Substitute.For>(),
Substitute.For(), Substitute.For(),
Substitute.For(), Substitute.For());
// 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()).ToListAsync();
+ var foundSeries = await Context.Series.HasLanguage(true, FilterComparison.Equal, new List()).ToListAsync();
Assert.Equal(3, foundSeries.Count);
}
@@ -345,7 +345,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync(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(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(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.Cancelled }).ToListAsync();
+ var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.Equal, new List { 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.Cancelled, PublicationStatus.Completed }).ToListAsync();
+ var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.Contains, new List { 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.Cancelled }).ToListAsync();
+ var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.NotContains, new List { 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.OnGoing }).ToListAsync();
+ var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.NotEqual, new List { 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.Cancelled }).ToListAsync();
+ var foundSeries = await Context.Series.HasPublicationStatus(false, FilterComparison.Equal, new List { 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()).ToListAsync();
+ var foundSeries = await Context.Series.HasPublicationStatus(true, FilterComparison.Equal, new List()).ToListAsync();
Assert.Equal(3, foundSeries.Count);
}
@@ -594,7 +594,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync(async () =>
{
- await _context.Series.HasPublicationStatus(true, FilterComparison.BeginsWith, new List { PublicationStatus.Cancelled }).ToListAsync();
+ await Context.Series.HasPublicationStatus(true, FilterComparison.BeginsWith, new List { PublicationStatus.Cancelled }).ToListAsync();
});
}
@@ -605,7 +605,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync(async () =>
{
- await _context.Series.HasPublicationStatus(true, (FilterComparison)999, new List { PublicationStatus.Cancelled }).ToListAsync();
+ await Context.Series.HasPublicationStatus(true, (FilterComparison)999, new List { 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.G, AgeRating.Mature }).ToListAsync();
+ var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.Contains, new List { 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.Unknown }).ToListAsync();
+ var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.NotContains, new List { 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.G }).ToListAsync();
+ var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.NotEqual, new List { 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.Unknown }).ToListAsync();
+ var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.GreaterThan, new List { 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.G }).ToListAsync();
+ var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.GreaterThanEqual, new List { 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.Mature }).ToListAsync();
+ var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.LessThan, new List { 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.G }).ToListAsync();
+ var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.LessThanEqual, new List { 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.G }).ToListAsync();
+ var foundSeries = await Context.Series.HasAgeRating(false, FilterComparison.Equal, new List { 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()).ToListAsync();
+ var foundSeries = await Context.Series.HasAgeRating(true, FilterComparison.Equal, new List()).ToListAsync();
Assert.Equal(3, foundSeries.Count);
}
@@ -756,7 +756,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync(async () =>
{
- await _context.Series.HasAgeRating(true, FilterComparison.BeginsWith, new List { AgeRating.G }).ToListAsync();
+ await Context.Series.HasAgeRating(true, FilterComparison.BeginsWith, new List { AgeRating.G }).ToListAsync();
});
}
@@ -767,7 +767,7 @@ public class SeriesFilterTests : AbstractDbTest
await Assert.ThrowsAsync(async () =>
{
- await _context.Series.HasAgeRating(true, (FilterComparison)999, new List { AgeRating.G }).ToListAsync();
+ await Context.Series.HasAgeRating(true, (FilterComparison)999, new List { 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,30 +925,26 @@ 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 seriesService = new SeriesService(_unitOfWork, Substitute.For(),
- Substitute.For(), Substitute.For>(),
- Substitute.For(), Substitute.For(),
- Substitute.For());
+ var ratingService = new RatingService(UnitOfWork, Substitute.For(), Substitute.For>());
// Select 0 Rating
- var zeroRating = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2);
+ var zeroRating = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2);
Assert.NotNull(zeroRating);
- Assert.True(await seriesService.UpdateRating(user, new UpdateSeriesRatingDto()
+ Assert.True(await ratingService.UpdateSeriesRating(user, new UpdateRatingDto()
{
SeriesId = zeroRating.Id,
UserRating = 0
}));
// Select 4.5 Rating
- var partialRating = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(3);
+ var partialRating = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(3);
- Assert.True(await seriesService.UpdateRating(user, new UpdateSeriesRatingDto()
+ Assert.True(await ratingService.UpdateSeriesRating(user, new UpdateRatingDto()
{
SeriesId = partialRating.Id,
UserRating = 4.5f
@@ -962,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();
@@ -975,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();
@@ -988,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();
@@ -1001,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();
@@ -1014,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();
@@ -1027,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();
@@ -1105,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;
}
@@ -1117,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();
@@ -1130,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();
@@ -1143,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();
@@ -1156,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();
@@ -1169,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();
@@ -1182,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();
@@ -1195,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();
@@ -1239,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;
}
@@ -1251,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();
@@ -1264,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();
@@ -1277,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();
@@ -1290,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();
@@ -1303,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();
@@ -1316,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();
diff --git a/API.Tests/Helpers/PersonHelperTests.cs b/API.Tests/Helpers/PersonHelperTests.cs
index 1a38ccdac..66713e17c 100644
--- a/API.Tests/Helpers/PersonHelperTests.cs
+++ b/API.Tests/Helpers/PersonHelperTests.cs
@@ -7,8 +7,8 @@ public class PersonHelperTests : AbstractDbTest
{
protected override async Task ResetDb()
{
- _context.Series.RemoveRange(_context.Series.ToList());
- await _context.SaveChangesAsync();
+ Context.Series.RemoveRange(Context.Series.ToList());
+ await Context.SaveChangesAsync();
}
//
// // 1. Test adding new people and keeping existing ones
diff --git a/API.Tests/Services/CleanupServiceTests.cs b/API.Tests/Services/CleanupServiceTests.cs
index 0f1e9e9da..b0610aed5 100644
--- a/API.Tests/Services/CleanupServiceTests.cs
+++ b/API.Tests/Services/CleanupServiceTests.cs
@@ -29,11 +29,11 @@ public class CleanupServiceTests : AbstractDbTest
public CleanupServiceTests() : base()
{
- _context.Library.Add(new LibraryBuilder("Manga")
+ Context.Library.Add(new LibraryBuilder("Manga")
.WithFolderPath(new FolderPathBuilder(Root + "data/").Build())
.Build());
- _readerService = new ReaderService(_unitOfWork, Substitute.For>(), Substitute.For(),
+ _readerService = new ReaderService(UnitOfWork, Substitute.For>(), Substitute.For(),
Substitute.For(),
new DirectoryService(Substitute.For>(), new MockFileSystem()), Substitute.For());
}
@@ -43,11 +43,11 @@ public class CleanupServiceTests : AbstractDbTest
protected override async Task ResetDb()
{
- _context.Series.RemoveRange(_context.Series.ToList());
- _context.Users.RemoveRange(_context.Users.ToList());
- _context.AppUserBookmark.RemoveRange(_context.AppUserBookmark.ToList());
+ Context.Series.RemoveRange(Context.Series.ToList());
+ Context.Users.RemoveRange(Context.Users.ToList());
+ Context.AppUserBookmark.RemoveRange(Context.AppUserBookmark.ToList());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
}
#endregion
@@ -68,18 +68,18 @@ public class CleanupServiceTests : AbstractDbTest
var s = new SeriesBuilder("Test 1").Build();
s.CoverImage = $"{ImageService.GetSeriesFormat(1)}.jpg";
s.LibraryId = 1;
- _context.Series.Add(s);
+ Context.Series.Add(s);
s = new SeriesBuilder("Test 2").Build();
s.CoverImage = $"{ImageService.GetSeriesFormat(3)}.jpg";
s.LibraryId = 1;
- _context.Series.Add(s);
+ Context.Series.Add(s);
s = new SeriesBuilder("Test 3").Build();
s.CoverImage = $"{ImageService.GetSeriesFormat(1000)}.jpg";
s.LibraryId = 1;
- _context.Series.Add(s);
+ Context.Series.Add(s);
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub,
+ var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub,
ds);
await cleanupService.DeleteSeriesCoverImages();
@@ -102,16 +102,16 @@ public class CleanupServiceTests : AbstractDbTest
var s = new SeriesBuilder("Test 1").Build();
s.CoverImage = $"{ImageService.GetSeriesFormat(1)}.jpg";
s.LibraryId = 1;
- _context.Series.Add(s);
+ Context.Series.Add(s);
s = new SeriesBuilder("Test 2").Build();
s.CoverImage = $"{ImageService.GetSeriesFormat(3)}.jpg";
s.LibraryId = 1;
- _context.Series.Add(s);
+ Context.Series.Add(s);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub,
+ var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub,
ds);
await cleanupService.DeleteSeriesCoverImages();
@@ -133,7 +133,7 @@ public class CleanupServiceTests : AbstractDbTest
await ResetDb();
// Add 2 series with cover images
- _context.Series.Add(new SeriesBuilder("Test 1")
+ Context.Series.Add(new SeriesBuilder("Test 1")
.WithVolume(new VolumeBuilder("1")
.WithChapter(new ChapterBuilder(API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter).WithCoverImage("v01_c01.jpg").Build())
.WithCoverImage("v01_c01.jpg")
@@ -142,7 +142,7 @@ public class CleanupServiceTests : AbstractDbTest
.WithLibraryId(1)
.Build());
- _context.Series.Add(new SeriesBuilder("Test 2")
+ Context.Series.Add(new SeriesBuilder("Test 2")
.WithVolume(new VolumeBuilder("1")
.WithChapter(new ChapterBuilder(API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter).WithCoverImage("v01_c03.jpg").Build())
.WithCoverImage("v01_c03.jpg")
@@ -152,9 +152,9 @@ public class CleanupServiceTests : AbstractDbTest
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub,
+ var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub,
ds);
await cleanupService.DeleteChapterCoverImages();
@@ -223,7 +223,7 @@ public class CleanupServiceTests : AbstractDbTest
// Delete all Series to reset state
await ResetDb();
- _context.Users.Add(new AppUser()
+ Context.Users.Add(new AppUser()
{
UserName = "Joe",
ReadingLists = new List()
@@ -239,9 +239,9 @@ public class CleanupServiceTests : AbstractDbTest
}
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub,
+ var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub,
ds);
await cleanupService.DeleteReadingListCoverImages();
@@ -260,7 +260,7 @@ public class CleanupServiceTests : AbstractDbTest
filesystem.AddFile($"{CacheDirectory}02.jpg", new MockFileData(""));
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub,
+ var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub,
ds);
cleanupService.CleanupCacheAndTempDirectories();
Assert.Empty(ds.GetFiles(CacheDirectory, searchOption: SearchOption.AllDirectories));
@@ -274,7 +274,7 @@ public class CleanupServiceTests : AbstractDbTest
filesystem.AddFile($"{CacheDirectory}subdir/02.jpg", new MockFileData(""));
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub,
+ var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub,
ds);
cleanupService.CleanupCacheAndTempDirectories();
Assert.Empty(ds.GetFiles(CacheDirectory, searchOption: SearchOption.AllDirectories));
@@ -297,7 +297,7 @@ public class CleanupServiceTests : AbstractDbTest
filesystem.AddFile($"{BackupDirectory}randomfile.zip", filesystemFile);
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub,
+ var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub,
ds);
await cleanupService.CleanupBackups();
Assert.Single(ds.GetFiles(BackupDirectory, searchOption: SearchOption.AllDirectories));
@@ -319,7 +319,7 @@ public class CleanupServiceTests : AbstractDbTest
});
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub,
+ var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub,
ds);
await cleanupService.CleanupBackups();
Assert.True(filesystem.File.Exists($"{BackupDirectory}randomfile.zip"));
@@ -343,7 +343,7 @@ public class CleanupServiceTests : AbstractDbTest
}
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub,
+ var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub,
ds);
await cleanupService.CleanupLogs();
Assert.Single(ds.GetFiles(LogDirectory, searchOption: SearchOption.AllDirectories));
@@ -372,7 +372,7 @@ public class CleanupServiceTests : AbstractDbTest
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var cleanupService = new CleanupService(_logger, _unitOfWork, _messageHub,
+ var cleanupService = new CleanupService(_logger, UnitOfWork, _messageHub,
ds);
await cleanupService.CleanupLogs();
Assert.True(filesystem.File.Exists($"{LogDirectory}kavita20200911.log"));
@@ -396,36 +396,36 @@ public class CleanupServiceTests : AbstractDbTest
.Build();
series.Library = new LibraryBuilder("Test LIb").Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
+ var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
await _readerService.MarkChaptersUntilAsRead(user, 1, 5);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// Validate correct chapters have read status
- Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead);
+ Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead);
- var cleanupService = new CleanupService(Substitute.For>(), _unitOfWork,
+ var cleanupService = new CleanupService(Substitute.For>(), UnitOfWork,
Substitute.For(),
new DirectoryService(Substitute.For>(), new MockFileSystem()));
// Delete the Chapter
- _context.Chapter.Remove(c);
- await _unitOfWork.CommitAsync();
- Assert.Empty(await _unitOfWork.AppUserProgressRepository.GetUserProgressForSeriesAsync(1, 1));
+ Context.Chapter.Remove(c);
+ await UnitOfWork.CommitAsync();
+ Assert.Empty(await UnitOfWork.AppUserProgressRepository.GetUserProgressForSeriesAsync(1, 1));
// NOTE: This may not be needed, the underlying DB structure seems fixed as of v0.7
await cleanupService.CleanupDbEntries();
- Assert.Empty(await _unitOfWork.AppUserProgressRepository.GetUserProgressForSeriesAsync(1, 1));
+ Assert.Empty(await UnitOfWork.AppUserProgressRepository.GetUserProgressForSeriesAsync(1, 1));
}
[Fact]
@@ -436,7 +436,7 @@ public class CleanupServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder().Build())
.Build();
s.Library = new LibraryBuilder("Test LIb").Build();
- _context.Series.Add(s);
+ Context.Series.Add(s);
var c = new AppUserCollection()
{
@@ -446,24 +446,24 @@ public class CleanupServiceTests : AbstractDbTest
Items = new List() {s}
};
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007",
Collections = new List() {c}
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var cleanupService = new CleanupService(Substitute.For>(), _unitOfWork,
+ var cleanupService = new CleanupService(Substitute.For>(), UnitOfWork,
Substitute.For(),
new DirectoryService(Substitute.For>(), new MockFileSystem()));
// Delete the Chapter
- _context.Series.Remove(s);
- await _unitOfWork.CommitAsync();
+ Context.Series.Remove(s);
+ await UnitOfWork.CommitAsync();
await cleanupService.CleanupDbEntries();
- Assert.Empty(await _unitOfWork.CollectionTagRepository.GetAllCollectionsAsync());
+ Assert.Empty(await UnitOfWork.CollectionTagRepository.GetAllCollectionsAsync());
}
#endregion
@@ -480,15 +480,15 @@ public class CleanupServiceTests : AbstractDbTest
.Build();
s.Library = new LibraryBuilder("Test LIb").Build();
- _context.Series.Add(s);
+ Context.Series.Add(s);
var user = new AppUser()
{
UserName = "CleanupWantToRead_ShouldRemoveFullyReadSeries",
};
- _context.AppUser.Add(user);
+ Context.AppUser.Add(user);
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
// Add want to read
user.WantToRead = new List()
@@ -498,12 +498,12 @@ public class CleanupServiceTests : AbstractDbTest
SeriesId = s.Id
}
};
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
await _readerService.MarkSeriesAsRead(user, s.Id);
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
- var cleanupService = new CleanupService(Substitute.For>(), _unitOfWork,
+ var cleanupService = new CleanupService(Substitute.For>(), UnitOfWork,
Substitute.For(),
new DirectoryService(Substitute.For>(), new MockFileSystem()));
@@ -511,7 +511,7 @@ public class CleanupServiceTests : AbstractDbTest
await cleanupService.CleanupWantToRead();
var wantToRead =
- await _unitOfWork.SeriesRepository.GetWantToReadForUserAsync(user.Id, new UserParams(), new FilterDto());
+ await UnitOfWork.SeriesRepository.GetWantToReadForUserAsync(user.Id, new UserParams(), new FilterDto());
Assert.Equal(0, wantToRead.TotalCount);
}
@@ -533,15 +533,15 @@ public class CleanupServiceTests : AbstractDbTest
.Build();
s.Library = new LibraryBuilder("Test Lib").Build();
- _context.Series.Add(s);
+ Context.Series.Add(s);
var user = new AppUser()
{
UserName = "ConsolidateProgress_ShouldRemoveDuplicates",
};
- _context.AppUser.Add(user);
+ Context.AppUser.Add(user);
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
// Add 2 progress events
user.Progresses ??= [];
@@ -553,7 +553,7 @@ public class CleanupServiceTests : AbstractDbTest
LibraryId = s.LibraryId,
PagesRead = 1,
});
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
// Add a duplicate with higher page number
user.Progresses.Add(new AppUserProgress()
@@ -564,18 +564,18 @@ public class CleanupServiceTests : AbstractDbTest
LibraryId = s.LibraryId,
PagesRead = 3,
});
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
- Assert.Equal(2, (await _unitOfWork.AppUserProgressRepository.GetAllProgress()).Count());
+ Assert.Equal(2, (await UnitOfWork.AppUserProgressRepository.GetAllProgress()).Count());
- var cleanupService = new CleanupService(Substitute.For>(), _unitOfWork,
+ var cleanupService = new CleanupService(Substitute.For>(), UnitOfWork,
Substitute.For(),
new DirectoryService(Substitute.For>(), new MockFileSystem()));
await cleanupService.ConsolidateProgress();
- var progress = await _unitOfWork.AppUserProgressRepository.GetAllProgress();
+ var progress = await UnitOfWork.AppUserProgressRepository.GetAllProgress();
Assert.Single(progress);
Assert.True(progress.First().PagesRead == 3);
@@ -601,50 +601,50 @@ public class CleanupServiceTests : AbstractDbTest
{
new VolumeBuilder(API.Services.Tasks.Scanner.Parser.Parser.LooseLeafVolume).WithChapter(c).Build()
};
- _context.Series.Add(s);
+ Context.Series.Add(s);
var user = new AppUser()
{
UserName = "EnsureChapterProgressIsCapped",
Progresses = new List()
};
- _context.AppUser.Add(user);
+ Context.AppUser.Add(user);
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
await _readerService.MarkChaptersAsRead(user, s.Id, new List() {c});
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
- var chapter = await _unitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id);
- await _unitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter);
+ var chapter = await UnitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id);
+ await UnitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter);
Assert.NotNull(chapter);
Assert.Equal(2, chapter.PagesRead);
// Update chapter to have 1 page
c.Pages = 1;
- _unitOfWork.ChapterRepository.Update(c);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.ChapterRepository.Update(c);
+ await UnitOfWork.CommitAsync();
- chapter = await _unitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id);
- await _unitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter);
+ chapter = await UnitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id);
+ await UnitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter);
Assert.NotNull(chapter);
Assert.Equal(2, chapter.PagesRead);
Assert.Equal(1, chapter.Pages);
- var cleanupService = new CleanupService(Substitute.For>(), _unitOfWork,
+ var cleanupService = new CleanupService(Substitute.For>(), UnitOfWork,
Substitute.For(),
new DirectoryService(Substitute.For>(), new MockFileSystem()));
await cleanupService.EnsureChapterProgressIsCapped();
- chapter = await _unitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id);
- await _unitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter);
+ chapter = await UnitOfWork.ChapterRepository.GetChapterDtoAsync(c.Id);
+ await UnitOfWork.ChapterRepository.AddChapterModifiers(user.Id, chapter);
Assert.NotNull(chapter);
Assert.Equal(1, chapter.PagesRead);
- _context.AppUser.Remove(user);
- await _unitOfWork.CommitAsync();
+ Context.AppUser.Remove(user);
+ await UnitOfWork.CommitAsync();
}
#endregion
diff --git a/API.Tests/Services/CollectionTagServiceTests.cs b/API.Tests/Services/CollectionTagServiceTests.cs
index 14ce131d8..3414dd86b 100644
--- a/API.Tests/Services/CollectionTagServiceTests.cs
+++ b/API.Tests/Services/CollectionTagServiceTests.cs
@@ -23,24 +23,24 @@ public class CollectionTagServiceTests : AbstractDbTest
private readonly ICollectionTagService _service;
public CollectionTagServiceTests()
{
- _service = new CollectionTagService(_unitOfWork, Substitute.For());
+ _service = new CollectionTagService(UnitOfWork, Substitute.For());
}
protected override async Task ResetDb()
{
- _context.AppUserCollection.RemoveRange(_context.AppUserCollection.ToList());
- _context.Library.RemoveRange(_context.Library.ToList());
+ Context.AppUserCollection.RemoveRange(Context.AppUserCollection.ToList());
+ Context.Library.RemoveRange(Context.Library.ToList());
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
}
private async Task SeedSeries()
{
- if (_context.AppUserCollection.Any()) return;
+ if (Context.AppUserCollection.Any()) return;
var s1 = new SeriesBuilder("Series 1").WithMetadata(new SeriesMetadataBuilder().WithAgeRating(AgeRating.Mature).Build()).Build();
var s2 = new SeriesBuilder("Series 2").WithMetadata(new SeriesMetadataBuilder().WithAgeRating(AgeRating.G).Build()).Build();
- _context.Library.Add(new LibraryBuilder("Library 2", LibraryType.Manga)
+ Context.Library.Add(new LibraryBuilder("Library 2", LibraryType.Manga)
.WithSeries(s1)
.WithSeries(s2)
.Build());
@@ -51,9 +51,9 @@ public class CollectionTagServiceTests : AbstractDbTest
new AppUserCollectionBuilder("Tag 1").WithItems(new []{s1}).Build(),
new AppUserCollectionBuilder("Tag 2").WithItems(new []{s1, s2}).WithIsPromoted(true).Build()
};
- _unitOfWork.UserRepository.Add(user);
+ UnitOfWork.UserRepository.Add(user);
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
}
#region DeleteTag
@@ -64,7 +64,7 @@ public class CollectionTagServiceTests : AbstractDbTest
// Arrange
await SeedSeries();
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.NotNull(user);
// Act
@@ -72,7 +72,7 @@ public class CollectionTagServiceTests : AbstractDbTest
// Assert
Assert.True(result);
- var deletedTag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ var deletedTag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.Null(deletedTag);
Assert.Single(user.Collections); // Only one collection should remain
}
@@ -82,7 +82,7 @@ public class CollectionTagServiceTests : AbstractDbTest
{
// Arrange
await SeedSeries();
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.NotNull(user);
// Act - Try to delete a non-existent tag
@@ -98,7 +98,7 @@ public class CollectionTagServiceTests : AbstractDbTest
{
// Arrange
await SeedSeries();
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.NotNull(user);
// Act
@@ -106,7 +106,7 @@ public class CollectionTagServiceTests : AbstractDbTest
// Assert
Assert.True(result);
- var remainingTag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(2);
+ var remainingTag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(2);
Assert.NotNull(remainingTag);
Assert.Equal("Tag 2", remainingTag.Title);
Assert.True(remainingTag.Promoted);
@@ -121,12 +121,12 @@ public class CollectionTagServiceTests : AbstractDbTest
{
await SeedSeries();
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.NotNull(user);
user.Collections.Add(new AppUserCollectionBuilder("UpdateTag_ShouldUpdateFields").WithIsPromoted(true).Build());
- _unitOfWork.UserRepository.Update(user);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.UserRepository.Update(user);
+ await UnitOfWork.CommitAsync();
await _service.UpdateTag(new AppUserCollectionDto()
{
@@ -137,7 +137,7 @@ public class CollectionTagServiceTests : AbstractDbTest
AgeRating = AgeRating.Unknown
}, 1);
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(3);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(3);
Assert.NotNull(tag);
Assert.True(tag.Promoted);
Assert.False(string.IsNullOrEmpty(tag.Summary));
@@ -151,12 +151,12 @@ public class CollectionTagServiceTests : AbstractDbTest
{
await SeedSeries();
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.NotNull(user);
user.Collections.Add(new AppUserCollectionBuilder("UpdateTag_ShouldNotChangeTitle_WhenNotKavitaSource").WithSource(ScrobbleProvider.Mal).Build());
- _unitOfWork.UserRepository.Update(user);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.UserRepository.Update(user);
+ await UnitOfWork.CommitAsync();
await _service.UpdateTag(new AppUserCollectionDto()
{
@@ -167,7 +167,7 @@ public class CollectionTagServiceTests : AbstractDbTest
AgeRating = AgeRating.Unknown
}, 1);
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(3);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(3);
Assert.NotNull(tag);
Assert.Equal("UpdateTag_ShouldNotChangeTitle_WhenNotKavitaSource", tag.Title);
Assert.False(string.IsNullOrEmpty(tag.Summary));
@@ -198,8 +198,8 @@ public class CollectionTagServiceTests : AbstractDbTest
// Create a second user
var user2 = new AppUserBuilder("user2", "user2", Seed.DefaultThemes.First()).Build();
- _unitOfWork.UserRepository.Add(user2);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.UserRepository.Add(user2);
+ await UnitOfWork.CommitAsync();
// Act & Assert
var exception = await Assert.ThrowsAsync(() => _service.UpdateTag(new AppUserCollectionDto()
@@ -261,7 +261,7 @@ public class CollectionTagServiceTests : AbstractDbTest
}, 1);
// Assert
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.NotNull(tag);
Assert.True(tag.CoverImageLocked);
@@ -273,7 +273,7 @@ public class CollectionTagServiceTests : AbstractDbTest
CoverImageLocked = false
}, 1);
- tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.NotNull(tag);
Assert.False(tag.CoverImageLocked);
Assert.Equal(string.Empty, tag.CoverImage);
@@ -286,7 +286,7 @@ public class CollectionTagServiceTests : AbstractDbTest
await SeedSeries();
// Setup a user with admin role
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.NotNull(user);
await AddUserWithRole(user.Id, PolicyConstants.AdminRole);
@@ -300,7 +300,7 @@ public class CollectionTagServiceTests : AbstractDbTest
}, 1);
// Assert
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.NotNull(tag);
Assert.True(tag.Promoted);
}
@@ -312,7 +312,7 @@ public class CollectionTagServiceTests : AbstractDbTest
await SeedSeries();
// Setup a user with promote role
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.NotNull(user);
// Mock to return promote role for the user
@@ -327,7 +327,7 @@ public class CollectionTagServiceTests : AbstractDbTest
}, 1);
// Assert
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.NotNull(tag);
Assert.True(tag.Promoted);
}
@@ -339,7 +339,7 @@ public class CollectionTagServiceTests : AbstractDbTest
await SeedSeries();
// Setup a user with no special roles
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.NotNull(user);
// Act - Try to promote a tag without proper role
@@ -351,7 +351,7 @@ public class CollectionTagServiceTests : AbstractDbTest
}, 1);
// Assert
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.NotNull(tag);
Assert.False(tag.Promoted); // Should remain unpromoted
}
@@ -365,15 +365,15 @@ public class CollectionTagServiceTests : AbstractDbTest
{
await SeedSeries();
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.NotNull(user);
// Tag 2 has 2 series
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(2);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(2);
Assert.NotNull(tag);
await _service.RemoveTagFromSeries(tag, new[] {1});
- var userCollections = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var userCollections = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.Equal(2, userCollections!.Collections.Count);
Assert.Single(tag.Items);
Assert.Equal(2, tag.Items.First().Id);
@@ -387,11 +387,11 @@ public class CollectionTagServiceTests : AbstractDbTest
{
await SeedSeries();
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.NotNull(user);
// Tag 2 has 2 series
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(2);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(2);
Assert.NotNull(tag);
await _service.RemoveTagFromSeries(tag, new[] {1});
@@ -407,15 +407,15 @@ public class CollectionTagServiceTests : AbstractDbTest
{
await SeedSeries();
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Collections);
Assert.NotNull(user);
// Tag 1 has 1 series
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.NotNull(tag);
await _service.RemoveTagFromSeries(tag, new[] {1});
- var tag2 = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ var tag2 = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.Null(tag2);
}
@@ -435,7 +435,7 @@ public class CollectionTagServiceTests : AbstractDbTest
// Arrange
await SeedSeries();
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.NotNull(tag);
var initialItemCount = tag.Items.Count;
@@ -444,7 +444,7 @@ public class CollectionTagServiceTests : AbstractDbTest
// Assert
Assert.True(result);
- tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.NotNull(tag);
Assert.Equal(initialItemCount, tag.Items.Count); // No items should be removed
}
@@ -455,7 +455,7 @@ public class CollectionTagServiceTests : AbstractDbTest
// Arrange
await SeedSeries();
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.NotNull(tag);
var initialItemCount = tag.Items.Count;
@@ -464,7 +464,7 @@ public class CollectionTagServiceTests : AbstractDbTest
// Assert
Assert.True(result);
- tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.NotNull(tag);
Assert.Equal(initialItemCount, tag.Items.Count); // No items should be removed
}
@@ -475,13 +475,13 @@ public class CollectionTagServiceTests : AbstractDbTest
// Arrange
await SeedSeries();
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.NotNull(tag);
// Force null items list
tag.Items = null;
- _unitOfWork.CollectionTagRepository.Update(tag);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.CollectionTagRepository.Update(tag);
+ await UnitOfWork.CommitAsync();
// Act
var result = await _service.RemoveTagFromSeries(tag, [1]);
@@ -489,7 +489,7 @@ public class CollectionTagServiceTests : AbstractDbTest
// Assert
Assert.True(result);
// The tag should not be removed since the items list was null, not empty
- var tagAfter = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(1);
+ var tagAfter = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(1);
Assert.Null(tagAfter);
}
@@ -501,21 +501,21 @@ public class CollectionTagServiceTests : AbstractDbTest
// Add a third series with a different age rating
var s3 = new SeriesBuilder("Series 3").WithMetadata(new SeriesMetadataBuilder().WithAgeRating(AgeRating.PG).Build()).Build();
- _context.Library.First().Series.Add(s3);
- await _unitOfWork.CommitAsync();
+ Context.Library.First().Series.Add(s3);
+ await UnitOfWork.CommitAsync();
// Add series 3 to tag 2
- var tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(2);
+ var tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(2);
Assert.NotNull(tag);
tag.Items.Add(s3);
- _unitOfWork.CollectionTagRepository.Update(tag);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.CollectionTagRepository.Update(tag);
+ await UnitOfWork.CommitAsync();
// Act - Remove the series with Mature rating
await _service.RemoveTagFromSeries(tag, new[] {1});
// Assert
- tag = await _unitOfWork.CollectionTagRepository.GetCollectionAsync(2);
+ tag = await UnitOfWork.CollectionTagRepository.GetCollectionAsync(2);
Assert.NotNull(tag);
Assert.Equal(2, tag.Items.Count);
diff --git a/API.Tests/Services/CoverDbServiceTests.cs b/API.Tests/Services/CoverDbServiceTests.cs
new file mode 100644
index 000000000..93217c3b5
--- /dev/null
+++ b/API.Tests/Services/CoverDbServiceTests.cs
@@ -0,0 +1,117 @@
+using System.IO;
+using System.IO.Abstractions;
+using System.Reflection;
+using System.Threading.Tasks;
+using API.Constants;
+using API.Entities.Enums;
+using API.Extensions;
+using API.Services;
+using API.Services.Tasks.Metadata;
+using API.SignalR;
+using EasyCaching.Core;
+using Kavita.Common;
+using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Logging;
+using NSubstitute;
+using Xunit;
+
+namespace API.Tests.Services;
+
+public class CoverDbServiceTests : AbstractDbTest
+{
+ private readonly DirectoryService _directoryService;
+ private readonly IEasyCachingProviderFactory _cacheFactory = Substitute.For();
+ private readonly ICoverDbService _coverDbService;
+
+ private static readonly string FaviconPath = Path.Join(Directory.GetCurrentDirectory(),
+ "../../../Services/Test Data/CoverDbService/Favicons");
+ ///
+ /// Path to download files temp to. Should be empty after each test.
+ ///
+ private static readonly string TempPath = Path.Join(Directory.GetCurrentDirectory(),
+ "../../../Services/Test Data/CoverDbService/Temp");
+
+ public CoverDbServiceTests()
+ {
+ _directoryService = new DirectoryService(Substitute.For>(), CreateFileSystem());
+ var imageService = new ImageService(Substitute.For>(), _directoryService);
+
+ _coverDbService = new CoverDbService(Substitute.For>(), _directoryService, _cacheFactory,
+ Substitute.For(), imageService, UnitOfWork, Substitute.For());
+ }
+
+ protected override Task ResetDb()
+ {
+ throw new System.NotImplementedException();
+ }
+
+
+ #region Download Favicon
+
+ ///
+ /// I cannot figure out how to test this code due to the reliance on the _directoryService.FaviconDirectory and not being
+ /// able to redirect it to the real filesystem.
+ ///
+ public async Task DownloadFaviconAsync_ShouldDownloadAndMatchExpectedFavicon()
+ {
+ // Arrange
+ var testUrl = "https://anilist.co/anime/6205/Kmpfer/";
+ var encodeFormat = EncodeFormat.WEBP;
+ var expectedFaviconPath = Path.Combine(FaviconPath, "anilist.co.webp");
+
+ // Ensure TempPath exists
+ _directoryService.ExistOrCreate(TempPath);
+
+ var baseUrl = "https://anilist.co";
+
+ // Ensure there is no cache result for this URL
+ var provider = Substitute.For();
+ provider.GetAsync(baseUrl).Returns(new CacheValue(null, false));
+ _cacheFactory.GetCachingProvider(EasyCacheProfiles.Favicon).Returns(provider);
+
+
+ // // Replace favicon directory with TempPath
+ // var directoryService = (DirectoryService)_directoryService;
+ // directoryService.FaviconDirectory = TempPath;
+
+ // Hack: Swap FaviconDirectory with TempPath for ability to download real files
+ typeof(DirectoryService)
+ .GetField("FaviconDirectory", BindingFlags.NonPublic | BindingFlags.Instance)
+ ?.SetValue(_directoryService, TempPath);
+
+
+ // Act
+ var resultFilename = await _coverDbService.DownloadFaviconAsync(testUrl, encodeFormat);
+ var actualFaviconPath = Path.Combine(TempPath, resultFilename);
+
+ // Assert file exists
+ Assert.True(File.Exists(actualFaviconPath), "Downloaded favicon does not exist in temp path");
+
+ // Load and compare similarity
+
+ var similarity = expectedFaviconPath.CalculateSimilarity(actualFaviconPath); // Assuming you have this extension
+ Assert.True(similarity > 0.9f, $"Image similarity too low: {similarity}");
+ }
+
+ [Fact]
+ public async Task DownloadFaviconAsync_ShouldThrowKavitaException_WhenPreviouslyFailedUrlExistsInCache()
+ {
+ // Arrange
+ var testUrl = "https://example.com";
+ var encodeFormat = EncodeFormat.WEBP;
+
+ var provider = Substitute.For();
+ provider.GetAsync(Arg.Any())
+ .Returns(new CacheValue(string.Empty, true)); // Simulate previous failure
+
+ _cacheFactory.GetCachingProvider(EasyCacheProfiles.Favicon).Returns(provider);
+
+ // Act & Assert
+ await Assert.ThrowsAsync(() =>
+ _coverDbService.DownloadFaviconAsync(testUrl, encodeFormat));
+ }
+
+ #endregion
+
+
+}
diff --git a/API.Tests/Services/DeviceServiceTests.cs b/API.Tests/Services/DeviceServiceTests.cs
index 1d021c76d..cbcf70f82 100644
--- a/API.Tests/Services/DeviceServiceTests.cs
+++ b/API.Tests/Services/DeviceServiceTests.cs
@@ -18,13 +18,13 @@ public class DeviceServiceDbTests : AbstractDbTest
public DeviceServiceDbTests() : base()
{
- _deviceService = new DeviceService(_unitOfWork, _logger, Substitute.For());
+ _deviceService = new DeviceService(UnitOfWork, _logger, Substitute.For());
}
protected override async Task ResetDb()
{
- _context.Users.RemoveRange(_context.Users.ToList());
- await _unitOfWork.CommitAsync();
+ Context.Users.RemoveRange(Context.Users.ToList());
+ await UnitOfWork.CommitAsync();
}
@@ -39,8 +39,8 @@ public class DeviceServiceDbTests : AbstractDbTest
Devices = new List()
};
- _context.Users.Add(user);
- await _unitOfWork.CommitAsync();
+ Context.Users.Add(user);
+ await UnitOfWork.CommitAsync();
var device = await _deviceService.Create(new CreateDeviceDto()
{
@@ -62,8 +62,8 @@ public class DeviceServiceDbTests : AbstractDbTest
Devices = new List()
};
- _context.Users.Add(user);
- await _unitOfWork.CommitAsync();
+ Context.Users.Add(user);
+ await UnitOfWork.CommitAsync();
var device = await _deviceService.Create(new CreateDeviceDto()
{
diff --git a/API.Tests/Services/ExternalMetadataServiceTests.cs b/API.Tests/Services/ExternalMetadataServiceTests.cs
index 127bceb7a..c2c226538 100644
--- a/API.Tests/Services/ExternalMetadataServiceTests.cs
+++ b/API.Tests/Services/ExternalMetadataServiceTests.cs
@@ -40,8 +40,8 @@ public class ExternalMetadataServiceTests : AbstractDbTest
// Set up Hangfire to use in-memory storage for testing
GlobalConfiguration.Configuration.UseInMemoryStorage();
- _externalMetadataService = new ExternalMetadataService(_unitOfWork, Substitute.For>(),
- _mapper, Substitute.For(), Substitute.For(), Substitute.For(),
+ _externalMetadataService = new ExternalMetadataService(UnitOfWork, Substitute.For>(),
+ Mapper, Substitute.For(), Substitute.For(), Substitute.For(),
Substitute.For());
}
@@ -58,14 +58,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = false;
metadataSettings.EnableSummary = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -75,7 +75,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(string.Empty, postSeries.Metadata.Summary);
}
@@ -95,14 +95,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableSummary = false;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -112,7 +112,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(string.Empty, postSeries.Metadata.Summary);
}
@@ -128,14 +128,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableSummary = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -145,7 +145,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.False(string.IsNullOrEmpty(postSeries.Metadata.Summary));
Assert.Equal(series.Metadata.Summary, postSeries.Metadata.Summary);
@@ -163,14 +163,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithSummary("This summary is not locked")
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableSummary = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -180,7 +180,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.False(string.IsNullOrEmpty(postSeries.Metadata.Summary));
Assert.Equal("This summary is not locked", postSeries.Metadata.Summary);
@@ -198,14 +198,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithSummary("This summary is not locked", true)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableSummary = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -215,7 +215,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.False(string.IsNullOrEmpty(postSeries.Metadata.Summary));
Assert.Equal("This summary is not locked", postSeries.Metadata.Summary);
@@ -233,15 +233,15 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithSummary("This summary is not locked", true)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableSummary = true;
metadataSettings.Overrides = [MetadataSettingField.Summary];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -251,7 +251,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.False(string.IsNullOrEmpty(postSeries.Metadata.Summary));
Assert.Equal("This should write", postSeries.Metadata.Summary);
@@ -273,14 +273,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableStartDate = false;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -290,7 +290,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(0, postSeries.Metadata.ReleaseYear);
}
@@ -306,14 +306,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableStartDate = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -323,7 +323,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(DateTime.UtcNow.Year, postSeries.Metadata.ReleaseYear);
}
@@ -340,14 +340,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithReleaseYear(1990)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableStartDate = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -357,7 +357,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(1990, postSeries.Metadata.ReleaseYear);
}
@@ -374,14 +374,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithReleaseYear(1990, true)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableStartDate = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -391,7 +391,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(1990, postSeries.Metadata.ReleaseYear);
}
@@ -408,15 +408,15 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithReleaseYear(1990, true)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableStartDate = true;
metadataSettings.Overrides = [MetadataSettingField.StartDate];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -426,7 +426,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(DateTime.UtcNow.Year, postSeries.Metadata.ReleaseYear);
}
@@ -447,14 +447,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableLocalizedName = false;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -464,7 +464,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(string.Empty, postSeries.LocalizedName);
}
@@ -481,14 +481,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableLocalizedName = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -498,7 +498,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal("Kimchi", postSeries.LocalizedName);
}
@@ -515,14 +515,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableLocalizedName = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -532,7 +532,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal("Localized Name here", postSeries.LocalizedName);
}
@@ -549,14 +549,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableLocalizedName = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -566,7 +566,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal("Localized Name here", postSeries.LocalizedName);
}
@@ -583,15 +583,15 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableLocalizedName = true;
metadataSettings.Overrides = [MetadataSettingField.LocalizedName];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -601,7 +601,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal("Kimchi", postSeries.LocalizedName);
}
@@ -618,14 +618,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableLocalizedName = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -635,7 +635,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.True(string.IsNullOrEmpty(postSeries.LocalizedName));
}
@@ -661,14 +661,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithChapter(new ChapterBuilder("2").Build())
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePublicationStatus = false;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -678,7 +678,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(PublicationStatus.OnGoing, postSeries.Metadata.PublicationStatus);
}
@@ -700,14 +700,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithChapter(new ChapterBuilder("2").Build())
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePublicationStatus = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -717,7 +717,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(PublicationStatus.Completed, postSeries.Metadata.PublicationStatus);
}
@@ -740,14 +740,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithChapter(new ChapterBuilder("2").Build())
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePublicationStatus = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -757,7 +757,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(PublicationStatus.Completed, postSeries.Metadata.PublicationStatus);
}
@@ -780,14 +780,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithChapter(new ChapterBuilder("2").Build())
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePublicationStatus = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -797,7 +797,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(PublicationStatus.Hiatus, postSeries.Metadata.PublicationStatus);
}
@@ -820,15 +820,15 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithChapter(new ChapterBuilder("2").Build())
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePublicationStatus = true;
metadataSettings.Overrides = [MetadataSettingField.PublicationStatus];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -838,7 +838,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(PublicationStatus.Completed, postSeries.Metadata.PublicationStatus);
}
@@ -858,14 +858,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithChapter(new ChapterBuilder("1").Build())
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePublicationStatus = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -875,7 +875,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(PublicationStatus.Ended, postSeries.Metadata.PublicationStatus);
}
@@ -897,18 +897,18 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.AgeRatingMappings = new Dictionary()
{
{"Ecchi", AgeRating.Teen}, // Genre
{"H", AgeRating.R18Plus}, // Tag
};
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -918,7 +918,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(AgeRating.Teen, postSeries.Metadata.AgeRating);
}
@@ -935,18 +935,18 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithAgeRating(AgeRating.Mature)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.AgeRatingMappings = new Dictionary()
{
{"Ecchi", AgeRating.Teen}, // Genre
{"H", AgeRating.R18Plus}, // Tag
};
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -956,7 +956,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(AgeRating.Mature, postSeries.Metadata.AgeRating);
}
@@ -973,18 +973,18 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithAgeRating(AgeRating.Everyone)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.AgeRatingMappings = new Dictionary()
{
{"Ecchi", AgeRating.Teen}, // Genre
{"H", AgeRating.R18Plus}, // Tag
};
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -994,7 +994,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(AgeRating.Teen, postSeries.Metadata.AgeRating);
}
@@ -1011,18 +1011,18 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithAgeRating(AgeRating.Everyone, true)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.AgeRatingMappings = new Dictionary()
{
{"Ecchi", AgeRating.Teen}, // Genre
{"H", AgeRating.R18Plus}, // Tag
};
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1032,7 +1032,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(AgeRating.Everyone, postSeries.Metadata.AgeRating);
}
@@ -1049,10 +1049,10 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithAgeRating(AgeRating.Everyone, true)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.Overrides = [MetadataSettingField.AgeRating];
metadataSettings.AgeRatingMappings = new Dictionary()
@@ -1060,8 +1060,8 @@ public class ExternalMetadataServiceTests : AbstractDbTest
{"Ecchi", AgeRating.Teen}, // Genre
{"H", AgeRating.R18Plus}, // Tag
};
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1071,7 +1071,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(AgeRating.Teen, postSeries.Metadata.AgeRating);
}
@@ -1091,14 +1091,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableGenres = false;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1108,7 +1108,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal([], postSeries.Metadata.Genres);
}
@@ -1124,14 +1124,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableGenres = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1141,7 +1141,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(["Ecchi"], postSeries.Metadata.Genres.Select(g => g.Title));
}
@@ -1158,14 +1158,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithGenre(_genreLookup["Action"])
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableGenres = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1175,7 +1175,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(["Ecchi"], postSeries.Metadata.Genres.Select(g => g.Title));
}
@@ -1192,14 +1192,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithGenre(_genreLookup["Action"], true)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableGenres = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1209,7 +1209,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(["Action"], postSeries.Metadata.Genres.Select(g => g.Title));
}
@@ -1226,15 +1226,15 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithGenre(_genreLookup["Action"], true)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableGenres = true;
metadataSettings.Overrides = [MetadataSettingField.Genres];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1244,7 +1244,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(["Ecchi"], postSeries.Metadata.Genres.Select(g => g.Title));
}
@@ -1264,14 +1264,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableTags = false;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1281,7 +1281,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal([], postSeries.Metadata.Tags);
}
@@ -1297,14 +1297,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableTags = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1314,7 +1314,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(["Boxing"], postSeries.Metadata.Tags.Select(t => t.Title));
}
@@ -1331,14 +1331,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithTag(_tagLookup["H"], true)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableTags = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1348,7 +1348,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(["H"], postSeries.Metadata.Tags.Select(t => t.Title));
}
@@ -1365,15 +1365,15 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithTag(_tagLookup["H"], true)
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableTags = true;
metadataSettings.Overrides = [MetadataSettingField.Tags];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1383,7 +1383,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(["Boxing"], postSeries.Metadata.Tags.Select(t => t.Title));
}
@@ -1403,14 +1403,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = false;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1420,7 +1420,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal([], postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer));
}
@@ -1436,15 +1436,15 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1454,7 +1454,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(["John Doe"], postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer).Select(p => p.Person.Name));
}
@@ -1472,15 +1472,15 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.Build())
.Build();
series.Metadata.WriterLocked = true;
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1490,7 +1490,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"Johnny Twowheeler"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer)
@@ -1511,17 +1511,17 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.Build())
.Build();
series.Metadata.WriterLocked = true;
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = true;
metadataSettings.Overrides = [MetadataSettingField.People];
metadataSettings.PersonRoles = [PersonRole.Writer];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1531,7 +1531,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"John Doe", "Johnny Twowheeler"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer)
@@ -1554,17 +1554,17 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.Build())
.Build();
series.Metadata.WriterLocked = true;
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = false;
metadataSettings.Overrides = [MetadataSettingField.People];
metadataSettings.PersonRoles = [PersonRole.Writer];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1574,7 +1574,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"Johnny Twowheeler"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer)
@@ -1595,17 +1595,17 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.Build())
.Build();
series.Metadata.WriterLocked = true;
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = true;
metadataSettings.Overrides = [MetadataSettingField.People];
metadataSettings.PersonRoles = [];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1615,7 +1615,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"Johnny Twowheeler"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer)
@@ -1635,17 +1635,17 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = true;
metadataSettings.Overrides = [MetadataSettingField.People];
metadataSettings.PersonRoles = [PersonRole.Writer];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1655,7 +1655,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"John Doe"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer)
@@ -1668,7 +1668,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
Staff = [CreateStaff("John", "Doe 2", "Story")]
}, 1);
- postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"John Doe 2"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Writer)
@@ -1691,14 +1691,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = false;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1708,7 +1708,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal([], postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character));
}
@@ -1724,15 +1724,15 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1742,7 +1742,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(["John Doe"], postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character).Select(p => p.Person.Name));
}
@@ -1760,15 +1760,15 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.Build())
.Build();
series.Metadata.CharacterLocked = true;
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1778,7 +1778,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"Johnny Twowheeler"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character)
@@ -1799,17 +1799,17 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.Build())
.Build();
series.Metadata.WriterLocked = true;
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = true;
metadataSettings.Overrides = [MetadataSettingField.People];
metadataSettings.PersonRoles = [PersonRole.Character];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1819,7 +1819,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"John Doe", "Johnny Twowheeler"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character)
@@ -1842,17 +1842,17 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.Build())
.Build();
series.Metadata.WriterLocked = true;
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = false;
metadataSettings.Overrides = [MetadataSettingField.People];
metadataSettings.PersonRoles = [PersonRole.Character];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1862,7 +1862,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"Johnny Twowheeler", "Twowheeler Johnny"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character)
@@ -1883,17 +1883,17 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.Build())
.Build();
series.Metadata.WriterLocked = true;
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = true;
metadataSettings.Overrides = [MetadataSettingField.People];
metadataSettings.PersonRoles = [];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1903,7 +1903,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"Johnny Twowheeler"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character)
@@ -1923,17 +1923,17 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnablePeople = true;
metadataSettings.FirstLastPeopleNaming = true;
metadataSettings.Overrides = [MetadataSettingField.People];
metadataSettings.PersonRoles = [PersonRole.Character];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -1943,7 +1943,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"John Doe"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character)
@@ -1956,7 +1956,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
Characters = [CreateCharacter("John", "Doe 2", CharacterRole.Main)]
}, 1);
- postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[]{"John Doe 2"}.OrderBy(s => s),
postSeries.Metadata.People.Where(p => p.Role == PersonRole.Character)
@@ -1988,7 +1988,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
+ Context.Series.Attach(series);
var series2 = new SeriesBuilder("Test - Relationships Side Story - Target")
.WithLibraryId(1)
@@ -2000,14 +2000,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
AniListId = 10
})
.Build();
- _context.Series.Attach(series2);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series2);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableRelationships = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
{
@@ -2028,7 +2028,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var sourceSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related);
+ var sourceSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related);
Assert.NotNull(sourceSeries);
Assert.Single(sourceSeries.Relations);
Assert.Equal(series2.Name, sourceSeries.Relations.First().TargetSeries.Name);
@@ -2046,7 +2046,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
+ Context.Series.Attach(series);
var series2 = new SeriesBuilder("Test - Relationships Side Story - Target")
.WithLibraryId(1)
@@ -2055,14 +2055,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series2);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series2);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableRelationships = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
{
@@ -2083,7 +2083,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var sourceSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related);
+ var sourceSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related);
Assert.NotNull(sourceSeries);
Assert.Single(sourceSeries.Relations);
Assert.Equal(series2.Name, sourceSeries.Relations.First().TargetSeries.Name);
@@ -2102,7 +2102,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
+ Context.Series.Attach(series);
var series2 = new SeriesBuilder("Test - Relationships Side Story - Target")
.WithLibraryId(1)
@@ -2111,14 +2111,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series2);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series2);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableRelationships = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
{
@@ -2139,7 +2139,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var sourceSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related);
+ var sourceSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related);
Assert.NotNull(sourceSeries);
Assert.Empty(sourceSeries.Relations);
}
@@ -2153,8 +2153,8 @@ public class ExternalMetadataServiceTests : AbstractDbTest
var existingRelationshipSeries = new SeriesBuilder("Existing")
.WithLibraryId(1)
.Build();
- _context.Series.Attach(existingRelationshipSeries);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(existingRelationshipSeries);
+ await Context.SaveChangesAsync();
const string seriesName = "Test - Relationships Side Story";
var series = new SeriesBuilder(seriesName)
@@ -2164,7 +2164,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
+ Context.Series.Attach(series);
var series2 = new SeriesBuilder("Test - Relationships Side Story - Target")
.WithLibraryId(1)
@@ -2176,14 +2176,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
AniListId = 10
})
.Build();
- _context.Series.Attach(series2);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series2);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableRelationships = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2204,7 +2204,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 2);
// Repull Series and validate what is overwritten
- var sourceSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Metadata | SeriesIncludes.Related);
+ var sourceSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Metadata | SeriesIncludes.Related);
Assert.NotNull(sourceSeries);
Assert.Equal(seriesName, sourceSeries.Name);
@@ -2227,7 +2227,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
+ Context.Series.Attach(series);
var series2 = new SeriesBuilder("Test - Relationships Target")
.WithLibraryId(1)
@@ -2235,14 +2235,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series2);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series2);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableRelationships = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
{
@@ -2262,12 +2262,12 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var sourceSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related);
+ var sourceSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related);
Assert.NotNull(sourceSeries);
Assert.Single(sourceSeries.Relations);
Assert.Equal(series2.Name, sourceSeries.Relations.First().TargetSeries.Name);
- var sequel = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Metadata | SeriesIncludes.Related);
+ var sequel = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Metadata | SeriesIncludes.Related);
Assert.NotNull(sequel);
Assert.Equal(seriesName, sequel.Relations.First().TargetSeries.Name);
}
@@ -2284,7 +2284,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
+ Context.Series.Attach(series);
// ID 2: Blue Lock
var series2 = new SeriesBuilder("Blue Lock")
@@ -2293,14 +2293,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series2);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series2);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableRelationships = true;
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
// Apply to Blue Lock - Episode Nagi (ID 1), setting Blue Lock (ID 2) as its prequel
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2324,14 +2324,14 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1); // Apply to series ID 1 (Nagi)
// Verify Blue Lock - Episode Nagi has Blue Lock as prequel
- var nagiSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related);
+ var nagiSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata | SeriesIncludes.Related);
Assert.NotNull(nagiSeries);
Assert.Single(nagiSeries.Relations);
Assert.Equal("Blue Lock", nagiSeries.Relations.First().TargetSeries.Name);
Assert.Equal(RelationKind.Prequel, nagiSeries.Relations.First().RelationKind);
// Verify Blue Lock has Blue Lock - Episode Nagi as sequel
- var blueLockSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Metadata | SeriesIncludes.Related);
+ var blueLockSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Metadata | SeriesIncludes.Related);
Assert.NotNull(blueLockSeries);
Assert.Single(blueLockSeries.Relations);
Assert.Equal("Blue Lock - Episode Nagi", blueLockSeries.Relations.First().TargetSeries.Name);
@@ -2354,16 +2354,16 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableTags = true;
metadataSettings.EnableGenres = true;
metadataSettings.Blacklist = ["Sports", "Action"];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2373,7 +2373,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[] {"Boxing"}.OrderBy(s => s), postSeries.Metadata.Genres.Select(t => t.Title).OrderBy(s => s));
}
@@ -2390,16 +2390,16 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableTags = true;
metadataSettings.EnableGenres = true;
metadataSettings.Blacklist = ["Sports", "Action"];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2409,7 +2409,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[] {"Boxing"}.OrderBy(s => s), postSeries.Metadata.Tags.Select(t => t.Title).OrderBy(s => s));
}
@@ -2435,15 +2435,15 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableTags = true;
metadataSettings.Whitelist = ["Sports", "Action"];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2453,7 +2453,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[] {"Sports", "Action"}.OrderBy(s => s), postSeries.Metadata.Tags.Select(t => t.Title).OrderBy(s => s));
}
@@ -2469,10 +2469,10 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableTags = true;
metadataSettings.FieldMappings = [new MetadataFieldMapping()
@@ -2485,8 +2485,8 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}];
metadataSettings.Whitelist = ["Sports", "Action"];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2496,7 +2496,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(new[] {"Sports", "Action"}.OrderBy(s => s), postSeries.Metadata.Tags.Select(t => t.Title).OrderBy(s => s));
}
@@ -2516,10 +2516,10 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableGenres = true;
metadataSettings.Overrides = [MetadataSettingField.Genres];
@@ -2533,8 +2533,8 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2544,7 +2544,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(
new[] { "Ecchi", "Fanservice" }.OrderBy(s => s),
@@ -2563,10 +2563,10 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableGenres = true;
metadataSettings.Overrides = [MetadataSettingField.Genres];
@@ -2580,8 +2580,8 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2591,7 +2591,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(["Fanservice"], postSeries.Metadata.Genres.Select(g => g.Title));
}
@@ -2607,10 +2607,10 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableTags = true;
metadataSettings.FieldMappings = [new MetadataFieldMapping()
@@ -2623,8 +2623,8 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2634,7 +2634,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(
new[] { "Ecchi", "Fanservice" }.OrderBy(s => s),
@@ -2653,10 +2653,10 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableTags = true;
metadataSettings.Overrides = [MetadataSettingField.Genres];
@@ -2670,8 +2670,8 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2681,7 +2681,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(["Fanservice"], postSeries.Metadata.Tags.Select(g => g.Title));
}
@@ -2697,10 +2697,10 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder()
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableGenres = true;
metadataSettings.EnableTags = true;
@@ -2715,8 +2715,8 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2726,7 +2726,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(
new[] {"Ecchi"}.OrderBy(s => s),
@@ -2752,10 +2752,10 @@ public class ExternalMetadataServiceTests : AbstractDbTest
.WithGenre(_genreLookup["Action"])
.Build())
.Build();
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = true;
metadataSettings.EnableGenres = true;
metadataSettings.EnableTags = true;
@@ -2770,8 +2770,8 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}];
- _context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ Context.MetadataSettings.Update(metadataSettings);
+ await Context.SaveChangesAsync();
await _externalMetadataService.WriteExternalMetadataToSeries(new ExternalSeriesDetailDto()
@@ -2780,7 +2780,7 @@ public class ExternalMetadataServiceTests : AbstractDbTest
}, 1);
// Repull Series and validate what is overwritten
- var postSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
+ var postSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Metadata);
Assert.NotNull(postSeries);
Assert.Equal(
new[] {"Action"}.OrderBy(s => s),
@@ -2794,13 +2794,13 @@ public class ExternalMetadataServiceTests : AbstractDbTest
protected override async Task ResetDb()
{
- _context.Series.RemoveRange(_context.Series);
- _context.AppUser.RemoveRange(_context.AppUser);
- _context.Genre.RemoveRange(_context.Genre);
- _context.Tag.RemoveRange(_context.Tag);
- _context.Person.RemoveRange(_context.Person);
+ Context.Series.RemoveRange(Context.Series);
+ Context.AppUser.RemoveRange(Context.AppUser);
+ Context.Genre.RemoveRange(Context.Genre);
+ Context.Tag.RemoveRange(Context.Tag);
+ Context.Person.RemoveRange(Context.Person);
- var metadataSettings = await _unitOfWork.SettingsRepository.GetMetadataSettings();
+ var metadataSettings = await UnitOfWork.SettingsRepository.GetMetadataSettings();
metadataSettings.Enabled = false;
metadataSettings.EnableSummary = false;
metadataSettings.EnableCoverImage = false;
@@ -2811,41 +2811,41 @@ public class ExternalMetadataServiceTests : AbstractDbTest
metadataSettings.EnableTags = false;
metadataSettings.EnablePublicationStatus = false;
metadataSettings.EnableStartDate = false;
- _context.MetadataSettings.Update(metadataSettings);
+ Context.MetadataSettings.Update(metadataSettings);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- _context.AppUser.Add(new AppUserBuilder("Joe", "Joe")
+ Context.AppUser.Add(new AppUserBuilder("Joe", "Joe")
.WithRole(PolicyConstants.AdminRole)
- .WithLibrary(await _context.Library.FirstAsync(l => l.Id == 1))
+ .WithLibrary(await Context.Library.FirstAsync(l => l.Id == 1))
.Build());
// Create a bunch of Genres for this test and store their string in _genreLookup
_genreLookup.Clear();
var g1 = new GenreBuilder("Action").Build();
var g2 = new GenreBuilder("Ecchi").Build();
- _context.Genre.Add(g1);
- _context.Genre.Add(g2);
+ Context.Genre.Add(g1);
+ Context.Genre.Add(g2);
_genreLookup.Add("Action", g1);
_genreLookup.Add("Ecchi", g2);
_tagLookup.Clear();
var t1 = new TagBuilder("H").Build();
var t2 = new TagBuilder("Boxing").Build();
- _context.Tag.Add(t1);
- _context.Tag.Add(t2);
+ Context.Tag.Add(t1);
+ Context.Tag.Add(t2);
_tagLookup.Add("H", t1);
_tagLookup.Add("Boxing", t2);
_personLookup.Clear();
var p1 = new PersonBuilder("Johnny Twowheeler").Build();
var p2 = new PersonBuilder("Boxing").Build();
- _context.Person.Add(p1);
- _context.Person.Add(p2);
+ Context.Person.Add(p1);
+ Context.Person.Add(p2);
_personLookup.Add("Johnny Twowheeler", p1);
_personLookup.Add("Batman Robin", p2);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
}
private static SeriesStaffDto CreateStaff(string first, string last, string role)
diff --git a/API.Tests/Services/ParseScannedFilesTests.cs b/API.Tests/Services/ParseScannedFilesTests.cs
index f81ebd3c4..f8714f69a 100644
--- a/API.Tests/Services/ParseScannedFilesTests.cs
+++ b/API.Tests/Services/ParseScannedFilesTests.cs
@@ -99,14 +99,14 @@ public class ParseScannedFilesTests : AbstractDbTest
{
// Since ProcessFile relies on _readingItemService, we can implement our own versions of _readingItemService so we have control over how the calls work
GlobalConfiguration.Configuration.UseInMemoryStorage();
- _scannerHelper = new ScannerHelper(_unitOfWork, testOutputHelper);
+ _scannerHelper = new ScannerHelper(UnitOfWork, testOutputHelper);
}
protected override async Task ResetDb()
{
- _context.Series.RemoveRange(_context.Series.ToList());
+ Context.Series.RemoveRange(Context.Series.ToList());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
}
#region MergeName
@@ -206,13 +206,13 @@ public class ParseScannedFilesTests : AbstractDbTest
var library =
- await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1,
+ await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1,
LibraryIncludes.Folders | LibraryIncludes.FileTypes);
Assert.NotNull(library);
library.Type = LibraryType.Manga;
var parsedSeries = await psf.ScanLibrariesForSeries(library, new List() {Root + "Data/"}, false,
- await _unitOfWork.SeriesRepository.GetFolderPathMap(1));
+ await UnitOfWork.SeriesRepository.GetFolderPathMap(1));
// Assert.Equal(3, parsedSeries.Values.Count);
@@ -251,9 +251,9 @@ public class ParseScannedFilesTests : AbstractDbTest
new MockReadingItemService(ds, Substitute.For()), Substitute.For());
var directoriesSeen = new HashSet();
- var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1,
+ var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1,
LibraryIncludes.Folders | LibraryIncludes.FileTypes);
- var scanResults = await psf.ScanFiles("C:/Data/", true, await _unitOfWork.SeriesRepository.GetFolderPathMap(1), library);
+ var scanResults = await psf.ScanFiles("C:/Data/", true, await UnitOfWork.SeriesRepository.GetFolderPathMap(1), library);
foreach (var scanResult in scanResults)
{
directoriesSeen.Add(scanResult.Folder);
@@ -270,13 +270,13 @@ public class ParseScannedFilesTests : AbstractDbTest
var psf = new ParseScannedFiles(Substitute.For>(), ds,
new MockReadingItemService(ds, Substitute.For()), Substitute.For());
- var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1,
+ var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1,
LibraryIncludes.Folders | LibraryIncludes.FileTypes);
Assert.NotNull(library);
var directoriesSeen = new HashSet();
var scanResults = await psf.ScanFiles("C:/Data/", false,
- await _unitOfWork.SeriesRepository.GetFolderPathMap(1), library);
+ await UnitOfWork.SeriesRepository.GetFolderPathMap(1), library);
foreach (var scanResult in scanResults)
{
@@ -305,10 +305,10 @@ public class ParseScannedFilesTests : AbstractDbTest
var psf = new ParseScannedFiles(Substitute.For>(), ds,
new MockReadingItemService(ds, Substitute.For()), Substitute.For());
- var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1,
+ var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1,
LibraryIncludes.Folders | LibraryIncludes.FileTypes);
Assert.NotNull(library);
- var scanResults = await psf.ScanFiles("C:/Data", true, await _unitOfWork.SeriesRepository.GetFolderPathMap(1), library);
+ var scanResults = await psf.ScanFiles("C:/Data", true, await UnitOfWork.SeriesRepository.GetFolderPathMap(1), library);
Assert.Equal(2, scanResults.Count);
}
@@ -334,11 +334,11 @@ public class ParseScannedFilesTests : AbstractDbTest
var psf = new ParseScannedFiles(Substitute.For>(), ds,
new MockReadingItemService(ds, Substitute.For()), Substitute.For());
- var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1,
+ var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1,
LibraryIncludes.Folders | LibraryIncludes.FileTypes);
Assert.NotNull(library);
var scanResults = await psf.ScanFiles("C:/Data", false,
- await _unitOfWork.SeriesRepository.GetFolderPathMap(1), library);
+ await UnitOfWork.SeriesRepository.GetFolderPathMap(1), library);
Assert.Single(scanResults);
}
@@ -357,8 +357,8 @@ public class ParseScannedFilesTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase, infos);
var testDirectoryPath = library.Folders.First().Path;
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var fs = new FileSystem();
var ds = new DirectoryService(Substitute.For>(), fs);
@@ -368,7 +368,7 @@ public class ParseScannedFilesTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices(ds, fs);
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Equal(4, postLib.Series.Count);
@@ -391,7 +391,7 @@ public class ParseScannedFilesTests : AbstractDbTest
Path.Join(executionerCopyDir, "The Executioner and Her Way of Life Vol. 1 Ch. 0002.cbz"));
// 4 series, of which 2 have volumes as directories
- var folderMap = await _unitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id);
+ var folderMap = await UnitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id);
Assert.Equal(6, folderMap.Count);
var res = await psf.ScanFiles(testDirectoryPath, true, folderMap, postLib);
@@ -409,8 +409,8 @@ public class ParseScannedFilesTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase, infos);
var testDirectoryPath = library.Folders.First().Path;
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var fs = new FileSystem();
var ds = new DirectoryService(Substitute.For>(), fs);
@@ -420,7 +420,7 @@ public class ParseScannedFilesTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices(ds, fs);
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Equal(4, postLib.Series.Count);
@@ -438,7 +438,7 @@ public class ParseScannedFilesTests : AbstractDbTest
Path.Join(executionerCopyDir, "The Executioner and Her Way of Life Vol. 2.cbz"));
var res = await psf.ScanFiles(testDirectoryPath, true,
- await _unitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib);
+ await UnitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib);
var changes = res.Count(sc => sc.HasChanged);
Assert.Equal(1, changes);
}
@@ -452,8 +452,8 @@ public class ParseScannedFilesTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase, infos);
var testDirectoryPath = library.Folders.First().Path;
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var fs = new FileSystem();
var ds = new DirectoryService(Substitute.For>(), fs);
@@ -463,7 +463,7 @@ public class ParseScannedFilesTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices(ds, fs);
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -476,7 +476,7 @@ public class ParseScannedFilesTests : AbstractDbTest
await Task.Delay(1100); // Ensure at least one second has passed since library scan
var res = await psf.ScanFiles(testDirectoryPath, true,
- await _unitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib);
+ await UnitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib);
Assert.DoesNotContain(res, sc => sc.HasChanged);
}
@@ -488,8 +488,8 @@ public class ParseScannedFilesTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase, infos);
var testDirectoryPath = library.Folders.First().Path;
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var fs = new FileSystem();
var ds = new DirectoryService(Substitute.For>(), fs);
@@ -499,7 +499,7 @@ public class ParseScannedFilesTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices(ds, fs);
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -508,8 +508,8 @@ public class ParseScannedFilesTests : AbstractDbTest
Assert.Equal(4, spiceAndWolf.Volumes.Sum(v => v.Chapters.Count));
spiceAndWolf.LastFolderScanned = DateTime.Now.Subtract(TimeSpan.FromMinutes(2));
- _context.Series.Update(spiceAndWolf);
- await _context.SaveChangesAsync();
+ Context.Series.Update(spiceAndWolf);
+ await Context.SaveChangesAsync();
// Add file at series root
var spiceAndWolfDir = Path.Join(testDirectoryPath, "Spice and Wolf");
@@ -517,7 +517,7 @@ public class ParseScannedFilesTests : AbstractDbTest
Path.Join(spiceAndWolfDir, "Spice and Wolf Vol. 4.cbz"));
var res = await psf.ScanFiles(testDirectoryPath, true,
- await _unitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib);
+ await UnitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib);
var changes = res.Count(sc => sc.HasChanged);
Assert.Equal(2, changes);
}
@@ -530,8 +530,8 @@ public class ParseScannedFilesTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase, infos);
var testDirectoryPath = library.Folders.First().Path;
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var fs = new FileSystem();
var ds = new DirectoryService(Substitute.For>(), fs);
@@ -541,7 +541,7 @@ public class ParseScannedFilesTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices(ds, fs);
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -550,8 +550,8 @@ public class ParseScannedFilesTests : AbstractDbTest
Assert.Equal(4, spiceAndWolf.Volumes.Sum(v => v.Chapters.Count));
spiceAndWolf.LastFolderScanned = DateTime.Now.Subtract(TimeSpan.FromMinutes(2));
- _context.Series.Update(spiceAndWolf);
- await _context.SaveChangesAsync();
+ Context.Series.Update(spiceAndWolf);
+ await Context.SaveChangesAsync();
// Add file in subfolder
var spiceAndWolfDir = Path.Join(Path.Join(testDirectoryPath, "Spice and Wolf"), "Spice and Wolf Vol. 3");
@@ -559,7 +559,7 @@ public class ParseScannedFilesTests : AbstractDbTest
Path.Join(spiceAndWolfDir, "Spice and Wolf Vol. 3 Ch. 0013.cbz"));
var res = await psf.ScanFiles(testDirectoryPath, true,
- await _unitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib);
+ await UnitOfWork.SeriesRepository.GetFolderPathMap(postLib.Id), postLib);
var changes = res.Count(sc => sc.HasChanged);
Assert.Equal(2, changes);
}
diff --git a/API.Tests/Services/RatingServiceTests.cs b/API.Tests/Services/RatingServiceTests.cs
new file mode 100644
index 000000000..15f4541d7
--- /dev/null
+++ b/API.Tests/Services/RatingServiceTests.cs
@@ -0,0 +1,189 @@
+using System.Linq;
+using System.Threading.Tasks;
+using API.Data.Repositories;
+using API.DTOs;
+using API.Entities.Enums;
+using API.Helpers.Builders;
+using API.Services;
+using API.Services.Plus;
+using Hangfire;
+using Hangfire.InMemory;
+using Microsoft.Extensions.Logging;
+using NSubstitute;
+using Xunit;
+
+namespace API.Tests.Services;
+
+public class RatingServiceTests: AbstractDbTest
+{
+ private readonly RatingService _ratingService;
+
+ public RatingServiceTests()
+ {
+ _ratingService = new RatingService(UnitOfWork, Substitute.For(), Substitute.For>());
+ }
+
+ [Fact]
+ public async Task UpdateRating_ShouldSetRating()
+ {
+ await ResetDb();
+
+ Context.Library.Add(new LibraryBuilder("Test LIb")
+ .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
+ .WithSeries(new SeriesBuilder("Test")
+
+ .WithVolume(new VolumeBuilder("1")
+ .WithChapter(new ChapterBuilder("1").WithPages(1).Build())
+ .Build())
+ .Build())
+ .Build());
+
+
+ await Context.SaveChangesAsync();
+
+
+ var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings);
+
+ JobStorage.Current = new InMemoryStorage();
+ var result = await _ratingService.UpdateSeriesRating(user, new UpdateRatingDto
+ {
+ SeriesId = 1,
+ UserRating = 3,
+ });
+
+ Assert.True(result);
+
+ var ratings = (await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings))!
+ .Ratings;
+ Assert.NotEmpty(ratings);
+ Assert.Equal(3, ratings.First().Rating);
+ }
+
+ [Fact]
+ public async Task UpdateRating_ShouldUpdateExistingRating()
+ {
+ await ResetDb();
+
+ Context.Library.Add(new LibraryBuilder("Test LIb")
+ .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
+ .WithSeries(new SeriesBuilder("Test")
+
+ .WithVolume(new VolumeBuilder("1")
+ .WithChapter(new ChapterBuilder("1").WithPages(1).Build())
+ .Build())
+ .Build())
+ .Build());
+
+
+ await Context.SaveChangesAsync();
+
+ var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings);
+
+ var result = await _ratingService.UpdateSeriesRating(user, new UpdateRatingDto
+ {
+ SeriesId = 1,
+ UserRating = 3,
+ });
+
+ Assert.True(result);
+
+ JobStorage.Current = new InMemoryStorage();
+ var ratings = (await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings))
+ .Ratings;
+ Assert.NotEmpty(ratings);
+ Assert.Equal(3, ratings.First().Rating);
+
+ // Update the DB again
+
+ var result2 = await _ratingService.UpdateSeriesRating(user, new UpdateRatingDto
+ {
+ SeriesId = 1,
+ UserRating = 5,
+ });
+
+ Assert.True(result2);
+
+ var ratings2 = (await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings))
+ .Ratings;
+ Assert.NotEmpty(ratings2);
+ Assert.True(ratings2.Count == 1);
+ Assert.Equal(5, ratings2.First().Rating);
+ }
+
+ [Fact]
+ public async Task UpdateRating_ShouldClampRatingAt5()
+ {
+ await ResetDb();
+
+ Context.Library.Add(new LibraryBuilder("Test LIb")
+ .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
+ .WithSeries(new SeriesBuilder("Test")
+
+ .WithVolume(new VolumeBuilder("1")
+ .WithChapter(new ChapterBuilder("1").WithPages(1).Build())
+ .Build())
+ .Build())
+ .Build());
+
+ await Context.SaveChangesAsync();
+
+ var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings);
+
+ var result = await _ratingService.UpdateSeriesRating(user, new UpdateRatingDto
+ {
+ SeriesId = 1,
+ UserRating = 10,
+ });
+
+ Assert.True(result);
+
+ JobStorage.Current = new InMemoryStorage();
+ var ratings = (await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007",
+ AppUserIncludes.Ratings)!)
+ .Ratings;
+ Assert.NotEmpty(ratings);
+ Assert.Equal(5, ratings.First().Rating);
+ }
+
+ [Fact]
+ public async Task UpdateRating_ShouldReturnFalseWhenSeriesDoesntExist()
+ {
+ await ResetDb();
+
+ Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
+ .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
+ .WithSeries(new SeriesBuilder("Test")
+
+ .WithVolume(new VolumeBuilder("1")
+ .WithChapter(new ChapterBuilder("1").WithPages(1).Build())
+ .Build())
+ .Build())
+ .Build());
+
+ await Context.SaveChangesAsync();
+
+ var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings);
+
+ var result = await _ratingService.UpdateSeriesRating(user, new UpdateRatingDto
+ {
+ SeriesId = 2,
+ UserRating = 5,
+ });
+
+ Assert.False(result);
+
+ var ratings = user.Ratings;
+ Assert.Empty(ratings);
+ }
+ protected override async Task ResetDb()
+ {
+ Context.Series.RemoveRange(Context.Series.ToList());
+ Context.AppUserRating.RemoveRange(Context.AppUserRating.ToList());
+ Context.Genre.RemoveRange(Context.Genre.ToList());
+ Context.CollectionTag.RemoveRange(Context.CollectionTag.ToList());
+ Context.Person.RemoveRange(Context.Person.ToList());
+ Context.Library.RemoveRange(Context.Library.ToList());
+
+ await Context.SaveChangesAsync();
+ }
+}
diff --git a/API.Tests/Services/ReaderServiceTests.cs b/API.Tests/Services/ReaderServiceTests.cs
index 102ea3b81..0e4ab2701 100644
--- a/API.Tests/Services/ReaderServiceTests.cs
+++ b/API.Tests/Services/ReaderServiceTests.cs
@@ -1,25 +1,19 @@
using System.Collections.Generic;
-using System.Data.Common;
using System.IO.Abstractions.TestingHelpers;
using System.Linq;
using System.Threading.Tasks;
-using API.Data;
using API.Data.Repositories;
using API.DTOs.Progress;
using API.DTOs.Reader;
using API.Entities;
using API.Entities.Enums;
using API.Extensions;
-using API.Helpers;
using API.Helpers.Builders;
using API.Services;
using API.Services.Plus;
using API.SignalR;
-using AutoMapper;
using Hangfire;
using Hangfire.InMemory;
-using Microsoft.Data.Sqlite;
-using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using NSubstitute;
using Xunit;
@@ -27,25 +21,16 @@ using Xunit.Abstractions;
namespace API.Tests.Services;
-public class ReaderServiceTests: AbstractFsTest
+public class ReaderServiceTests: AbstractDbTest
{
private readonly ITestOutputHelper _testOutputHelper;
- private readonly IUnitOfWork _unitOfWork;
- private readonly DataContext _context;
private readonly ReaderService _readerService;
public ReaderServiceTests(ITestOutputHelper testOutputHelper)
{
_testOutputHelper = testOutputHelper;
- var contextOptions = new DbContextOptionsBuilder().UseSqlite(CreateInMemoryDatabase()).Options;
- _context = new DataContext(contextOptions);
- Task.Run(SeedDb).GetAwaiter().GetResult();
-
- var config = new MapperConfiguration(cfg => cfg.AddProfile());
- var mapper = config.CreateMapper();
- _unitOfWork = new UnitOfWork(_context, mapper, null);
- _readerService = new ReaderService(_unitOfWork, Substitute.For>(),
+ _readerService = new ReaderService(UnitOfWork, Substitute.For>(),
Substitute.For(), Substitute.For(),
new DirectoryService(Substitute.For>(), new MockFileSystem()),
Substitute.For());
@@ -53,42 +38,12 @@ public class ReaderServiceTests: AbstractFsTest
#region Setup
- private static DbConnection CreateInMemoryDatabase()
+
+ protected override async Task ResetDb()
{
- var connection = new SqliteConnection("Filename=:memory:");
+ Context.Series.RemoveRange(Context.Series.ToList());
- connection.Open();
-
- return connection;
- }
-
- private async Task SeedDb()
- {
- await _context.Database.MigrateAsync();
- var filesystem = CreateFileSystem();
-
- await Seed.SeedSettings(_context,
- new DirectoryService(Substitute.For>(), filesystem));
-
- var setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.CacheDirectory).SingleAsync();
- setting.Value = CacheDirectory;
-
- setting = await _context.ServerSetting.Where(s => s.Key == ServerSettingKey.BackupDirectory).SingleAsync();
- setting.Value = BackupDirectory;
-
- _context.ServerSetting.Update(setting);
-
- _context.Library.Add(new LibraryBuilder("Manga")
- .WithFolderPath(new FolderPathBuilder("C:/data/").Build())
- .Build());
- return await _context.SaveChangesAsync() > 0;
- }
-
- private async Task ResetDb()
- {
- _context.Series.RemoveRange(_context.Series.ToList());
-
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
}
#endregion
@@ -122,10 +77,10 @@ public class ReaderServiceTests: AbstractFsTest
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
Assert.Equal(0, (await _readerService.CapPageToChapter(1, -1)).Item1);
@@ -150,14 +105,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
JobStorage.Current = new InMemoryStorage();
@@ -171,7 +126,7 @@ public class ReaderServiceTests: AbstractFsTest
}, 1);
Assert.True(successful);
- Assert.NotNull(await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1));
+ Assert.NotNull(await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1));
}
[Fact]
@@ -188,14 +143,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
JobStorage.Current = new InMemoryStorage();
var successful = await _readerService.SaveReadingProgress(new ProgressDto()
@@ -208,7 +163,7 @@ public class ReaderServiceTests: AbstractFsTest
}, 1);
Assert.True(successful);
- Assert.NotNull(await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1));
+ Assert.NotNull(await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1));
Assert.True(await _readerService.SaveReadingProgress(new ProgressDto()
{
@@ -219,7 +174,9 @@ public class ReaderServiceTests: AbstractFsTest
BookScrollId = "/h1/"
}, 1));
- Assert.Equal("/h1/", (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).BookScrollId);
+ var userProgress = await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1);
+ Assert.NotNull(userProgress);
+ Assert.Equal("/h1/", userProgress.BookScrollId);
}
@@ -245,22 +202,24 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var volumes = await _unitOfWork.VolumeRepository.GetVolumes(1);
- await _readerService.MarkChaptersAsRead(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes.First().Chapters);
- await _context.SaveChangesAsync();
+ var volumes = await UnitOfWork.VolumeRepository.GetVolumes(1);
+ await _readerService.MarkChaptersAsRead(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes.First().Chapters);
+ await Context.SaveChangesAsync();
- Assert.Equal(2, (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count);
+ var userProgress = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress);
+ Assert.NotNull(userProgress);
+ Assert.Equal(2, userProgress.Progresses.Count);
}
#endregion
@@ -283,27 +242,27 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var volumes = (await _unitOfWork.VolumeRepository.GetVolumes(1)).ToList();
- await _readerService.MarkChaptersAsRead(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes.First().Chapters);
+ var volumes = (await UnitOfWork.VolumeRepository.GetVolumes(1)).ToList();
+ await _readerService.MarkChaptersAsRead(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes[0].Chapters);
- await _context.SaveChangesAsync();
- Assert.Equal(2, (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count);
+ await Context.SaveChangesAsync();
+ Assert.Equal(2, (await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count);
- await _readerService.MarkChaptersAsUnread(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes.First().Chapters);
- await _context.SaveChangesAsync();
+ await _readerService.MarkChaptersAsUnread(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes[0].Chapters);
+ await Context.SaveChangesAsync();
- var progresses = (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses;
+ var progresses = (await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses;
Assert.Equal(0, progresses.Max(p => p.PagesRead));
Assert.Equal(2, progresses.Count);
}
@@ -336,19 +295,19 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 1, 1);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
Assert.NotNull(actualChapter);
Assert.Equal("2", actualChapter.Range);
}
@@ -370,17 +329,17 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test Lib", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 1, 1);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
Assert.NotNull(actualChapter);
Assert.Equal("3-4", actualChapter.Volume.Name);
Assert.Equal("1", actualChapter.Range);
@@ -413,19 +372,19 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 2, 1);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
Assert.NotNull(actualChapter);
Assert.Equal("31", actualChapter.Range);
}
@@ -453,18 +412,18 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
Assert.NotNull(actualChapter);
Assert.Equal("21", actualChapter.Range);
}
@@ -492,19 +451,19 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
Assert.NotNull(actualChapter);
Assert.Equal("21", actualChapter.Range);
}
@@ -527,18 +486,18 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 4, 1);
Assert.NotEqual(-1, nextChapter);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
Assert.NotNull(actualChapter);
Assert.Equal("21", actualChapter.Range);
}
@@ -564,21 +523,21 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 3, 1);
Assert.NotEqual(-1, nextChapter);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
Assert.NotNull(actualChapter);
Assert.Equal(API.Services.Tasks.Scanner.Parser.Parser.DefaultChapter, actualChapter.Range);
}
@@ -601,13 +560,13 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.Series.Add(series);
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 4, 1);
Assert.Equal(-1, nextChapter);
@@ -626,13 +585,13 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.Series.Add(series);
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1);
Assert.Equal(-1, nextChapter);
@@ -651,13 +610,13 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.Series.Add(series);
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1);
Assert.Equal(-1, nextChapter);
@@ -680,13 +639,13 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.Series.Add(series);
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1);
Assert.Equal(-1, nextChapter);
@@ -716,13 +675,13 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.Series.Add(series);
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 3, 1);
Assert.Equal(-1, nextChapter);
@@ -754,19 +713,19 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1);
Assert.NotEqual(-1, nextChapter);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
Assert.NotNull(actualChapter);
Assert.Equal("A.cbz", actualChapter.Range);
}
@@ -792,19 +751,19 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 2, 1);
Assert.NotEqual(-1, nextChapter);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
Assert.NotNull(actualChapter);
Assert.Equal("A.cbz", actualChapter.Range);
}
@@ -834,14 +793,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 3, 4, 1);
Assert.Equal(-1, nextChapter);
@@ -871,19 +830,19 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 2, 3, 1);
Assert.NotEqual(-1, nextChapter);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter);
Assert.NotNull(actualChapter);
Assert.Equal("B.cbz", actualChapter.Range);
}
@@ -904,21 +863,21 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
var user = new AppUserBuilder("majora2007", "fake").Build();
- _context.AppUser.Add(user);
+ Context.AppUser.Add(user);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
await _readerService.MarkChaptersAsRead(user, 1, new List()
{
- series.Volumes.First().Chapters.First()
+ series.Volumes[0].Chapters[0]
});
var nextChapter = await _readerService.GetNextChapterIdAsync(1, 1, 1, 1);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter, ChapterIncludes.Volumes);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter, ChapterIncludes.Volumes);
Assert.Equal(2, actualChapter.Volume.MinNumber);
}
@@ -950,19 +909,19 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 1, 2, 1);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
Assert.NotNull(actualChapter);
Assert.Equal("1", actualChapter.Range);
}
@@ -990,18 +949,18 @@ public class ReaderServiceTests: AbstractFsTest
.Build())
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.Series.Add(series);
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 3, 5, 1);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
Assert.NotNull(actualChapter);
Assert.Equal("22", actualChapter.Range);
}
@@ -1039,20 +998,20 @@ public class ReaderServiceTests: AbstractFsTest
.Build())
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.Series.Add(series);
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// prevChapter should be id from ch.21 from volume 2001
var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 5, 7, 1);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
Assert.NotNull(actualChapter);
Assert.Equal("21", actualChapter.Range);
}
@@ -1080,20 +1039,20 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 2, 3, 1);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
Assert.NotNull(actualChapter);
Assert.Equal("2", actualChapter.Range);
}
@@ -1116,21 +1075,21 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 2, 3, 1);
Assert.Equal(2, prevChapter);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
Assert.NotNull(actualChapter);
Assert.Equal("2", actualChapter.Range);
}
@@ -1148,14 +1107,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
@@ -1176,14 +1135,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
@@ -1209,14 +1168,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 2, 3, 1);
Assert.Equal(-1, prevChapter);
@@ -1246,20 +1205,20 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 2,5, 1);
- var chapterInfoDto = await _unitOfWork.ChapterRepository.GetChapterInfoDtoAsync(prevChapter);
+ var chapterInfoDto = await UnitOfWork.ChapterRepository.GetChapterInfoDtoAsync(prevChapter);
Assert.Equal(1, chapterInfoDto.ChapterNumber.AsFloat());
// This is first chapter of first volume
@@ -1280,14 +1239,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
@@ -1319,22 +1278,22 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 2, 4, 1);
Assert.NotEqual(-1, prevChapter);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
Assert.NotNull(actualChapter);
Assert.Equal("A.cbz", actualChapter.Range);
}
@@ -1357,18 +1316,18 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var prevChapter = await _readerService.GetPrevChapterIdAsync(1, 1, 1, 1);
Assert.NotEqual(-1, prevChapter);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(prevChapter);
Assert.NotNull(actualChapter);
Assert.Equal("22", actualChapter.Range);
}
@@ -1389,16 +1348,16 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
var user = new AppUserBuilder("majora2007", "fake").Build();
- _context.AppUser.Add(user);
+ Context.AppUser.Add(user);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetPrevChapterIdAsync(1, 2, 2, 1);
- var actualChapter = await _unitOfWork.ChapterRepository.GetChapterAsync(nextChapter, ChapterIncludes.Volumes);
+ var actualChapter = await UnitOfWork.ChapterRepository.GetChapterAsync(nextChapter, ChapterIncludes.Volumes);
Assert.Equal(1, actualChapter.Volume.MinNumber);
}
@@ -1431,15 +1390,15 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
@@ -1464,14 +1423,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
@@ -1503,14 +1462,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
@@ -1548,14 +1507,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
@@ -1583,7 +1542,7 @@ public class ReaderServiceTests: AbstractFsTest
VolumeId = 2
}, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -1627,14 +1586,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
@@ -1656,7 +1615,7 @@ public class ReaderServiceTests: AbstractFsTest
VolumeId = 3 // Volume 2 id
}, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -1682,14 +1641,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -1715,14 +1674,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
@@ -1750,7 +1709,7 @@ public class ReaderServiceTests: AbstractFsTest
VolumeId = 2
}, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -1777,15 +1736,15 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -1815,22 +1774,22 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
var user = new AppUser()
{
UserName = "majora2007"
};
- _context.AppUser.Add(user);
+ Context.AppUser.Add(user);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// Mark everything but chapter 101 as read
await _readerService.MarkSeriesAsRead(user, 1);
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
// Unmark last chapter as read
- var vol = await _unitOfWork.VolumeRepository.GetVolumeByIdAsync(1);
+ var vol = await UnitOfWork.VolumeRepository.GetVolumeByIdAsync(1);
foreach (var chapt in vol.Chapters)
{
await _readerService.SaveReadingProgress(new ProgressDto()
@@ -1841,7 +1800,7 @@ public class ReaderServiceTests: AbstractFsTest
VolumeId = 1
}, 1);
}
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -1869,22 +1828,22 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
var user = new AppUser()
{
UserName = "majora2007"
};
- _context.AppUser.Add(user);
+ Context.AppUser.Add(user);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// Mark everything but chapter 101 as read
await _readerService.MarkSeriesAsRead(user, 1);
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
// Unmark last chapter as read
- var vol = await _unitOfWork.VolumeRepository.GetVolumeByIdAsync(1);
+ var vol = await UnitOfWork.VolumeRepository.GetVolumeByIdAsync(1);
await _readerService.SaveReadingProgress(new ProgressDto()
{
PageNum = 0,
@@ -1899,7 +1858,7 @@ public class ReaderServiceTests: AbstractFsTest
SeriesId = 1,
VolumeId = 1
}, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -1922,14 +1881,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
@@ -1956,7 +1915,7 @@ public class ReaderServiceTests: AbstractFsTest
VolumeId = 2
}, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -1982,21 +1941,21 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// Save progress on first volume chapters and 1st of second volume
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress);
await _readerService.MarkSeriesAsRead(user, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -2020,14 +1979,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
@@ -2054,7 +2013,7 @@ public class ReaderServiceTests: AbstractFsTest
VolumeId = 1
}, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -2083,20 +2042,20 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress);
await _readerService.MarkSeriesAsRead(user, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// Add 2 new unread series to the Series
series.Volumes[0].Chapters.Add(new ChapterBuilder("231")
@@ -2105,8 +2064,8 @@ public class ReaderServiceTests: AbstractFsTest
series.Volumes[2].Chapters.Add(new ChapterBuilder("14.9")
.WithPages(1)
.Build());
- _context.Series.Attach(series);
- await _context.SaveChangesAsync();
+ Context.Series.Attach(series);
+ await Context.SaveChangesAsync();
// This tests that if you add a series later to a volume and a loose leaf chapter, we continue from that volume, rather than loose leaf
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -2146,26 +2105,26 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// Save progress on first volume chapters and 1st of second volume
- var user = await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress);
+ var user = await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress);
await _readerService.MarkChaptersAsRead(user, 1,
new List()
{
readChapter1, readChapter2
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -2202,14 +2161,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
await _readerService.SaveReadingProgress(new ProgressDto()
{
@@ -2267,7 +2226,7 @@ public class ReaderServiceTests: AbstractFsTest
VolumeId = 2
}, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -2296,14 +2255,14 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
await _readerService.SaveReadingProgress(new ProgressDto()
{
@@ -2313,7 +2272,7 @@ public class ReaderServiceTests: AbstractFsTest
VolumeId = 1
}, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -2328,7 +2287,7 @@ public class ReaderServiceTests: AbstractFsTest
SeriesId = 1,
VolumeId = 1
}, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -2343,7 +2302,7 @@ public class ReaderServiceTests: AbstractFsTest
SeriesId = 1,
VolumeId = 1
}, 1);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
nextChapter = await _readerService.GetContinuePoint(1, 1);
@@ -2373,26 +2332,26 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
+ var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
await _readerService.MarkChaptersUntilAsRead(user, 1, 5);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// Validate correct chapters have read status
- Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead);
- Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)).PagesRead);
- Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)).PagesRead);
- Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(4, 1)));
+ Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead);
+ Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)).PagesRead);
+ Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)).PagesRead);
+ Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(4, 1)));
}
[Fact]
@@ -2413,27 +2372,27 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
+ var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
await _readerService.MarkChaptersUntilAsRead(user, 1, 2.5f);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// Validate correct chapters have read status
- Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead);
- Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)).PagesRead);
- Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)).PagesRead);
- Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(4, 1)));
- Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1)));
+ Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)).PagesRead);
+ Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)).PagesRead);
+ Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)).PagesRead);
+ Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(4, 1)));
+ Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1)));
}
[Fact]
@@ -2451,23 +2410,24 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
+ var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
+ Assert.NotNull(user);
await _readerService.MarkChaptersUntilAsRead(user, 1, 2);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// Validate correct chapters have read status
- Assert.True(await _unitOfWork.AppUserProgressRepository.UserHasProgress(LibraryType.Manga, 1));
+ Assert.True(await UnitOfWork.AppUserProgressRepository.UserHasProgress(LibraryType.Manga, 1));
}
[Fact]
@@ -2502,24 +2462,24 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
+ var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
const int markReadUntilNumber = 47;
await _readerService.MarkChaptersUntilAsRead(user, 1, markReadUntilNumber);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var volumes = await _unitOfWork.VolumeRepository.GetVolumesDtoAsync(1, 1);
+ var volumes = await UnitOfWork.VolumeRepository.GetVolumesDtoAsync(1, 1);
Assert.True(volumes.SelectMany(v => v.Chapters).All(c =>
{
// Specials are ignored.
@@ -2556,21 +2516,21 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- await _readerService.MarkSeriesAsRead(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1);
- await _context.SaveChangesAsync();
+ await _readerService.MarkSeriesAsRead(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1);
+ await Context.SaveChangesAsync();
- Assert.Equal(4, (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count);
+ Assert.Equal(4, (await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count);
}
@@ -2591,27 +2551,27 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var volumes = (await _unitOfWork.VolumeRepository.GetVolumes(1)).ToList();
- await _readerService.MarkChaptersAsRead(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes.First().Chapters);
+ var volumes = (await UnitOfWork.VolumeRepository.GetVolumes(1)).ToList();
+ await _readerService.MarkChaptersAsRead(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1, volumes[0].Chapters);
- await _context.SaveChangesAsync();
- Assert.Equal(2, (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count);
+ await Context.SaveChangesAsync();
+ Assert.Equal(2, (await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses.Count);
- await _readerService.MarkSeriesAsUnread(await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1);
- await _context.SaveChangesAsync();
+ await _readerService.MarkSeriesAsUnread(await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress), 1);
+ await Context.SaveChangesAsync();
- var progresses = (await _unitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses;
+ var progresses = (await UnitOfWork.UserRepository.GetUserByIdAsync(1, AppUserIncludes.Progress)).Progresses;
Assert.Equal(0, progresses.Max(p => p.PagesRead));
Assert.Equal(2, progresses.Count);
}
@@ -2679,31 +2639,32 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
+ var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
await _readerService.MarkVolumesUntilAsRead(user, 1, 2002);
- await _context.SaveChangesAsync();
+ Assert.NotNull(user);
+ await Context.SaveChangesAsync();
// Validate loose leaf chapters don't get marked as read
- Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)));
- Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)));
- Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)));
+ Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)));
+ Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)));
+ Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)));
// Validate that volumes 1997 and 2002 both have their respective chapter 0 marked as read
- Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1)).PagesRead);
- Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(6, 1)).PagesRead);
+ Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1)).PagesRead);
+ Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(6, 1)).PagesRead);
// Validate that the chapter 0 of the following volume (2003) is not read
- Assert.Null(await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(7, 1));
+ Assert.Null(await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(7, 1));
}
@@ -2734,30 +2695,31 @@ public class ReaderServiceTests: AbstractFsTest
.Build();
series.Library = new LibraryBuilder("Test LIb", LibraryType.Manga).Build();
- _context.Series.Add(series);
+ Context.Series.Add(series);
- _context.AppUser.Add(new AppUser()
+ Context.AppUser.Add(new AppUser()
{
UserName = "majora2007"
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
+ var user = await UnitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Progress);
+ Assert.NotNull(user);
await _readerService.MarkVolumesUntilAsRead(user, 1, 2002);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// Validate loose leaf chapters don't get marked as read
- Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)));
- Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)));
- Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)));
+ Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(1, 1)));
+ Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(2, 1)));
+ Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)));
// Validate volumes chapter 0 have read status
- Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1)).PagesRead);
- Assert.Equal(1, (await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(6, 1)).PagesRead);
- Assert.Null((await _unitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)));
+ Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(5, 1))?.PagesRead);
+ Assert.Equal(1, (await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(6, 1))?.PagesRead);
+ Assert.Null((await UnitOfWork.AppUserProgressRepository.GetUserProgressAsync(3, 1)));
}
#endregion
diff --git a/API.Tests/Services/ScannerServiceTests.cs b/API.Tests/Services/ScannerServiceTests.cs
index 4554820fb..2e812647b 100644
--- a/API.Tests/Services/ScannerServiceTests.cs
+++ b/API.Tests/Services/ScannerServiceTests.cs
@@ -28,13 +28,13 @@ public class ScannerServiceTests : AbstractDbTest
// Set up Hangfire to use in-memory storage for testing
GlobalConfiguration.Configuration.UseInMemoryStorage();
- _scannerHelper = new ScannerHelper(_unitOfWork, testOutputHelper);
+ _scannerHelper = new ScannerHelper(UnitOfWork, testOutputHelper);
}
protected override async Task ResetDb()
{
- _context.Library.RemoveRange(_context.Library);
- await _context.SaveChangesAsync();
+ Context.Library.RemoveRange(Context.Library);
+ await Context.SaveChangesAsync();
}
@@ -44,18 +44,18 @@ public class ScannerServiceTests : AbstractDbTest
{
await SetLastScannedInThePast(series, duration, false);
}
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
}
protected async Task SetLastScannedInThePast(Series series, TimeSpan? duration = null, bool save = true)
{
duration ??= TimeSpan.FromMinutes(2);
series.LastFolderScanned = DateTime.Now.Subtract(duration.Value);
- _context.Series.Update(series);
+ Context.Series.Update(series);
if (save)
{
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
}
}
@@ -66,7 +66,7 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase);
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Equal(4, postLib.Series.Count);
@@ -79,7 +79,7 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase);
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -94,7 +94,7 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase);
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -110,7 +110,7 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase);
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -125,7 +125,7 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase);
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -141,7 +141,7 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase);
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -157,7 +157,7 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase);
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -188,7 +188,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -213,7 +213,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -244,7 +244,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -268,7 +268,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -288,7 +288,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -326,7 +326,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -350,7 +350,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -369,7 +369,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -399,7 +399,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -436,7 +436,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -464,7 +464,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -484,13 +484,13 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase, infos);
library.LibraryExcludePatterns = [new LibraryExcludePattern() {Pattern = "**/Extra/*"}];
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -508,13 +508,13 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase, infos);
library.LibraryExcludePatterns = [new LibraryExcludePattern() {Pattern = "**\\Extra\\*"}];
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -541,13 +541,13 @@ public class ScannerServiceTests : AbstractDbTest
new FolderPath() {Path = Path.Join(testDirectoryPath, "Root 2")}
];
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Equal(2, postLib.Series.Count);
@@ -563,7 +563,7 @@ public class ScannerServiceTests : AbstractDbTest
// Rescan to ensure nothing changes yet again
await scanner.ScanLibrary(library.Id, true);
- postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.Equal(2, postLib.Series.Count);
s = postLib.Series.First(s => s.Name == "Plush");
Assert.Equal(3, s.Volumes.Count);
@@ -594,13 +594,13 @@ public class ScannerServiceTests : AbstractDbTest
new FolderPath() {Path = Path.Join(testDirectoryPath, "Root 2")}
];
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Equal(2, postLib.Series.Count);
@@ -619,7 +619,7 @@ public class ScannerServiceTests : AbstractDbTest
// Rescan to ensure nothing changes yet again
await scanner.ScanLibrary(library.Id, false);
- postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.Equal(2, postLib.Series.Count);
s = postLib.Series.First(s => s.Name == "Plush");
Assert.Equal(3, s.Volumes.Count);
@@ -647,14 +647,14 @@ public class ScannerServiceTests : AbstractDbTest
new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 2") }
];
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var scanner = _scannerHelper.CreateServices();
// First Scan: Everything should be added
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Contains(postLib.Series, s => s.Name == "Accel");
@@ -662,19 +662,19 @@ public class ScannerServiceTests : AbstractDbTest
// Second Scan: Remove Root 2, expect Accel to be removed
library.Folders = [new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 1") }];
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
// Emulate time passage by updating lastFolderScan to be a min in the past
foreach (var s in postLib.Series)
{
s.LastFolderScanned = DateTime.Now.Subtract(TimeSpan.FromMinutes(1));
- _context.Series.Update(s);
+ Context.Series.Update(s);
}
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
await scanner.ScanLibrary(library.Id);
- postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.DoesNotContain(postLib.Series, s => s.Name == "Accel"); // Ensure Accel is gone
Assert.Contains(postLib.Series, s => s.Name == "Plush");
@@ -685,19 +685,19 @@ public class ScannerServiceTests : AbstractDbTest
new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 1") },
new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 2") }
];
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
// Emulate time passage by updating lastFolderScan to be a min in the past
foreach (var s in postLib.Series)
{
s.LastFolderScanned = DateTime.Now.Subtract(TimeSpan.FromMinutes(1));
- _context.Series.Update(s);
+ Context.Series.Update(s);
}
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
await scanner.ScanLibrary(library.Id);
- postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.Contains(postLib.Series, s => s.Name == "Accel"); // Accel should be back
Assert.Contains(postLib.Series, s => s.Name == "Plush");
@@ -707,7 +707,7 @@ public class ScannerServiceTests : AbstractDbTest
// Fourth Scan: Run again to check stability (should not remove Accel)
await scanner.ScanLibrary(library.Id);
- postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.Contains(postLib.Series, s => s.Name == "Accel");
Assert.Contains(postLib.Series, s => s.Name == "Plush");
@@ -732,14 +732,14 @@ public class ScannerServiceTests : AbstractDbTest
new FolderPath() { Path = Path.Combine(testDirectoryPath, "Root 2") }
];
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var scanner = _scannerHelper.CreateServices();
// First Scan: Everything should be added
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Contains(postLib.Series, s => s.Name == "Accel");
@@ -747,14 +747,14 @@ public class ScannerServiceTests : AbstractDbTest
// Second Scan: Delete the Series
library.Series = [];
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
- postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Empty(postLib.Series);
await scanner.ScanLibrary(library.Id);
- postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.Contains(postLib.Series, s => s.Name == "Accel"); // Ensure Accel is gone
Assert.Contains(postLib.Series, s => s.Name == "Plush");
@@ -768,13 +768,13 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase, infos);
var testDirectoryPath = library.Folders.First().Path;
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Equal(4, postLib.Series.Count);
@@ -800,9 +800,9 @@ public class ScannerServiceTests : AbstractDbTest
Path.Join(executionerCopyDir, "The Executioner and Her Way of Life Vol. 1 Ch. 0002.cbz"));
await scanner.ScanLibrary(library.Id);
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
- postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Equal(4, postLib.Series.Count);
@@ -827,13 +827,13 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase, infos);
var testDirectoryPath = library.Folders.First().Path;
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Equal(2, postLib.Series.Count);
@@ -841,9 +841,9 @@ public class ScannerServiceTests : AbstractDbTest
Directory.Delete(executionerCopyDir, true);
await scanner.ScanLibrary(library.Id);
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
- postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
Assert.Single(postLib.Series, s => s.Name == "Spice and Wolf");
@@ -859,13 +859,13 @@ public class ScannerServiceTests : AbstractDbTest
var library = await _scannerHelper.GenerateScannerData(testcase, infos);
var testDirectoryPath = library.Folders.First().Path;
- _unitOfWork.LibraryRepository.Update(library);
- await _unitOfWork.CommitAsync();
+ UnitOfWork.LibraryRepository.Update(library);
+ await UnitOfWork.CommitAsync();
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -882,7 +882,7 @@ public class ScannerServiceTests : AbstractDbTest
await scanner.ScanLibrary(library.Id);
- postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -899,7 +899,7 @@ public class ScannerServiceTests : AbstractDbTest
await scanner.ScanLibrary(library.Id);
- postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
Assert.Single(postLib.Series);
@@ -923,7 +923,7 @@ public class ScannerServiceTests : AbstractDbTest
var scanner = _scannerHelper.CreateServices();
await scanner.ScanLibrary(library.Id);
- var postLib = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
+ var postLib = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(library.Id, LibraryIncludes.Series);
Assert.NotNull(postLib);
// Get the loose leaf volume and confirm each chapter aligns with expectation of Sort Order
diff --git a/API.Tests/Services/ScrobblingServiceTests.cs b/API.Tests/Services/ScrobblingServiceTests.cs
index b7a418d83..50398a146 100644
--- a/API.Tests/Services/ScrobblingServiceTests.cs
+++ b/API.Tests/Services/ScrobblingServiceTests.cs
@@ -28,17 +28,17 @@ public class ScrobblingServiceTests : AbstractDbTest
_logger = Substitute.For>();
_emailService = Substitute.For();
- _service = new ScrobblingService(_unitOfWork, Substitute.For(), _logger, _licenseService, _localizationService, _emailService);
+ _service = new ScrobblingService(UnitOfWork, Substitute.For(), _logger, _licenseService, _localizationService, _emailService);
}
protected override async Task ResetDb()
{
- _context.ScrobbleEvent.RemoveRange(_context.ScrobbleEvent.ToList());
- _context.Series.RemoveRange(_context.Series.ToList());
- _context.Library.RemoveRange(_context.Library.ToList());
- _context.AppUser.RemoveRange(_context.AppUser.ToList());
+ Context.ScrobbleEvent.RemoveRange(Context.ScrobbleEvent.ToList());
+ Context.Series.RemoveRange(Context.Series.ToList());
+ Context.Library.RemoveRange(Context.Library.ToList());
+ Context.AppUser.RemoveRange(Context.AppUser.ToList());
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
}
private async Task SeedData()
@@ -54,7 +54,7 @@ public class ScrobblingServiceTests : AbstractDbTest
.Build();
- _context.Library.Add(library);
+ Context.Library.Add(library);
var user = new AppUserBuilder("testuser", "testuser")
//.WithPreferences(new UserPreferencesBuilder().WithAniListScrobblingEnabled(true).Build())
@@ -62,9 +62,9 @@ public class ScrobblingServiceTests : AbstractDbTest
user.UserPreferences.AniListScrobblingEnabled = true;
- _unitOfWork.UserRepository.Add(user);
+ UnitOfWork.UserRepository.Add(user);
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
}
#region ScrobbleWantToReadUpdate Tests
@@ -83,7 +83,7 @@ public class ScrobblingServiceTests : AbstractDbTest
await _service.ScrobbleWantToReadUpdate(userId, seriesId, true);
// Assert
- var events = await _unitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
+ var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
Assert.Single(events);
Assert.Equal(ScrobbleEventType.AddWantToRead, events[0].ScrobbleEventType);
Assert.Equal(userId, events[0].AppUserId);
@@ -103,7 +103,7 @@ public class ScrobblingServiceTests : AbstractDbTest
await _service.ScrobbleWantToReadUpdate(userId, seriesId, false);
// Assert
- var events = await _unitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
+ var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
Assert.Single(events);
Assert.Equal(ScrobbleEventType.RemoveWantToRead, events[0].ScrobbleEventType);
Assert.Equal(userId, events[0].AppUserId);
@@ -126,7 +126,7 @@ public class ScrobblingServiceTests : AbstractDbTest
await _service.ScrobbleWantToReadUpdate(userId, seriesId, true);
// Assert
- var events = await _unitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
+ var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
Assert.Single(events);
Assert.All(events, e => Assert.Equal(ScrobbleEventType.AddWantToRead, e.ScrobbleEventType));
@@ -149,7 +149,7 @@ public class ScrobblingServiceTests : AbstractDbTest
await _service.ScrobbleWantToReadUpdate(userId, seriesId, false);
// Assert
- var events = await _unitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
+ var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
Assert.Single(events);
Assert.Contains(events, e => e.ScrobbleEventType == ScrobbleEventType.RemoveWantToRead);
@@ -172,7 +172,7 @@ public class ScrobblingServiceTests : AbstractDbTest
await _service.ScrobbleWantToReadUpdate(userId, seriesId, false);
// Assert
- var events = await _unitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
+ var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
Assert.Single(events);
Assert.All(events, e => Assert.Equal(ScrobbleEventType.RemoveWantToRead, e.ScrobbleEventType));
@@ -195,7 +195,7 @@ public class ScrobblingServiceTests : AbstractDbTest
await _service.ScrobbleWantToReadUpdate(userId, seriesId, true);
// Assert
- var events = await _unitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
+ var events = await UnitOfWork.ScrobbleRepository.GetAllEventsForSeries(seriesId);
Assert.Single(events);
Assert.Contains(events, e => e.ScrobbleEventType == ScrobbleEventType.AddWantToRead);
diff --git a/API.Tests/Services/SeriesServiceTests.cs b/API.Tests/Services/SeriesServiceTests.cs
index 5696bb76b..4bf0e6782 100644
--- a/API.Tests/Services/SeriesServiceTests.cs
+++ b/API.Tests/Services/SeriesServiceTests.cs
@@ -56,7 +56,7 @@ public class SeriesServiceTests : AbstractDbTest
var locService = new LocalizationService(ds, new MockHostingEnvironment(),
Substitute.For(), Substitute.For());
- _seriesService = new SeriesService(_unitOfWork, Substitute.For(),
+ _seriesService = new SeriesService(UnitOfWork, Substitute.For(),
Substitute.For(), Substitute.For>(),
Substitute.For(), locService, Substitute.For());
}
@@ -65,14 +65,14 @@ public class SeriesServiceTests : AbstractDbTest
protected override async Task ResetDb()
{
- _context.Series.RemoveRange(_context.Series.ToList());
- _context.AppUserRating.RemoveRange(_context.AppUserRating.ToList());
- _context.Genre.RemoveRange(_context.Genre.ToList());
- _context.CollectionTag.RemoveRange(_context.CollectionTag.ToList());
- _context.Person.RemoveRange(_context.Person.ToList());
- _context.Library.RemoveRange(_context.Library.ToList());
+ Context.Series.RemoveRange(Context.Series.ToList());
+ Context.AppUserRating.RemoveRange(Context.AppUserRating.ToList());
+ Context.Genre.RemoveRange(Context.Genre.ToList());
+ Context.CollectionTag.RemoveRange(Context.CollectionTag.ToList());
+ Context.Person.RemoveRange(Context.Person.ToList());
+ Context.Library.RemoveRange(Context.Library.ToList());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
}
private static UpdateRelatedSeriesDto CreateRelationsDto(Series series)
@@ -105,7 +105,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb")
+ Context.Library.Add(new LibraryBuilder("Test LIb")
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -126,7 +126,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var expectedRanges = new[] {"Omake", "Something SP02"};
@@ -141,7 +141,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb")
+ Context.Library.Add(new LibraryBuilder("Test LIb")
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -162,7 +162,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build()
);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var detail = await _seriesService.GetSeriesDetail(1, 1);
Assert.NotEmpty(detail.Chapters);
@@ -178,7 +178,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb")
+ Context.Library.Add(new LibraryBuilder("Test LIb")
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -196,7 +196,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build())
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var detail = await _seriesService.GetSeriesDetail(1, 1);
Assert.NotEmpty(detail.Chapters);
@@ -212,7 +212,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb")
+ Context.Library.Add(new LibraryBuilder("Test LIb")
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
.WithVolume(new VolumeBuilder(Parser.LooseLeafVolume)
@@ -229,7 +229,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build())
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var detail = await _seriesService.GetSeriesDetail(1, 1);
Assert.NotEmpty(detail.Chapters);
@@ -248,7 +248,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
+ Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -263,7 +263,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var detail = await _seriesService.GetSeriesDetail(1, 1);
Assert.NotEmpty(detail.Volumes);
@@ -277,7 +277,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
+ Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -294,7 +294,7 @@ public class SeriesServiceTests : AbstractDbTest
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var detail = await _seriesService.GetSeriesDetail(1, 1);
Assert.NotEmpty(detail.Volumes);
@@ -314,7 +314,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb")
+ Context.Library.Add(new LibraryBuilder("Test LIb")
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -332,7 +332,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var detail = await _seriesService.GetSeriesDetail(1, 1);
Assert.Equal("Volume 1", detail.Volumes.ElementAt(0).Name);
@@ -349,7 +349,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb")
+ Context.Library.Add(new LibraryBuilder("Test LIb")
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -373,7 +373,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build())
.Build())
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var detail = await _seriesService.GetSeriesDetail(1, 1);
@@ -400,7 +400,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Comic)
+ Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Comic)
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -424,7 +424,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build())
.Build())
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var detail = await _seriesService.GetSeriesDetail(1, 1);
@@ -450,7 +450,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.ComicVine)
+ Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.ComicVine)
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -474,7 +474,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build())
.Build())
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var detail = await _seriesService.GetSeriesDetail(1, 1);
@@ -500,7 +500,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
+ Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -522,7 +522,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build())
.Build())
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var detail = await _seriesService.GetSeriesDetail(1, 1);
@@ -548,7 +548,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.LightNovel)
+ Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.LightNovel)
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -570,7 +570,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build())
.Build())
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var detail = await _seriesService.GetSeriesDetail(1, 1);
@@ -590,164 +590,6 @@ public class SeriesServiceTests : AbstractDbTest
- #endregion
-
-
- #region UpdateRating
-
- [Fact]
- public async Task UpdateRating_ShouldSetRating()
- {
- await ResetDb();
-
- _context.Library.Add(new LibraryBuilder("Test LIb")
- .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
- .WithSeries(new SeriesBuilder("Test")
-
- .WithVolume(new VolumeBuilder("1")
- .WithChapter(new ChapterBuilder("1").WithPages(1).Build())
- .Build())
- .Build())
- .Build());
-
-
- await _context.SaveChangesAsync();
-
-
- var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings);
-
- JobStorage.Current = new InMemoryStorage();
- var result = await _seriesService.UpdateRating(user, new UpdateSeriesRatingDto
- {
- SeriesId = 1,
- UserRating = 3,
- });
-
- Assert.True(result);
-
- var ratings = (await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings))!
- .Ratings;
- Assert.NotEmpty(ratings);
- Assert.Equal(3, ratings.First().Rating);
- }
-
- [Fact]
- public async Task UpdateRating_ShouldUpdateExistingRating()
- {
- await ResetDb();
-
- _context.Library.Add(new LibraryBuilder("Test LIb")
- .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
- .WithSeries(new SeriesBuilder("Test")
-
- .WithVolume(new VolumeBuilder("1")
- .WithChapter(new ChapterBuilder("1").WithPages(1).Build())
- .Build())
- .Build())
- .Build());
-
-
- await _context.SaveChangesAsync();
-
- var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings);
-
- var result = await _seriesService.UpdateRating(user, new UpdateSeriesRatingDto
- {
- SeriesId = 1,
- UserRating = 3,
- });
-
- Assert.True(result);
-
- JobStorage.Current = new InMemoryStorage();
- var ratings = (await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings))
- .Ratings;
- Assert.NotEmpty(ratings);
- Assert.Equal(3, ratings.First().Rating);
-
- // Update the DB again
-
- var result2 = await _seriesService.UpdateRating(user, new UpdateSeriesRatingDto
- {
- SeriesId = 1,
- UserRating = 5,
- });
-
- Assert.True(result2);
-
- var ratings2 = (await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings))
- .Ratings;
- Assert.NotEmpty(ratings2);
- Assert.True(ratings2.Count == 1);
- Assert.Equal(5, ratings2.First().Rating);
- }
-
- [Fact]
- public async Task UpdateRating_ShouldClampRatingAt5()
- {
- await ResetDb();
-
- _context.Library.Add(new LibraryBuilder("Test LIb")
- .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
- .WithSeries(new SeriesBuilder("Test")
-
- .WithVolume(new VolumeBuilder("1")
- .WithChapter(new ChapterBuilder("1").WithPages(1).Build())
- .Build())
- .Build())
- .Build());
-
- await _context.SaveChangesAsync();
-
- var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings);
-
- var result = await _seriesService.UpdateRating(user, new UpdateSeriesRatingDto
- {
- SeriesId = 1,
- UserRating = 10,
- });
-
- Assert.True(result);
-
- JobStorage.Current = new InMemoryStorage();
- var ratings = (await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007",
- AppUserIncludes.Ratings)!)
- .Ratings;
- Assert.NotEmpty(ratings);
- Assert.Equal(5, ratings.First().Rating);
- }
-
- [Fact]
- public async Task UpdateRating_ShouldReturnFalseWhenSeriesDoesntExist()
- {
- await ResetDb();
-
- _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
- .WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
- .WithSeries(new SeriesBuilder("Test")
-
- .WithVolume(new VolumeBuilder("1")
- .WithChapter(new ChapterBuilder("1").WithPages(1).Build())
- .Build())
- .Build())
- .Build());
-
- await _context.SaveChangesAsync();
-
- var user = await _unitOfWork.UserRepository.GetUserByUsernameAsync("majora2007", AppUserIncludes.Ratings);
-
- var result = await _seriesService.UpdateRating(user, new UpdateSeriesRatingDto
- {
- SeriesId = 2,
- UserRating = 5,
- });
-
- Assert.False(result);
-
- var ratings = user.Ratings;
- Assert.Empty(ratings);
- }
-
#endregion
#region UpdateSeriesMetadata
@@ -760,8 +602,8 @@ public class SeriesServiceTests : AbstractDbTest
.Build();
s.Library = new LibraryBuilder("Test LIb", LibraryType.Book).Build();
- _context.Series.Add(s);
- await _context.SaveChangesAsync();
+ Context.Series.Add(s);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -775,7 +617,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.Contains("New Genre".SentenceCase(), series.Metadata.Genres.Select(g => g.Title));
@@ -792,10 +634,10 @@ public class SeriesServiceTests : AbstractDbTest
var g = new GenreBuilder("Existing Genre").Build();
s.Metadata.Genres = new List {g};
- _context.Series.Add(s);
+ Context.Series.Add(s);
- _context.Genre.Add(g);
- await _context.SaveChangesAsync();
+ Context.Genre.Add(g);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -809,7 +651,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.True(series.Metadata.Genres.Select(g1 => g1.Title).All(g2 => g2 == "New Genre".SentenceCase()));
@@ -821,7 +663,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
var g = new PersonBuilder("Existing Person").Build();
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var s = new SeriesBuilder("Test")
.WithMetadata(new SeriesMetadataBuilder()
@@ -831,10 +673,10 @@ public class SeriesServiceTests : AbstractDbTest
s.Library = new LibraryBuilder("Test LIb", LibraryType.Book).Build();
- _context.Series.Add(s);
+ Context.Series.Add(s);
- _context.Person.Add(g);
- await _context.SaveChangesAsync();
+ Context.Person.Add(g);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -848,7 +690,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.True(series.Metadata.People.Select(g => g.Person.Name).All(personName => personName == "Existing Person"));
@@ -871,10 +713,10 @@ public class SeriesServiceTests : AbstractDbTest
new SeriesMetadataPeople() {Person = new PersonBuilder("Existing Publisher 2").Build(), Role = PersonRole.Publisher}
};
- _context.Series.Add(s);
+ Context.Series.Add(s);
- _context.Person.Add(g);
- await _context.SaveChangesAsync();
+ Context.Person.Add(g);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -889,7 +731,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.True(series.Metadata.People.Select(g => g.Person.Name).All(personName => personName == "Existing Person"));
@@ -921,9 +763,9 @@ public class SeriesServiceTests : AbstractDbTest
new SeriesMetadataPeople { Person = new PersonBuilder("Existing Publisher 2").Build(), Role = PersonRole.Publisher }
};
- _context.Series.Add(series);
- _context.Person.Add(existingPerson);
- await _context.SaveChangesAsync();
+ Context.Series.Add(series);
+ Context.Person.Add(existingPerson);
+ await Context.SaveChangesAsync();
// Act: Update series metadata, attempting to update the writer to "Existing Writer"
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
@@ -940,7 +782,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
// Reload the series from the database
- var updatedSeries = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(series.Id);
+ var updatedSeries = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(series.Id);
Assert.NotNull(updatedSeries.Metadata);
// Assert that the people list still contains the updated person with the new name
@@ -962,10 +804,10 @@ public class SeriesServiceTests : AbstractDbTest
.Build();
s.Library = new LibraryBuilder("Test LIb", LibraryType.Book).Build();
var g = new PersonBuilder("Existing Person").Build();
- _context.Series.Add(s);
+ Context.Series.Add(s);
- _context.Person.Add(g);
- await _context.SaveChangesAsync();
+ Context.Person.Add(g);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -979,7 +821,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.False(series.Metadata.People.Any());
@@ -997,10 +839,10 @@ public class SeriesServiceTests : AbstractDbTest
.Build();
s.Library = new LibraryBuilder("Test LIb", LibraryType.Book).Build();
var g = new PersonBuilder("Existing Person").Build();
- _context.Series.Add(s);
+ Context.Series.Add(s);
- _context.Person.Add(g);
- await _context.SaveChangesAsync();
+ Context.Person.Add(g);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -1015,7 +857,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.True(series.Metadata.People.Count != 0);
@@ -1049,10 +891,10 @@ public class SeriesServiceTests : AbstractDbTest
var g = new GenreBuilder("Existing Genre").Build();
s.Metadata.Genres = new List {g};
s.Metadata.GenresLocked = true;
- _context.Series.Add(s);
+ Context.Series.Add(s);
- _context.Genre.Add(g);
- await _context.SaveChangesAsync();
+ Context.Genre.Add(g);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -1067,7 +909,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.True(series.Metadata.Genres.Select(g => g.Title).All(g => g == "Existing Genre".SentenceCase()));
@@ -1082,8 +924,8 @@ public class SeriesServiceTests : AbstractDbTest
.WithMetadata(new SeriesMetadataBuilder().Build())
.Build();
s.Library = new LibraryBuilder("Test LIb", LibraryType.Book).Build();
- _context.Series.Add(s);
- await _context.SaveChangesAsync();
+ Context.Series.Add(s);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -1097,7 +939,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.Equal(0, series.Metadata.ReleaseYear);
@@ -1116,8 +958,8 @@ public class SeriesServiceTests : AbstractDbTest
.Build();
s.Library = new LibraryBuilder("Test Lib", LibraryType.Book).Build();
- _context.Series.Add(s);
- await _context.SaveChangesAsync();
+ Context.Series.Add(s);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -1130,7 +972,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.Contains("New Genre".SentenceCase(), series.Metadata.Genres.Select(g => g.Title));
@@ -1149,9 +991,9 @@ public class SeriesServiceTests : AbstractDbTest
var g = new GenreBuilder("Existing Genre").Build();
s.Metadata.Genres = new List { g };
- _context.Series.Add(s);
- _context.Genre.Add(g);
- await _context.SaveChangesAsync();
+ Context.Series.Add(s);
+ Context.Genre.Add(g);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -1164,7 +1006,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.DoesNotContain("Existing Genre".SentenceCase(), series.Metadata.Genres.Select(g => g.Title));
@@ -1183,9 +1025,9 @@ public class SeriesServiceTests : AbstractDbTest
var g = new GenreBuilder("Existing Genre").Build();
s.Metadata.Genres = new List { g };
- _context.Series.Add(s);
- _context.Genre.Add(g);
- await _context.SaveChangesAsync();
+ Context.Series.Add(s);
+ Context.Genre.Add(g);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -1198,7 +1040,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.Empty(series.Metadata.Genres);
@@ -1216,8 +1058,8 @@ public class SeriesServiceTests : AbstractDbTest
.Build();
s.Library = new LibraryBuilder("Test Lib", LibraryType.Book).Build();
- _context.Series.Add(s);
- await _context.SaveChangesAsync();
+ Context.Series.Add(s);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -1230,7 +1072,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.Contains("New Tag".SentenceCase(), series.Metadata.Tags.Select(t => t.Title));
@@ -1248,9 +1090,9 @@ public class SeriesServiceTests : AbstractDbTest
var t = new TagBuilder("Existing Tag").Build();
s.Metadata.Tags = new List { t };
- _context.Series.Add(s);
- _context.Tag.Add(t);
- await _context.SaveChangesAsync();
+ Context.Series.Add(s);
+ Context.Tag.Add(t);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -1263,7 +1105,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.DoesNotContain("Existing Tag".SentenceCase(), series.Metadata.Tags.Select(t => t.Title));
@@ -1282,9 +1124,9 @@ public class SeriesServiceTests : AbstractDbTest
var t = new TagBuilder("Existing Tag").Build();
s.Metadata.Tags = new List { t };
- _context.Series.Add(s);
- _context.Tag.Add(t);
- await _context.SaveChangesAsync();
+ Context.Series.Add(s);
+ Context.Tag.Add(t);
+ await Context.SaveChangesAsync();
var success = await _seriesService.UpdateSeriesMetadata(new UpdateSeriesMetadataDto
{
@@ -1297,7 +1139,7 @@ public class SeriesServiceTests : AbstractDbTest
Assert.True(success);
- var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
+ var series = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(s.Id);
Assert.NotNull(series);
Assert.NotNull(series.Metadata);
Assert.Empty(series.Metadata.Tags);
@@ -1434,7 +1276,7 @@ public class SeriesServiceTests : AbstractDbTest
public async Task UpdateRelatedSeries_ShouldAddAllRelations()
{
await ResetDb();
- _context.Library.Add(new Library
+ Context.Library.Add(new Library
{
AppUsers = new List
{
@@ -1453,9 +1295,9 @@ public class SeriesServiceTests : AbstractDbTest
}
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
+ var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
// Add relations
var addRelationDto = CreateRelationsDto(series1);
addRelationDto.Adaptations.Add(2);
@@ -1470,7 +1312,7 @@ public class SeriesServiceTests : AbstractDbTest
public async Task UpdateRelatedSeries_ShouldAddPrequelWhenAddingSequel()
{
await ResetDb();
- _context.Library.Add(new Library
+ Context.Library.Add(new Library
{
AppUsers = new List
{
@@ -1488,10 +1330,10 @@ public class SeriesServiceTests : AbstractDbTest
}
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
- var series2 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Related);
+ var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
+ var series2 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Related);
// Add relations
var addRelationDto = CreateRelationsDto(series1);
addRelationDto.Sequels.Add(2);
@@ -1506,7 +1348,7 @@ public class SeriesServiceTests : AbstractDbTest
public async Task UpdateRelatedSeries_DeleteAllRelations()
{
await ResetDb();
- _context.Library.Add(new Library
+ Context.Library.Add(new Library
{
AppUsers = new List
{
@@ -1525,9 +1367,9 @@ public class SeriesServiceTests : AbstractDbTest
}
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
+ var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
// Add relations
var addRelationDto = CreateRelationsDto(series1);
addRelationDto.Adaptations.Add(2);
@@ -1550,7 +1392,7 @@ public class SeriesServiceTests : AbstractDbTest
public async Task UpdateRelatedSeries_DeleteTargetSeries_ShouldSucceed()
{
await ResetDb();
- _context.Library.Add(new Library
+ Context.Library.Add(new Library
{
AppUsers = new List
{
@@ -1568,9 +1410,9 @@ public class SeriesServiceTests : AbstractDbTest
}
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
+ var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
// Add relations
var addRelationDto = CreateRelationsDto(series1);
addRelationDto.Adaptations.Add(2);
@@ -1579,10 +1421,10 @@ public class SeriesServiceTests : AbstractDbTest
Assert.NotNull(series1);
Assert.Equal(2, series1.Relations.Single(s => s.TargetSeriesId == 2).TargetSeriesId);
- _context.Series.Remove(await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2));
+ Context.Series.Remove(await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2));
try
{
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
}
catch (Exception)
{
@@ -1590,14 +1432,14 @@ public class SeriesServiceTests : AbstractDbTest
}
// Remove relations
- Assert.Empty((await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related)).Relations);
+ Assert.Empty((await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related)).Relations);
}
[Fact]
public async Task UpdateRelatedSeries_DeleteSourceSeries_ShouldSucceed()
{
await ResetDb();
- _context.Library.Add(new Library
+ Context.Library.Add(new Library
{
AppUsers = new List
{
@@ -1615,9 +1457,9 @@ public class SeriesServiceTests : AbstractDbTest
}
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
+ var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
// Add relations
var addRelationDto = CreateRelationsDto(series1);
addRelationDto.Adaptations.Add(2);
@@ -1625,12 +1467,12 @@ public class SeriesServiceTests : AbstractDbTest
Assert.NotNull(series1);
Assert.Equal(2, series1.Relations.Single(s => s.TargetSeriesId == 2).TargetSeriesId);
- var seriesToRemove = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
+ var seriesToRemove = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1);
Assert.NotNull(seriesToRemove);
- _context.Series.Remove(seriesToRemove);
+ Context.Series.Remove(seriesToRemove);
try
{
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
}
catch (Exception)
{
@@ -1638,14 +1480,14 @@ public class SeriesServiceTests : AbstractDbTest
}
// Remove relations
- Assert.Empty((await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Related)).Relations);
+ Assert.Empty((await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2, SeriesIncludes.Related)).Relations);
}
[Fact]
public async Task UpdateRelatedSeries_ShouldNotAllowDuplicates()
{
await ResetDb();
- _context.Library.Add(new Library
+ Context.Library.Add(new Library
{
AppUsers = new List
{
@@ -1663,9 +1505,9 @@ public class SeriesServiceTests : AbstractDbTest
}
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
+ var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
var relation = new SeriesRelation
{
Series = series1,
@@ -1690,7 +1532,7 @@ public class SeriesServiceTests : AbstractDbTest
public async Task GetRelatedSeries_EditionPrequelSequel_ShouldNotHaveParent()
{
await ResetDb();
- _context.Library.Add(new Library
+ Context.Library.Add(new Library
{
AppUsers = new List
{
@@ -1710,8 +1552,8 @@ public class SeriesServiceTests : AbstractDbTest
new SeriesBuilder("Test Series Adaption").Build(),
}
});
- await _context.SaveChangesAsync();
- var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
+ await Context.SaveChangesAsync();
+ var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
// Add relations
var addRelationDto = CreateRelationsDto(series1);
addRelationDto.Editions.Add(2);
@@ -1737,30 +1579,30 @@ public class SeriesServiceTests : AbstractDbTest
.WithSeries(new SeriesBuilder("Test Series Sequels").Build())
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.Build();
- _context.Library.Add(lib);
+ Context.Library.Add(lib);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
+ var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
// Add relations
var addRelationDto = CreateRelationsDto(series1);
addRelationDto.Adaptations.Add(2);
addRelationDto.Sequels.Add(3);
await _seriesService.UpdateRelatedSeries(addRelationDto);
- var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(lib.Id);
- _unitOfWork.LibraryRepository.Delete(library);
+ var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(lib.Id);
+ UnitOfWork.LibraryRepository.Delete(library);
try
{
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
}
catch (Exception)
{
Assert.False(true);
}
- Assert.Null(await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1));
+ Assert.Null(await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1));
}
[Fact]
@@ -1781,7 +1623,7 @@ public class SeriesServiceTests : AbstractDbTest
.WithSeries(new SeriesBuilder("Test Series Sequels").Build())
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.Build();
- _context.Library.Add(lib1);
+ Context.Library.Add(lib1);
var lib2 = new LibraryBuilder("Test LIb 2", LibraryType.Book)
.WithSeries(new SeriesBuilder("Test Series 2").Build())
@@ -1789,29 +1631,29 @@ public class SeriesServiceTests : AbstractDbTest
.WithSeries(new SeriesBuilder("Test Series Prequels 3").Build())// TODO: Is this a bug
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.Build();
- _context.Library.Add(lib2);
+ Context.Library.Add(lib2);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
+ var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1, SeriesIncludes.Related);
// Add relations
var addRelationDto = CreateRelationsDto(series1);
addRelationDto.Adaptations.Add(4); // cross library link
await _seriesService.UpdateRelatedSeries(addRelationDto);
- var library = await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(lib1.Id, LibraryIncludes.Series);
- _unitOfWork.LibraryRepository.Delete(library);
+ var library = await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(lib1.Id, LibraryIncludes.Series);
+ UnitOfWork.LibraryRepository.Delete(library);
try
{
- await _unitOfWork.CommitAsync();
+ await UnitOfWork.CommitAsync();
}
catch (Exception)
{
Assert.False(true);
}
- Assert.Null(await _unitOfWork.LibraryRepository.GetLibraryForIdAsync(1));
+ Assert.Null(await UnitOfWork.LibraryRepository.GetLibraryForIdAsync(1));
}
#endregion
@@ -1833,13 +1675,13 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb")
+ Context.Library.Add(new LibraryBuilder("Test LIb")
.WithAppUser(new AppUserBuilder("majora2007", string.Empty)
.WithLocale("en")
.Build())
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
Assert.Equal(expected, await _seriesService.FormatChapterName(1, libraryType, withHash));
}
@@ -2004,18 +1846,18 @@ public class SeriesServiceTests : AbstractDbTest
.WithSeries(new SeriesBuilder("Test Series Sequels").Build())
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.Build();
- _context.Library.Add(lib1);
+ Context.Library.Add(lib1);
var lib2 = new LibraryBuilder("Test LIb 2", LibraryType.Book)
.WithSeries(new SeriesBuilder("Test Series 2").Build())
.WithSeries(new SeriesBuilder("Test Series Prequels 2").Build())
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.Build();
- _context.Library.Add(lib2);
+ Context.Library.Add(lib2);
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var series1 = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1,
+ var series1 = await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1,
SeriesIncludes.Related | SeriesIncludes.ExternalRatings);
// Add relations
var addRelationDto = CreateRelationsDto(series1);
@@ -2061,12 +1903,12 @@ public class SeriesServiceTests : AbstractDbTest
}
};
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
// Ensure we can delete the series
Assert.True(await _seriesService.DeleteMultipleSeries(new[] {1, 2}));
- Assert.Null(await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(1));
- Assert.Null(await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(2));
+ Assert.Null(await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(1));
+ Assert.Null(await UnitOfWork.SeriesRepository.GetSeriesByIdAsync(2));
}
#endregion
@@ -2078,7 +1920,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
+ Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -2091,7 +1933,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _seriesService.GetEstimatedChapterCreationDate(1, 1);
Assert.Equal(Parser.LooseLeafVolumeNumber, nextChapter.VolumeNumber);
@@ -2103,7 +1945,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb")
+ Context.Library.Add(new LibraryBuilder("Test LIb")
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
.WithPublicationStatus(PublicationStatus.Completed)
@@ -2116,7 +1958,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _seriesService.GetEstimatedChapterCreationDate(1, 1);
Assert.Equal(Parser.LooseLeafVolumeNumber, nextChapter.VolumeNumber);
@@ -2128,7 +1970,7 @@ public class SeriesServiceTests : AbstractDbTest
{
await ResetDb();
- _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
+ Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
@@ -2140,7 +1982,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _seriesService.GetEstimatedChapterCreationDate(1, 1);
Assert.NotNull(nextChapter);
@@ -2154,7 +1996,7 @@ public class SeriesServiceTests : AbstractDbTest
await ResetDb();
var now = DateTime.Parse("2021-01-01", CultureInfo.InvariantCulture); // 10/31/2024 can trigger an edge case bug
- _context.Library.Add(new LibraryBuilder("Test LIb")
+ Context.Library.Add(new LibraryBuilder("Test LIb")
.WithAppUser(new AppUserBuilder("majora2007", string.Empty).Build())
.WithSeries(new SeriesBuilder("Test")
.WithPublicationStatus(PublicationStatus.OnGoing)
@@ -2168,7 +2010,7 @@ public class SeriesServiceTests : AbstractDbTest
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var nextChapter = await _seriesService.GetEstimatedChapterCreationDate(1, 1);
Assert.NotNull(nextChapter);
diff --git a/API.Tests/Services/SiteThemeServiceTests.cs b/API.Tests/Services/SiteThemeServiceTests.cs
index 463d49df4..3893af1fb 100644
--- a/API.Tests/Services/SiteThemeServiceTests.cs
+++ b/API.Tests/Services/SiteThemeServiceTests.cs
@@ -31,24 +31,24 @@ public abstract class SiteThemeServiceTest : AbstractDbTest
protected override async Task ResetDb()
{
- _context.SiteTheme.RemoveRange(_context.SiteTheme);
- await _context.SaveChangesAsync();
+ Context.SiteTheme.RemoveRange(Context.SiteTheme);
+ await Context.SaveChangesAsync();
// Recreate defaults
- await Seed.SeedThemes(_context);
+ await Seed.SeedThemes(Context);
}
[Fact]
public async Task UpdateDefault_ShouldThrowOnInvalidId()
{
await ResetDb();
- _testOutputHelper.WriteLine($"[UpdateDefault_ShouldThrowOnInvalidId] All Themes: {(await _unitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}");
+ _testOutputHelper.WriteLine($"[UpdateDefault_ShouldThrowOnInvalidId] All Themes: {(await UnitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}");
var filesystem = CreateFileSystem();
filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData("123"));
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub, Substitute.For(),
+ var siteThemeService = new ThemeService(ds, UnitOfWork, _messageHub, Substitute.For(),
Substitute.For>(), Substitute.For());
- _context.SiteTheme.Add(new SiteTheme()
+ Context.SiteTheme.Add(new SiteTheme()
{
Name = "Custom",
NormalizedName = "Custom".ToNormalized(),
@@ -56,7 +56,7 @@ public abstract class SiteThemeServiceTest : AbstractDbTest
FileName = "custom.css",
IsDefault = false
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var ex = await Assert.ThrowsAsync(() => siteThemeService.UpdateDefault(10));
Assert.Equal("Theme file missing or invalid", ex.Message);
@@ -68,14 +68,14 @@ public abstract class SiteThemeServiceTest : AbstractDbTest
public async Task GetContent_ShouldReturnContent()
{
await ResetDb();
- _testOutputHelper.WriteLine($"[GetContent_ShouldReturnContent] All Themes: {(await _unitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}");
+ _testOutputHelper.WriteLine($"[GetContent_ShouldReturnContent] All Themes: {(await UnitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}");
var filesystem = CreateFileSystem();
filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData("123"));
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub, Substitute.For(),
+ var siteThemeService = new ThemeService(ds, UnitOfWork, _messageHub, Substitute.For(),
Substitute.For>(), Substitute.For());
- _context.SiteTheme.Add(new SiteTheme()
+ Context.SiteTheme.Add(new SiteTheme()
{
Name = "Custom",
NormalizedName = "Custom".ToNormalized(),
@@ -83,9 +83,9 @@ public abstract class SiteThemeServiceTest : AbstractDbTest
FileName = "custom.css",
IsDefault = false
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var content = await siteThemeService.GetContent((await _unitOfWork.SiteThemeRepository.GetThemeDtoByName("Custom")).Id);
+ var content = await siteThemeService.GetContent((await UnitOfWork.SiteThemeRepository.GetThemeDtoByName("Custom")).Id);
Assert.NotNull(content);
Assert.NotEmpty(content);
Assert.Equal("123", content);
@@ -95,14 +95,14 @@ public abstract class SiteThemeServiceTest : AbstractDbTest
public async Task UpdateDefault_ShouldHaveOneDefault()
{
await ResetDb();
- _testOutputHelper.WriteLine($"[UpdateDefault_ShouldHaveOneDefault] All Themes: {(await _unitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}");
+ _testOutputHelper.WriteLine($"[UpdateDefault_ShouldHaveOneDefault] All Themes: {(await UnitOfWork.SiteThemeRepository.GetThemes()).Count(t => t.IsDefault)}");
var filesystem = CreateFileSystem();
filesystem.AddFile($"{SiteThemeDirectory}custom.css", new MockFileData("123"));
var ds = new DirectoryService(Substitute.For>(), filesystem);
- var siteThemeService = new ThemeService(ds, _unitOfWork, _messageHub, Substitute.For(),
+ var siteThemeService = new ThemeService(ds, UnitOfWork, _messageHub, Substitute.For(),
Substitute.For>(), Substitute.For());
- _context.SiteTheme.Add(new SiteTheme()
+ Context.SiteTheme.Add(new SiteTheme()
{
Name = "Custom",
NormalizedName = "Custom".ToNormalized(),
@@ -110,16 +110,16 @@ public abstract class SiteThemeServiceTest : AbstractDbTest
FileName = "custom.css",
IsDefault = false
});
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
- var customTheme = (await _unitOfWork.SiteThemeRepository.GetThemeDtoByName("Custom"));
+ var customTheme = (await UnitOfWork.SiteThemeRepository.GetThemeDtoByName("Custom"));
Assert.NotNull(customTheme);
await siteThemeService.UpdateDefault(customTheme.Id);
- Assert.Equal(customTheme.Id, (await _unitOfWork.SiteThemeRepository.GetDefaultTheme()).Id);
+ Assert.Equal(customTheme.Id, (await UnitOfWork.SiteThemeRepository.GetDefaultTheme()).Id);
}
}
diff --git a/API.Tests/Services/Test Data/CoverDbService/Existing/01.webp b/API.Tests/Services/Test Data/CoverDbService/Existing/01.webp
new file mode 100644
index 000000000..0b46b66d2
Binary files /dev/null and b/API.Tests/Services/Test Data/CoverDbService/Existing/01.webp differ
diff --git a/API.Tests/Services/Test Data/CoverDbService/Favicons/anilist.co.webp b/API.Tests/Services/Test Data/CoverDbService/Favicons/anilist.co.webp
new file mode 100644
index 000000000..475824863
Binary files /dev/null and b/API.Tests/Services/Test Data/CoverDbService/Favicons/anilist.co.webp differ
diff --git a/API.Tests/Services/VersionUpdaterServiceTests.cs b/API.Tests/Services/VersionUpdaterServiceTests.cs
index c7a8a14d8..8be8f4aee 100644
--- a/API.Tests/Services/VersionUpdaterServiceTests.cs
+++ b/API.Tests/Services/VersionUpdaterServiceTests.cs
@@ -16,19 +16,15 @@ namespace API.Tests.Services;
public class VersionUpdaterServiceTests : IDisposable
{
- private readonly ILogger _logger;
- private readonly IEventHub _eventHub;
- private readonly IDirectoryService _directoryService;
+ private readonly ILogger _logger = Substitute.For>();
+ private readonly IEventHub _eventHub = Substitute.For();
+ private readonly IDirectoryService _directoryService = Substitute.For();
private readonly VersionUpdaterService _service;
private readonly string _tempPath;
private readonly HttpTest _httpTest;
public VersionUpdaterServiceTests()
{
- _logger = Substitute.For>();
- _eventHub = Substitute.For();
- _directoryService = Substitute.For();
-
// Create temp directory for cache
_tempPath = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
Directory.CreateDirectory(_tempPath);
@@ -55,6 +51,7 @@ public class VersionUpdaterServiceTests : IDisposable
// Reset BuildInfo.Version
typeof(BuildInfo).GetProperty(nameof(BuildInfo.Version))?.SetValue(null, null);
+ GC.SuppressFinalize(this);
}
[Fact]
@@ -302,7 +299,7 @@ public class VersionUpdaterServiceTests : IDisposable
var result = await _service.GetAllReleases();
- Assert.Equal(1, result.Count);
+ Assert.Single(result);
Assert.Equal("0.7.0.0", result[0].UpdateVersion);
Assert.NotEmpty(_httpTest.CallLog); // HTTP call was made
}
diff --git a/API.Tests/Services/WordCountAnalysisTests.cs b/API.Tests/Services/WordCountAnalysisTests.cs
index 8c8c4193c..57c6ec7f6 100644
--- a/API.Tests/Services/WordCountAnalysisTests.cs
+++ b/API.Tests/Services/WordCountAnalysisTests.cs
@@ -26,9 +26,10 @@ public class WordCountAnalysisTests : AbstractDbTest
private const long MinHoursToRead = 1;
private const float AvgHoursToRead = 1.66954792f;
private const long MaxHoursToRead = 3;
- public WordCountAnalysisTests() : base()
+
+ public WordCountAnalysisTests()
{
- _readerService = new ReaderService(_unitOfWork, Substitute.For>(),
+ _readerService = new ReaderService(UnitOfWork, Substitute.For>(),
Substitute.For(), Substitute.For(),
new DirectoryService(Substitute.For>(), new MockFileSystem()),
Substitute.For());
@@ -36,9 +37,9 @@ public class WordCountAnalysisTests : AbstractDbTest
protected override async Task ResetDb()
{
- _context.Series.RemoveRange(_context.Series.ToList());
+ Context.Series.RemoveRange(Context.Series.ToList());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
}
[Fact]
@@ -56,7 +57,7 @@ public class WordCountAnalysisTests : AbstractDbTest
MangaFormat.Epub).Build())
.Build();
- _context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
+ Context.Library.Add(new LibraryBuilder("Test LIb", LibraryType.Book)
.WithSeries(series)
.Build());
@@ -67,11 +68,11 @@ public class WordCountAnalysisTests : AbstractDbTest
.Build(),
};
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var cacheService = new CacheHelper(new FileService());
- var service = new WordCountAnalyzerService(Substitute.For>(), _unitOfWork,
+ var service = new WordCountAnalyzerService(Substitute.For>(), UnitOfWork,
Substitute.For(), cacheService, _readerService, Substitute.For());
@@ -83,7 +84,7 @@ public class WordCountAnalysisTests : AbstractDbTest
Assert.Equal(MaxHoursToRead, series.MaxHoursToRead);
// Validate the Chapter gets updated correctly
- var volume = series.Volumes.First();
+ var volume = series.Volumes[0];
Assert.Equal(WordCount, volume.WordCount);
Assert.Equal(MinHoursToRead, volume.MinHoursToRead);
Assert.Equal(AvgHoursToRead, volume.AvgHoursToRead);
@@ -114,16 +115,16 @@ public class WordCountAnalysisTests : AbstractDbTest
.Build())
.Build();
- _context.Library.Add(new LibraryBuilder("Test", LibraryType.Book)
+ Context.Library.Add(new LibraryBuilder("Test", LibraryType.Book)
.WithSeries(series)
.Build());
- await _context.SaveChangesAsync();
+ await Context.SaveChangesAsync();
var cacheService = new CacheHelper(new FileService());
- var service = new WordCountAnalyzerService(Substitute.For>(), _unitOfWork,
+ var service = new WordCountAnalyzerService(Substitute.For>(), UnitOfWork,
Substitute.For(), cacheService, _readerService, Substitute.For());
await service.ScanSeries(1, 1);
@@ -139,21 +140,21 @@ public class WordCountAnalysisTests : AbstractDbTest
.WithChapter(chapter2)
.Build());
- series.Volumes.First().Chapters.Add(chapter2);
- await _unitOfWork.CommitAsync();
+ series.Volumes[0].Chapters.Add(chapter2);
+ await UnitOfWork.CommitAsync();
await service.ScanSeries(1, 1);
Assert.Equal(WordCount * 2L, series.WordCount);
Assert.Equal(MinHoursToRead * 2, series.MinHoursToRead);
- var firstVolume = series.Volumes.ElementAt(0);
+ var firstVolume = series.Volumes[0];
Assert.Equal(WordCount, firstVolume.WordCount);
Assert.Equal(MinHoursToRead, firstVolume.MinHoursToRead);
Assert.True(series.AvgHoursToRead.Is(AvgHoursToRead * 2));
Assert.Equal(MaxHoursToRead, firstVolume.MaxHoursToRead);
- var secondVolume = series.Volumes.ElementAt(1);
+ var secondVolume = series.Volumes[1];
Assert.Equal(WordCount, secondVolume.WordCount);
Assert.Equal(MinHoursToRead, secondVolume.MinHoursToRead);
Assert.Equal(AvgHoursToRead, secondVolume.AvgHoursToRead);
diff --git a/API/Constants/CacheProfiles.cs b/API/Constants/CacheProfiles.cs
index ccbbf2479..afc82f19c 100644
--- a/API/Constants/CacheProfiles.cs
+++ b/API/Constants/CacheProfiles.cs
@@ -8,6 +8,10 @@ public static class EasyCacheProfiles
public const string RevokedJwt = "revokedJWT";
public const string Favicon = "favicon";
///
+ /// Images for Publishers
+ ///
+ public const string Publisher = "publisherImages";
+ ///
/// If a user's license is valid
///
public const string License = "license";
diff --git a/API/Controllers/ChapterController.cs b/API/Controllers/ChapterController.cs
index 4110cd907..8de26cf97 100644
--- a/API/Controllers/ChapterController.cs
+++ b/API/Controllers/ChapterController.cs
@@ -6,6 +6,7 @@ using API.Constants;
using API.Data;
using API.Data.Repositories;
using API.DTOs;
+using API.DTOs.SeriesDetail;
using API.Entities;
using API.Entities.Enums;
using API.Entities.Person;
@@ -14,8 +15,10 @@ using API.Helpers;
using API.Services;
using API.Services.Tasks.Scanner.Parser;
using API.SignalR;
+using AutoMapper;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Nager.ArticleNumber;
@@ -27,13 +30,16 @@ public class ChapterController : BaseApiController
private readonly ILocalizationService _localizationService;
private readonly IEventHub _eventHub;
private readonly ILogger _logger;
+ private readonly IMapper _mapper;
- public ChapterController(IUnitOfWork unitOfWork, ILocalizationService localizationService, IEventHub eventHub, ILogger logger)
+ public ChapterController(IUnitOfWork unitOfWork, ILocalizationService localizationService, IEventHub eventHub, ILogger logger,
+ IMapper mapper)
{
_unitOfWork = unitOfWork;
_localizationService = localizationService;
_eventHub = eventHub;
_logger = logger;
+ _mapper = mapper;
}
///
@@ -62,7 +68,8 @@ public class ChapterController : BaseApiController
{
if (User.IsInRole(PolicyConstants.ReadOnlyRole)) return BadRequest(await _localizationService.Translate(User.GetUserId(), "permission-denied"));
- var chapter = await _unitOfWork.ChapterRepository.GetChapterAsync(chapterId);
+ var chapter = await _unitOfWork.ChapterRepository.GetChapterAsync(chapterId,
+ ChapterIncludes.Files | ChapterIncludes.ExternalReviews | ChapterIncludes.ExternalRatings);
if (chapter == null)
return BadRequest(_localizationService.Translate(User.GetUserId(), "chapter-doesnt-exist"));
@@ -80,6 +87,15 @@ public class ChapterController : BaseApiController
_unitOfWork.ChapterRepository.Remove(chapter);
}
+ // If we removed the volume, do an additional check if we need to delete the actual series as well or not
+ var series = await _unitOfWork.SeriesRepository.GetSeriesByIdAsync(vol.SeriesId, SeriesIncludes.ExternalData | SeriesIncludes.Volumes);
+ var needToRemoveSeries = needToRemoveVolume && series != null && series.Volumes.Count <= 1;
+ if (needToRemoveSeries)
+ {
+ _unitOfWork.SeriesRepository.Remove(series!);
+ }
+
+
if (!await _unitOfWork.CommitAsync()) return Ok(false);
@@ -89,6 +105,12 @@ public class ChapterController : BaseApiController
await _eventHub.SendMessageAsync(MessageFactory.VolumeRemoved, MessageFactory.VolumeRemovedEvent(chapter.VolumeId, vol.SeriesId), false);
}
+ if (needToRemoveSeries)
+ {
+ await _eventHub.SendMessageAsync(MessageFactory.SeriesRemoved,
+ MessageFactory.SeriesRemovedEvent(series!.Id, series.Name, series.LibraryId), false);
+ }
+
return Ok(true);
}
@@ -391,6 +413,39 @@ public class ChapterController : BaseApiController
return Ok();
}
+ ///
+ /// Returns Ratings and Reviews for an individual Chapter
+ ///
+ ///
+ ///
+ [HttpGet("chapter-detail-plus")]
+ public async Task> ChapterDetailPlus([FromQuery] int chapterId)
+ {
+ var ret = new ChapterDetailPlusDto();
+ var userReviews = (await _unitOfWork.UserRepository.GetUserRatingDtosForChapterAsync(chapterId, User.GetUserId()))
+ .Where(r => !string.IsNullOrEmpty(r.Body))
+ .OrderByDescending(review => review.Username.Equals(User.GetUsername()) ? 1 : 0)
+ .ToList();
+
+ var ownRating = await _unitOfWork.UserRepository.GetUserChapterRatingAsync(User.GetUserId(), chapterId);
+ if (ownRating != null)
+ {
+ ret.Rating = ownRating.Rating;
+ ret.HasBeenRated = ownRating.HasBeenRated;
+ }
+
+ var externalReviews = await _unitOfWork.ChapterRepository.GetExternalChapterReviewDtos(chapterId);
+ if (externalReviews.Count > 0)
+ {
+ userReviews.AddRange(ReviewHelper.SelectSpectrumOfReviews(externalReviews));
+ }
+
+ ret.Reviews = userReviews;
+
+ ret.Ratings = await _unitOfWork.ChapterRepository.GetExternalChapterRatingDtos(chapterId);
+
+ return Ok(ret);
+ }
}
diff --git a/API/Controllers/MetadataController.cs b/API/Controllers/MetadataController.cs
index 9757186bb..b08ac1f38 100644
--- a/API/Controllers/MetadataController.cs
+++ b/API/Controllers/MetadataController.cs
@@ -221,7 +221,7 @@ public class MetadataController(IUnitOfWork unitOfWork, ILocalizationService loc
return Ok(ret);
}
- private async Task PrepareSeriesDetail(List userReviews, SeriesDetailPlusDto ret)
+ private async Task PrepareSeriesDetail(List