mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-03 21:54:47 -04:00
* Refactored the design of reading list page to follow more in line with list view. Added release date on the reading list items, if it's set in underlying chapter. Fixed a bug where reordering the list items could sometimes not update correctly with drag and drop. * Removed a bug marker that I just fixed * When generating library covers, make them much smaller as they are only ever icons. * Fixed library settings not showing the correct image. * Fixed a bug where duplicate collection tags could be created. Fixed a bug where collection tag normalized title was being set to uppercase. Redesigned the edit collection tag modal to align with new library settings and provide inline name checks. * Updated edit reading list modal to align with new library settings modal pattern. Refactored the backend to ensure it flows correctly without allowing duplicate names. Don't show Continue point on series detail if the whole series is read. * Added some more unit tests around continue point * Fixed a bug on series detail when bulk selecting between volume and chapters, the code which determines which chapters are selected didn't take into account mixed layout for Storyline tab. * Refactored to generate an OpenAPI spec at root of Kavita. This will be loaded by a new API site for easy hosting. Deprecated EnableSwaggerUi preference as after validation new system works, this will be removed and instances can use our hosting to hit their server (or run a debug build). * Test GA * Reverted GA and instead do it in the build step. This will just force developers to commit it in. * GA please work * Removed redundant steps from test since build already does it. * Try another GA * Moved all test actions into initial build step, which should drastically cut down on time. Only run sonar if the secret is present (so not for forks). Updated build requirements for develop and stable docker pushes. * Fixed env variable * Okay not possible to do secrets in if statement * Fixed the build step to output the openapi.json where it's expected.
255 lines
9.2 KiB
C#
255 lines
9.2 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.DTOs.ReadingLists;
|
|
using API.Entities;
|
|
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
|
|
})
|
|
.Join(_context.Volume, s => s.readingListItem.VolumeId, volume => volume.Id, (data, volume) => new
|
|
{
|
|
data.readingListItem,
|
|
data.TotalPages,
|
|
data.ChapterNumber,
|
|
data.ReleaseDate,
|
|
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,
|
|
})
|
|
.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
|
|
})
|
|
.Where(o => userLibraries.Contains(o.LibraryId))
|
|
.OrderBy(rli => rli.Order)
|
|
.AsSplitQuery()
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
|
|
// 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();
|
|
}
|
|
|
|
|
|
}
|