mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-03 21:54:47 -04:00
* Bump express from 4.17.2 to 4.18.2 in /UI/Web Bumps [express](https://github.com/expressjs/express) from 4.17.2 to 4.18.2. - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.2...4.18.2) --- updated-dependencies: - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Bump decode-uri-component from 0.2.0 to 0.2.2 in /UI/Web Bumps [decode-uri-component](https://github.com/SamVerschueren/decode-uri-component) from 0.2.0 to 0.2.2. - [Release notes](https://github.com/SamVerschueren/decode-uri-component/releases) - [Commits](https://github.com/SamVerschueren/decode-uri-component/compare/v0.2.0...v0.2.2) --- updated-dependencies: - dependency-name: decode-uri-component dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Bump qs and express in /UI/Web Bumps [qs](https://github.com/ljharb/qs) and [express](https://github.com/expressjs/express). These dependencies needed to be updated together. Updates `qs` from 6.5.3 to 6.11.0 - [Release notes](https://github.com/ljharb/qs/releases) - [Changelog](https://github.com/ljharb/qs/blob/main/CHANGELOG.md) - [Commits](https://github.com/ljharb/qs/compare/v6.5.3...v6.11.0) Updates `express` from 4.17.2 to 4.18.2 - [Release notes](https://github.com/expressjs/express/releases) - [Changelog](https://github.com/expressjs/express/blob/master/History.md) - [Commits](https://github.com/expressjs/express/compare/4.17.2...4.18.2) --- updated-dependencies: - dependency-name: qs dependency-type: indirect - dependency-name: express dependency-type: indirect ... Signed-off-by: dependabot[bot] <support@github.com> * Added genre and authors to Series level, added summary to volume and chapter level. Force order on reading list title as Chunky enforces their own sort order and doesn't respect the spec. * Moved all the reading list formatting logic to the backend. This allows us to re-use the UI logic for OPDS streams. * Fixed a broken unit test * Code smells Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
268 lines
9.7 KiB
C#
268 lines
9.7 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.DTOs.ReadingLists;
|
|
using API.Entities;
|
|
using API.Entities.Enums;
|
|
using API.Helpers;
|
|
using AutoMapper;
|
|
using AutoMapper.QueryableExtensions;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace API.Data.Repositories;
|
|
|
|
public interface IReadingListRepository
|
|
{
|
|
Task<PagedList<ReadingListDto>> GetReadingListDtosForUserAsync(int userId, bool includePromoted, UserParams userParams);
|
|
Task<ReadingList> GetReadingListByIdAsync(int readingListId);
|
|
Task<IEnumerable<ReadingListItemDto>> GetReadingListItemDtosByIdAsync(int readingListId, int userId);
|
|
Task<ReadingListDto> GetReadingListDtoByIdAsync(int readingListId, int userId);
|
|
Task<IEnumerable<ReadingListItemDto>> AddReadingProgressModifiers(int userId, IList<ReadingListItemDto> items);
|
|
Task<ReadingListDto> GetReadingListDtoByTitleAsync(int userId, string title);
|
|
Task<IEnumerable<ReadingListItem>> GetReadingListItemsByIdAsync(int readingListId);
|
|
Task<IEnumerable<ReadingListDto>> GetReadingListDtosForSeriesAndUserAsync(int userId, int seriesId,
|
|
bool includePromoted);
|
|
void Remove(ReadingListItem item);
|
|
void Add(ReadingList list);
|
|
void BulkRemove(IEnumerable<ReadingListItem> items);
|
|
void Update(ReadingList list);
|
|
Task<int> Count();
|
|
Task<string> GetCoverImageAsync(int readingListId);
|
|
Task<IList<string>> GetAllCoverImagesAsync();
|
|
Task<bool> ReadingListExists(string name);
|
|
}
|
|
|
|
public class ReadingListRepository : IReadingListRepository
|
|
{
|
|
private readonly DataContext _context;
|
|
private readonly IMapper _mapper;
|
|
|
|
public ReadingListRepository(DataContext context, IMapper mapper)
|
|
{
|
|
_context = context;
|
|
_mapper = mapper;
|
|
}
|
|
|
|
public void Update(ReadingList list)
|
|
{
|
|
_context.Entry(list).State = EntityState.Modified;
|
|
}
|
|
|
|
public void Add(ReadingList list)
|
|
{
|
|
_context.Add(list);
|
|
}
|
|
|
|
public async Task<int> Count()
|
|
{
|
|
return await _context.ReadingList.CountAsync();
|
|
}
|
|
|
|
public async Task<string> GetCoverImageAsync(int readingListId)
|
|
{
|
|
return await _context.ReadingList
|
|
.Where(c => c.Id == readingListId)
|
|
.Select(c => c.CoverImage)
|
|
.AsNoTracking()
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IList<string>> GetAllCoverImagesAsync()
|
|
{
|
|
return await _context.ReadingList
|
|
.Select(t => t.CoverImage)
|
|
.Where(t => !string.IsNullOrEmpty(t))
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<bool> ReadingListExists(string name)
|
|
{
|
|
var normalized = Services.Tasks.Scanner.Parser.Parser.Normalize(name);
|
|
return await _context.ReadingList
|
|
.AnyAsync(x => x.NormalizedTitle.Equals(normalized));
|
|
}
|
|
|
|
public void Remove(ReadingListItem item)
|
|
{
|
|
_context.ReadingListItem.Remove(item);
|
|
}
|
|
|
|
public void BulkRemove(IEnumerable<ReadingListItem> items)
|
|
{
|
|
_context.ReadingListItem.RemoveRange(items);
|
|
}
|
|
|
|
|
|
public async Task<PagedList<ReadingListDto>> GetReadingListDtosForUserAsync(int userId, bool includePromoted, UserParams userParams)
|
|
{
|
|
var userAgeRating = (await _context.AppUser.SingleAsync(u => u.Id == userId)).AgeRestriction;
|
|
var query = _context.ReadingList
|
|
.Where(l => l.AppUserId == userId || (includePromoted && l.Promoted ))
|
|
.Where(l => l.AgeRating >= userAgeRating)
|
|
.OrderBy(l => l.LastModified)
|
|
.ProjectTo<ReadingListDto>(_mapper.ConfigurationProvider)
|
|
.AsNoTracking();
|
|
|
|
return await PagedList<ReadingListDto>.CreateAsync(query, userParams.PageNumber, userParams.PageSize);
|
|
}
|
|
|
|
public async Task<IEnumerable<ReadingListDto>> GetReadingListDtosForSeriesAndUserAsync(int userId, int seriesId, bool includePromoted)
|
|
{
|
|
var query = _context.ReadingList
|
|
.Where(l => l.AppUserId == userId || (includePromoted && l.Promoted ))
|
|
.Where(l => l.Items.Any(i => i.SeriesId == seriesId))
|
|
.AsSplitQuery()
|
|
.OrderBy(l => l.Title)
|
|
.ProjectTo<ReadingListDto>(_mapper.ConfigurationProvider)
|
|
.AsNoTracking();
|
|
|
|
return await query.ToListAsync();
|
|
}
|
|
|
|
public async Task<ReadingList> GetReadingListByIdAsync(int readingListId)
|
|
{
|
|
return await _context.ReadingList
|
|
.Where(r => r.Id == readingListId)
|
|
.Include(r => r.Items.OrderBy(item => item.Order))
|
|
.AsSplitQuery()
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<ReadingListItemDto>> GetReadingListItemDtosByIdAsync(int readingListId, int userId)
|
|
{
|
|
var userLibraries = _context.Library
|
|
.Include(l => l.AppUsers)
|
|
.Where(library => library.AppUsers.Any(user => user.Id == userId))
|
|
.AsSplitQuery()
|
|
.AsNoTracking()
|
|
.Select(library => library.Id)
|
|
.ToList();
|
|
|
|
var items = await _context.ReadingListItem
|
|
.Where(s => s.ReadingListId == readingListId)
|
|
.Join(_context.Chapter, s => s.ChapterId, chapter => chapter.Id, (data, chapter) => new
|
|
{
|
|
TotalPages = chapter.Pages,
|
|
ChapterNumber = chapter.Range,
|
|
ReleaseDate = chapter.ReleaseDate,
|
|
ReadingListItem = data,
|
|
ChapterTitleName = chapter.TitleName,
|
|
|
|
})
|
|
.Join(_context.Volume, s => s.ReadingListItem.VolumeId, volume => volume.Id, (data, volume) => new
|
|
{
|
|
data.ReadingListItem,
|
|
data.TotalPages,
|
|
data.ChapterNumber,
|
|
data.ReleaseDate,
|
|
data.ChapterTitleName,
|
|
VolumeId = volume.Id,
|
|
VolumeNumber = volume.Name,
|
|
})
|
|
.Join(_context.Series, s => s.ReadingListItem.SeriesId, series => series.Id,
|
|
(data, s) => new
|
|
{
|
|
SeriesName = s.Name,
|
|
SeriesFormat = s.Format,
|
|
s.LibraryId,
|
|
data.ReadingListItem,
|
|
data.TotalPages,
|
|
data.ChapterNumber,
|
|
data.VolumeNumber,
|
|
data.VolumeId,
|
|
data.ReleaseDate,
|
|
data.ChapterTitleName,
|
|
LibraryType = _context.Library.Where(l => l.Id == s.LibraryId).Select(l => l.Type).Single()
|
|
})
|
|
.Select(data => new ReadingListItemDto()
|
|
{
|
|
Id = data.ReadingListItem.Id,
|
|
ChapterId = data.ReadingListItem.ChapterId,
|
|
Order = data.ReadingListItem.Order,
|
|
SeriesId = data.ReadingListItem.SeriesId,
|
|
SeriesName = data.SeriesName,
|
|
SeriesFormat = data.SeriesFormat,
|
|
PagesTotal = data.TotalPages,
|
|
ChapterNumber = data.ChapterNumber,
|
|
VolumeNumber = data.VolumeNumber,
|
|
LibraryId = data.LibraryId,
|
|
VolumeId = data.VolumeId,
|
|
ReadingListId = data.ReadingListItem.ReadingListId,
|
|
ReleaseDate = data.ReleaseDate,
|
|
LibraryType = data.LibraryType,
|
|
ChapterTitleName = data.ChapterTitleName
|
|
})
|
|
.Where(o => userLibraries.Contains(o.LibraryId))
|
|
.OrderBy(rli => rli.Order)
|
|
.AsSplitQuery()
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
|
|
foreach (var item in items)
|
|
{
|
|
item.Title = ReadingListHelper.FormatTitle(item);
|
|
}
|
|
|
|
// Attach progress information
|
|
var fetchedChapterIds = items.Select(i => i.ChapterId);
|
|
var progresses = await _context.AppUserProgresses
|
|
.Where(p => fetchedChapterIds.Contains(p.ChapterId))
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
|
|
foreach (var progress in progresses)
|
|
{
|
|
var progressItem = items.SingleOrDefault(i => i.ChapterId == progress.ChapterId && i.ReadingListId == readingListId);
|
|
if (progressItem == null) continue;
|
|
|
|
progressItem.PagesRead = progress.PagesRead;
|
|
}
|
|
|
|
return items;
|
|
}
|
|
|
|
public async Task<ReadingListDto> GetReadingListDtoByIdAsync(int readingListId, int userId)
|
|
{
|
|
return await _context.ReadingList
|
|
.Where(r => r.Id == readingListId && (r.AppUserId == userId || r.Promoted))
|
|
.ProjectTo<ReadingListDto>(_mapper.ConfigurationProvider)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<ReadingListItemDto>> AddReadingProgressModifiers(int userId, IList<ReadingListItemDto> items)
|
|
{
|
|
var chapterIds = items.Select(i => i.ChapterId).Distinct().ToList();
|
|
var userProgress = await _context.AppUserProgresses
|
|
.Where(p => p.AppUserId == userId && chapterIds.Contains(p.ChapterId))
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
|
|
foreach (var item in items)
|
|
{
|
|
var progress = userProgress.Where(p => p.ChapterId == item.ChapterId);
|
|
item.PagesRead = progress.Sum(p => p.PagesRead);
|
|
}
|
|
|
|
return items;
|
|
}
|
|
|
|
public async Task<ReadingListDto> GetReadingListDtoByTitleAsync(int userId, string title)
|
|
{
|
|
return await _context.ReadingList
|
|
.Where(r => r.Title.Equals(title) && r.AppUserId == userId)
|
|
.ProjectTo<ReadingListDto>(_mapper.ConfigurationProvider)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<ReadingListItem>> GetReadingListItemsByIdAsync(int readingListId)
|
|
{
|
|
return await _context.ReadingListItem
|
|
.Where(r => r.ReadingListId == readingListId)
|
|
.OrderBy(r => r.Order)
|
|
.ToListAsync();
|
|
}
|
|
|
|
|
|
}
|