mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Refactored all files to have Interfaces within the same file. Started moving over to file-scoped namespaces. * Refactored common methods for getting underlying file's cover, pages, and extracting into 1 interface. * More refactoring around removing dependence on explicit filetype testing for getting information. * Code is buildable, tests are broken. Huge refactor (not completed) which makes most of DirectoryService testable with a mock filesystem (and thus the services that utilize it). * Finished porting DirectoryService to use mocked filesystem implementation. * Added a null check * Added a null check * Finished all unit tests for DirectoryService. * Some misc cleanup on the code * Fixed up some bugs from refactoring scan loop. * Implemented CleanupService testing and refactored more of DirectoryService to be non-static. Fixed a bug where cover file cleanup wasn't properly finding files due to a regex bug. * Fixed an issue in CleanupBackup() where we weren't properly selecting database files older than 30 days. Finished CleanupService Tests. * Refactored Flatten and RemoveNonImages to directory service to allow CacheService to be testable. * Finally have CacheService tested. Rewrote GetCachedPagePath() to be much more straightforward & performant. * Updated DefaultParserTests.cs to contain all existing tests and follow new test layout format. * All tests fixed up
86 lines
2.8 KiB
C#
86 lines
2.8 KiB
C#
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);
|
|
}
|
|
|
|
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<AppUserProgress> GetUserProgressAsync(int chapterId, int userId)
|
|
{
|
|
return await _context.AppUserProgresses
|
|
.Where(p => p.ChapterId == chapterId && p.AppUserId == userId)
|
|
.FirstOrDefaultAsync();
|
|
}
|
|
}
|