mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-05-24 00:52:23 -04:00
* Fixed an issue from perf tuning where I forgot to send Pages to frontend, breaking reader. * Built out continuous reading for webtoon reader. Still has some issues with triggering. * Refactored GetUserByUsernameAsync to have a new flavor and allow the caller to pass in bitwise flags for what to include. This has a get by username or id variant. Code is much cleaner and snappier as we avoid many extra joins when not needed. * Cleanup old code from UserRepository.cs * Refactored OPDS to use faster API lookups for User * Refactored more code to be cleaner and faster. * Refactored GetNext/Prev ChapterIds to ReaderService. * Refactored Repository methods to their correct entity repos. * Refactored DTOs and overall cleanup of the code. * Added ability to press 'b' to bookmark a page * On hitting last page, save progress forcing last page to be read. Adjusted logic for the top and bottom spacers for triggering next/prev chapter load * When at top or moving between chapters, scrolling down then up will now trigger page load. Show a toastr to inform the user of a change in chapter (it can be really fast to switch) * Cleaned up scroll code * Fixed an issue where loading a chapter with last page bookmarked, we'd load lastpage - 1 * Fixed last page of webtoon reader not being resumed on loading said chapter due to a difference in how max page is handled between infinite scroller and manga reader. * Removed some comments * Book reader shouldn't look at left/right tap to paginate elems for position bookmarking. Missed a few areas for saving while in incognito mode * Added a benchmark to test out a sort code * Updated the read status on reading list to use same style as other places * Refactored GetNextChapterId to bring the average response time from 1.2 seconds to 400ms. * Added a filter to add to list when there are more than 5 reading lists * Added download reading list (will be removed, just saving for later). Fixes around styling on reading lists * Removed ability to download reading lists * Tweaked the logic for infinite scroller to be much smoother loading next/prev chapter. Added a bug marker for a concurrency bug. * Updated the top spacer so that when you hit the top, you stay at the page height and can now just scroll up. * Got the logic for scrolling up. Now just need the CSS then cont infinite scroller will be working * More polishing on infinite scroller * Removed IsSpecial on volumeDto, which is not used anywhere. * Cont Reading inf scroller edition is done. * Code smells and fixed package.json explore script
250 lines
8.6 KiB
C#
250 lines
8.6 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Constants;
|
|
using API.DTOs;
|
|
using API.DTOs.Reader;
|
|
using API.Entities;
|
|
using API.Interfaces.Repositories;
|
|
using AutoMapper;
|
|
using AutoMapper.QueryableExtensions;
|
|
using Microsoft.AspNetCore.Identity;
|
|
using Microsoft.EntityFrameworkCore;
|
|
|
|
namespace API.Data.Repositories
|
|
{
|
|
[Flags]
|
|
public enum AppUserIncludes
|
|
{
|
|
None = 1,
|
|
Progress = 2,
|
|
Bookmarks = 4,
|
|
ReadingLists = 8,
|
|
Ratings = 16
|
|
}
|
|
|
|
public class UserRepository : IUserRepository
|
|
{
|
|
private readonly DataContext _context;
|
|
private readonly UserManager<AppUser> _userManager;
|
|
private readonly IMapper _mapper;
|
|
|
|
public UserRepository(DataContext context, UserManager<AppUser> userManager, IMapper mapper)
|
|
{
|
|
_context = context;
|
|
_userManager = userManager;
|
|
_mapper = mapper;
|
|
}
|
|
|
|
public void Update(AppUser user)
|
|
{
|
|
_context.Entry(user).State = EntityState.Modified;
|
|
}
|
|
|
|
public void Update(AppUserPreferences preferences)
|
|
{
|
|
_context.Entry(preferences).State = EntityState.Modified;
|
|
}
|
|
|
|
public void Update(AppUserBookmark bookmark)
|
|
{
|
|
_context.Entry(bookmark).State = EntityState.Modified;
|
|
}
|
|
|
|
public void Delete(AppUser user)
|
|
{
|
|
_context.AppUser.Remove(user);
|
|
}
|
|
|
|
/// <summary>
|
|
/// A one stop shop to get a tracked AppUser instance with any number of JOINs generated by passing bitwise flags.
|
|
/// </summary>
|
|
/// <param name="username"></param>
|
|
/// <param name="includeFlags">Includes() you want. Pass multiple with flag1 | flag2 </param>
|
|
/// <returns></returns>
|
|
public async Task<AppUser> GetUserByUsernameAsync(string username, AppUserIncludes includeFlags = AppUserIncludes.None)
|
|
{
|
|
var query = _context.Users
|
|
.Where(x => x.UserName == username);
|
|
|
|
query = AddIncludesToQuery(query, includeFlags);
|
|
|
|
return await query.SingleOrDefaultAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// A one stop shop to get a tracked AppUser instance with any number of JOINs generated by passing bitwise flags.
|
|
/// </summary>
|
|
/// <param name="userId"></param>
|
|
/// <param name="includeFlags">Includes() you want. Pass multiple with flag1 | flag2 </param>
|
|
/// <returns></returns>
|
|
public async Task<AppUser> GetUserByIdAsync(int userId, AppUserIncludes includeFlags = AppUserIncludes.None)
|
|
{
|
|
var query = _context.Users
|
|
.Where(x => x.Id == userId);
|
|
|
|
query = AddIncludesToQuery(query, includeFlags);
|
|
|
|
return await query.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<AppUserBookmark> GetBookmarkForPage(int page, int chapterId, int userId)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(b => b.Page == page && b.ChapterId == chapterId && b.AppUserId == userId)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
private static IQueryable<AppUser> AddIncludesToQuery(IQueryable<AppUser> query, AppUserIncludes includeFlags)
|
|
{
|
|
if (includeFlags.HasFlag(AppUserIncludes.Bookmarks))
|
|
{
|
|
query = query.Include(u => u.Bookmarks);
|
|
}
|
|
|
|
if (includeFlags.HasFlag(AppUserIncludes.Progress))
|
|
{
|
|
query = query.Include(u => u.Progresses);
|
|
}
|
|
|
|
if (includeFlags.HasFlag(AppUserIncludes.ReadingLists))
|
|
{
|
|
query = query.Include(u => u.ReadingLists);
|
|
}
|
|
|
|
if (includeFlags.HasFlag(AppUserIncludes.Ratings))
|
|
{
|
|
query = query.Include(u => u.Ratings);
|
|
}
|
|
|
|
return query;
|
|
}
|
|
|
|
|
|
/// <summary>
|
|
/// This fetches the Id for a user. Use whenever you just need an ID.
|
|
/// </summary>
|
|
/// <param name="username"></param>
|
|
/// <returns></returns>
|
|
public async Task<int> GetUserIdByUsernameAsync(string username)
|
|
{
|
|
return await _context.Users
|
|
.Where(x => x.UserName == username)
|
|
.Select(u => u.Id)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Gets an AppUser by username. Returns back Reading List and their Items.
|
|
/// </summary>
|
|
/// <param name="username"></param>
|
|
/// <returns></returns>
|
|
public async Task<AppUser> GetUserWithReadingListsByUsernameAsync(string username)
|
|
{
|
|
return await _context.Users
|
|
.Include(u => u.ReadingLists)
|
|
.ThenInclude(l => l.Items)
|
|
.SingleOrDefaultAsync(x => x.UserName == username);
|
|
}
|
|
|
|
public async Task<IEnumerable<AppUser>> GetAdminUsersAsync()
|
|
{
|
|
return await _userManager.GetUsersInRoleAsync(PolicyConstants.AdminRole);
|
|
}
|
|
|
|
public async Task<AppUserRating> GetUserRating(int seriesId, int userId)
|
|
{
|
|
return await _context.AppUserRating.Where(r => r.SeriesId == seriesId && r.AppUserId == userId)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<AppUserPreferences> GetPreferencesAsync(string username)
|
|
{
|
|
return await _context.AppUserPreferences
|
|
.Include(p => p.AppUser)
|
|
.SingleOrDefaultAsync(p => p.AppUser.UserName == username);
|
|
}
|
|
|
|
public async Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForSeries(int userId, int seriesId)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(x => x.AppUserId == userId && x.SeriesId == seriesId)
|
|
.OrderBy(x => x.Page)
|
|
.AsNoTracking()
|
|
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForVolume(int userId, int volumeId)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(x => x.AppUserId == userId && x.VolumeId == volumeId)
|
|
.OrderBy(x => x.Page)
|
|
.AsNoTracking()
|
|
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForChapter(int userId, int chapterId)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(x => x.AppUserId == userId && x.ChapterId == chapterId)
|
|
.OrderBy(x => x.Page)
|
|
.AsNoTracking()
|
|
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<BookmarkDto>> GetAllBookmarkDtos(int userId)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(x => x.AppUserId == userId)
|
|
.OrderBy(x => x.Page)
|
|
.AsNoTracking()
|
|
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Fetches the UserId by API Key. This does not include any extra information
|
|
/// </summary>
|
|
/// <param name="apiKey"></param>
|
|
/// <returns></returns>
|
|
public async Task<int> GetUserIdByApiKeyAsync(string apiKey)
|
|
{
|
|
return await _context.AppUser
|
|
.Where(u => u.ApiKey.Equals(apiKey))
|
|
.Select(u => u.Id)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
|
|
public async Task<IEnumerable<MemberDto>> GetMembersAsync()
|
|
{
|
|
return await _context.Users
|
|
.Include(x => x.Libraries)
|
|
.Include(r => r.UserRoles)
|
|
.ThenInclude(r => r.Role)
|
|
.OrderBy(u => u.UserName)
|
|
.Select(u => new MemberDto
|
|
{
|
|
Id = u.Id,
|
|
Username = u.UserName,
|
|
Created = u.Created,
|
|
LastActive = u.LastActive,
|
|
Roles = u.UserRoles.Select(r => r.Role.Name).ToList(),
|
|
Libraries = u.Libraries.Select(l => new LibraryDto
|
|
{
|
|
Name = l.Name,
|
|
CoverImage = l.CoverImage,
|
|
Type = l.Type,
|
|
Folders = l.Folders.Select(x => x.Path).ToList()
|
|
}).ToList()
|
|
})
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
}
|
|
}
|
|
}
|