mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Added the skeleton code for layout, hooked up Age Rating, Publication Status, and Tags * Tweaked message of Scan service to Finished scan of to better indicate the total scan time * Hooked in foundation for person typeaheads * Fixed people not populating typeaheads on load * For manga/comics, when parsing, set the SeriesSort from ComicInfo if it exists. * Implemented the ability to override and create new genre tags. Code is ready to flush out the rest. * Ability to update metadata from the UI is hooked up. Next is locking. * Updated typeahead to allow for non-multiple usage. Implemented ability to update Language tag in Series Metadata. * Fixed a bug in GetContinuePoint for a case where we have Volumes, Loose Leaf chapters and no read progress. * Added ETag headers on Images to allow for better caching (bookmarks and images in manga reader) * Built out UI code to show locked indication to user * Implemented Series locking and refactored a lot of styles in typeahead to make the lock setting work, plus misc cleanup. * Added locked properties to dtos. Updated typeahead loading indicator to not interfere with close button if present * Hooked up locking flags in UI * Integrated regular field locking/unlocking * Removed some old code * Prevent input group from wrapping * Implemented some basic layout for metadata on volume/chapter card modal. Refactored out all metadata from Chapter object in terms of UI and put into a separate call to ensure speedy delivery and simplicity of code. * Refactored code to hide covers section if not an admin * Implemented ability to modify a chapter/volume cover from the detail modal * Removed a few variables and change cover image modal * Added bookmark to single chapter view * Put a temp fix in for a ngb v12 z-index bug (reported). Bumped ngb to 12.0 stable and fixed some small rendering bugs * loading buttons ftw * Lots of cleanup, looks like the story is finished * Changed action name from Info to Details * Style tweaks * Fixed an issue where Summary would assume it's locked due to a subscription firing on setting the model * Fixed some misc bugs * Code smells Co-authored-by: Robbie Davis <robbie@therobbiedavis.com>
108 lines
3.8 KiB
C#
108 lines
3.8 KiB
C#
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Entities;
|
|
using API.Entities.Enums;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace API.Data.Repositories;
|
|
|
|
public interface IAppUserProgressRepository
|
|
{
|
|
void Update(AppUserProgress userProgress);
|
|
Task<int> CleanupAbandonedChapters();
|
|
Task<bool> UserHasProgress(LibraryType libraryType, int userId);
|
|
Task<AppUserProgress> GetUserProgressAsync(int chapterId, int userId);
|
|
Task<bool> HasAnyProgressOnSeriesAsync(int seriesId, int userId);
|
|
Task<IEnumerable<AppUserProgress>> GetUserProgressForSeriesAsync(int seriesId, int userId);
|
|
}
|
|
|
|
public class AppUserProgressRepository : IAppUserProgressRepository
|
|
{
|
|
private readonly DataContext _context;
|
|
|
|
public AppUserProgressRepository(DataContext context)
|
|
{
|
|
_context = context;
|
|
}
|
|
|
|
public void Update(AppUserProgress userProgress)
|
|
{
|
|
_context.Entry(userProgress).State = EntityState.Modified;
|
|
}
|
|
|
|
/// <summary>
|
|
/// This will remove any entries that have chapterIds that no longer exists. This will execute the save as well.
|
|
/// </summary>
|
|
public async Task<int> CleanupAbandonedChapters()
|
|
{
|
|
var chapterIds = _context.Chapter.Select(c => c.Id);
|
|
|
|
var rowsToRemove = await _context.AppUserProgresses
|
|
.Where(progress => !chapterIds.Contains(progress.ChapterId))
|
|
.ToListAsync();
|
|
|
|
var rowsToRemoveBookmarks = await _context.AppUserBookmark
|
|
.Where(progress => !chapterIds.Contains(progress.ChapterId))
|
|
.ToListAsync();
|
|
|
|
var rowsToRemoveReadingLists = await _context.ReadingListItem
|
|
.Where(item => !chapterIds.Contains(item.ChapterId))
|
|
.ToListAsync();
|
|
|
|
_context.RemoveRange(rowsToRemove);
|
|
_context.RemoveRange(rowsToRemoveBookmarks);
|
|
_context.RemoveRange(rowsToRemoveReadingLists);
|
|
return await _context.SaveChangesAsync() > 0 ? rowsToRemove.Count : 0;
|
|
}
|
|
|
|
/// <summary>
|
|
/// Checks if user has any progress against a library of passed type
|
|
/// </summary>
|
|
/// <param name="libraryType"></param>
|
|
/// <param name="userId"></param>
|
|
/// <returns></returns>
|
|
public async Task<bool> UserHasProgress(LibraryType libraryType, int userId)
|
|
{
|
|
var seriesIds = await _context.AppUserProgresses
|
|
.Where(aup => aup.PagesRead > 0 && aup.AppUserId == userId)
|
|
.AsNoTracking()
|
|
.Select(aup => aup.SeriesId)
|
|
.ToListAsync();
|
|
|
|
if (seriesIds.Count == 0) return false;
|
|
|
|
return await _context.Series
|
|
.Include(s => s.Library)
|
|
.Where(s => seriesIds.Contains(s.Id) && s.Library.Type == libraryType)
|
|
.AsNoTracking()
|
|
.AnyAsync();
|
|
}
|
|
|
|
public async Task<bool> HasAnyProgressOnSeriesAsync(int seriesId, int userId)
|
|
{
|
|
return await _context.AppUserProgresses
|
|
.AnyAsync(aup => aup.PagesRead > 0 && aup.AppUserId == userId && aup.SeriesId == seriesId);
|
|
}
|
|
|
|
/// <summary>
|
|
/// This will return any user progress. This filters out progress rows that have no pages read.
|
|
/// </summary>
|
|
/// <param name="seriesId"></param>
|
|
/// <param name="userId"></param>
|
|
/// <returns></returns>
|
|
public async Task<IEnumerable<AppUserProgress>> GetUserProgressForSeriesAsync(int seriesId, int userId)
|
|
{
|
|
return await _context.AppUserProgresses
|
|
.Where(p => p.SeriesId == seriesId && p.AppUserId == userId && p.PagesRead > 0)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<AppUserProgress> GetUserProgressAsync(int chapterId, int userId)
|
|
{
|
|
return await _context.AppUserProgresses
|
|
.Where(p => p.ChapterId == chapterId && p.AppUserId == userId)
|
|
.FirstOrDefaultAsync();
|
|
}
|
|
}
|