mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-23 07:20:32 -04:00
* Updated to net7.0 * Updated GA to .net 7 * Updated System.IO.Abstractions to use New factory. * Converted Regex into SourceGenerator in Parser. * Updated more regex to source generators. * Enabled Nullability and more regex changes throughout codebase. * Parser is 100% GeneratedRegexified * Lots of nullability code * Enabled nullability for all repositories. * Fixed another unit test * Refactored some code around and took care of some todos. * Updating code for nullability and cleaning up methods that aren't used anymore. Refctored all uses of Parser.Normalize() to use new extension * More nullability exercises. 500 warnings to go. * Fixed a bug where custom file uploads for entities wouldn't save in webP. * Nullability is done for all DTOs * Fixed all unit tests and nullability for the project. Only OPDS is left which will be done with an upcoming OPDS enhancement. * Use localization in book service after validating * Code smells * Switched to preview build of swashbuckle for .net7 support * Fixed up merge issues * Disable emulate comic book when on single page reader * Fixed a regression where double page renderer wouldn't layout the images correctly * Updated to swashbuckle which support .net 7 * Fixed a bad GA action * Some code cleanup * More code smells * Took care of most of nullable issues * Fixed a broken test due to having more than one test run in parallel * I'm really not sure why the unit tests are failing or are so extremely slow on .net 7 * Updated all dependencies * Fixed up build and removed hardcoded framework from build scripts. (this merge removes Regex Source generators). Unit tests are completely busted. * Unit tests and code cleanup. Needs shakeout now. * Adjusted Series model since a few fields are not-nullable. Removed dead imports on the project. * Refactored to use Builder pattern for all unit tests. * Switched nullability down to warnings. It wasn't possible to switch due to constraint issues in DB Migration.
109 lines
3.4 KiB
C#
109 lines
3.4 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.DTOs.Metadata;
|
|
using API.Entities;
|
|
using API.Extensions;
|
|
using AutoMapper;
|
|
using AutoMapper.QueryableExtensions;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace API.Data.Repositories;
|
|
|
|
public interface IGenreRepository
|
|
{
|
|
void Attach(Genre genre);
|
|
void Remove(Genre genre);
|
|
Task<Genre?> FindByNameAsync(string genreName);
|
|
Task<IList<Genre>> GetAllGenresAsync();
|
|
Task<IList<GenreTagDto>> GetAllGenreDtosAsync(int userId);
|
|
Task RemoveAllGenreNoLongerAssociated(bool removeExternal = false);
|
|
Task<IList<GenreTagDto>> GetAllGenreDtosForLibrariesAsync(IList<int> libraryIds, int userId);
|
|
Task<int> GetCountAsync();
|
|
}
|
|
|
|
public class GenreRepository : IGenreRepository
|
|
{
|
|
private readonly DataContext _context;
|
|
private readonly IMapper _mapper;
|
|
|
|
public GenreRepository(DataContext context, IMapper mapper)
|
|
{
|
|
_context = context;
|
|
_mapper = mapper;
|
|
}
|
|
|
|
public void Attach(Genre genre)
|
|
{
|
|
_context.Genre.Attach(genre);
|
|
}
|
|
|
|
public void Remove(Genre genre)
|
|
{
|
|
_context.Genre.Remove(genre);
|
|
}
|
|
|
|
public async Task<Genre?> FindByNameAsync(string genreName)
|
|
{
|
|
var normalizedName = genreName.ToNormalized();
|
|
return await _context.Genre
|
|
.FirstOrDefaultAsync(g => g.NormalizedTitle != null && g.NormalizedTitle.Equals(normalizedName));
|
|
}
|
|
|
|
public async Task RemoveAllGenreNoLongerAssociated(bool removeExternal = false)
|
|
{
|
|
var genresWithNoConnections = await _context.Genre
|
|
.Include(p => p.SeriesMetadatas)
|
|
.Include(p => p.Chapters)
|
|
.Where(p => p.SeriesMetadatas.Count == 0 && p.Chapters.Count == 0)
|
|
.AsSplitQuery()
|
|
.ToListAsync();
|
|
|
|
_context.Genre.RemoveRange(genresWithNoConnections);
|
|
|
|
await _context.SaveChangesAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Returns a set of Genre tags for a set of library Ids. UserId will restrict returned Genres based on user's age restriction.
|
|
/// </summary>
|
|
/// <param name="libraryIds"></param>
|
|
/// <param name="userId"></param>
|
|
/// <returns></returns>
|
|
public async Task<IList<GenreTagDto>> GetAllGenreDtosForLibrariesAsync(IList<int> libraryIds, int userId)
|
|
{
|
|
var userRating = await _context.AppUser.GetUserAgeRestriction(userId);
|
|
return await _context.Series
|
|
.Where(s => libraryIds.Contains(s.LibraryId))
|
|
.RestrictAgainstAgeRestriction(userRating)
|
|
.SelectMany(s => s.Metadata.Genres)
|
|
.AsSplitQuery()
|
|
.Distinct()
|
|
.OrderBy(p => p.NormalizedTitle)
|
|
.ProjectTo<GenreTagDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
|
|
public async Task<int> GetCountAsync()
|
|
{
|
|
return await _context.Genre.CountAsync();
|
|
}
|
|
|
|
public async Task<IList<Genre>> GetAllGenresAsync()
|
|
{
|
|
return await _context.Genre.ToListAsync();
|
|
}
|
|
|
|
public async Task<IList<GenreTagDto>> GetAllGenreDtosAsync(int userId)
|
|
{
|
|
var ageRating = await _context.AppUser.GetUserAgeRestriction(userId);
|
|
return await _context.Genre
|
|
.RestrictAgainstAgeRestriction(ageRating)
|
|
.OrderBy(g => g.NormalizedTitle)
|
|
.AsNoTracking()
|
|
.ProjectTo<GenreTagDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
}
|