mirror of
https://github.com/Kareadita/Kavita.git
synced 2025-06-23 07:20:32 -04:00
* Moved Collapse Series with relationships into a user preference rather than library setting. * Fixed bookmarks not converting to webp after initial save * Fixed a bug where when merging we'd print out a duplicate series error when we shouldn't have * Fixed a bug where clicking on a genre or tag from server stats wouldn't load all-series page in a filtered state. * Implemented the ability to have Login role and thus disable accounts. * Ensure first time flow gets the Login role * Refactored user management screen so that pending users can be edited or deleted before the end user accepts the invite. A side effect is old legacy users that were here before email was required can now be deleted. * Show a progress bar under the main series image on larger viewports to show whole series progress. * Removed code no longer needed * Cleanup tags, people, collections without connections after editing series metadata. * Moved the Entity Builders to the main project
366 lines
13 KiB
C#
366 lines
13 KiB
C#
using System;
|
|
using System.Collections.Generic;
|
|
using System.Linq;
|
|
using System.Threading.Tasks;
|
|
using API.Constants;
|
|
using API.DTOs;
|
|
using API.DTOs.Account;
|
|
using API.DTOs.Filtering;
|
|
using API.DTOs.Reader;
|
|
using API.Entities;
|
|
using API.Extensions;
|
|
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,
|
|
UserPreferences = 32,
|
|
WantToRead = 64,
|
|
ReadingListsWithItems = 128,
|
|
Devices = 256,
|
|
|
|
}
|
|
|
|
public interface IUserRepository
|
|
{
|
|
void Update(AppUser user);
|
|
void Update(AppUserPreferences preferences);
|
|
void Update(AppUserBookmark bookmark);
|
|
void Add(AppUserBookmark bookmark);
|
|
public void Delete(AppUser? user);
|
|
void Delete(AppUserBookmark bookmark);
|
|
Task<IEnumerable<MemberDto>> GetEmailConfirmedMemberDtosAsync(bool emailConfirmed = true);
|
|
Task<IEnumerable<AppUser>> GetAdminUsersAsync();
|
|
Task<bool> IsUserAdminAsync(AppUser? user);
|
|
Task<AppUserRating?> GetUserRatingAsync(int seriesId, int userId);
|
|
Task<AppUserPreferences?> GetPreferencesAsync(string username);
|
|
Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForSeries(int userId, int seriesId);
|
|
Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForVolume(int userId, int volumeId);
|
|
Task<IEnumerable<BookmarkDto>> GetBookmarkDtosForChapter(int userId, int chapterId);
|
|
Task<IEnumerable<BookmarkDto>> GetAllBookmarkDtos(int userId, FilterDto filter);
|
|
Task<IEnumerable<AppUserBookmark>> GetAllBookmarksAsync();
|
|
Task<AppUserBookmark?> GetBookmarkForPage(int page, int chapterId, int userId);
|
|
Task<AppUserBookmark?> GetBookmarkAsync(int bookmarkId);
|
|
Task<int> GetUserIdByApiKeyAsync(string apiKey);
|
|
Task<AppUser?> GetUserByUsernameAsync(string username, AppUserIncludes includeFlags = AppUserIncludes.None);
|
|
Task<AppUser?> GetUserByIdAsync(int userId, AppUserIncludes includeFlags = AppUserIncludes.None);
|
|
Task<int> GetUserIdByUsernameAsync(string username);
|
|
Task<IList<AppUserBookmark>> GetAllBookmarksByIds(IList<int> bookmarkIds);
|
|
Task<AppUser?> GetUserByEmailAsync(string email);
|
|
Task<IEnumerable<AppUserPreferences>> GetAllPreferencesByThemeAsync(int themeId);
|
|
Task<bool> HasAccessToLibrary(int libraryId, int userId);
|
|
Task<IEnumerable<AppUser>> GetAllUsersAsync(AppUserIncludes includeFlags = AppUserIncludes.None);
|
|
Task<AppUser?> GetUserByConfirmationToken(string token);
|
|
}
|
|
|
|
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 Add(AppUserBookmark bookmark)
|
|
{
|
|
_context.AppUserBookmark.Add(bookmark);
|
|
}
|
|
|
|
public void Delete(AppUser? user)
|
|
{
|
|
if (user == null) return;
|
|
_context.AppUser.Remove(user);
|
|
}
|
|
|
|
public void Delete(AppUserBookmark bookmark)
|
|
{
|
|
_context.AppUserBookmark.Remove(bookmark);
|
|
}
|
|
|
|
/// <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)
|
|
{
|
|
return await _context.Users
|
|
.Where(x => x.UserName == username)
|
|
.Includes(includeFlags)
|
|
.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)
|
|
{
|
|
return await _context.Users
|
|
.Where(x => x.Id == userId)
|
|
.Includes(includeFlags)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
public async Task<IEnumerable<AppUserBookmark>> GetAllBookmarksAsync()
|
|
{
|
|
return await _context.AppUserBookmark.ToListAsync();
|
|
}
|
|
|
|
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();
|
|
}
|
|
|
|
public async Task<AppUserBookmark?> GetBookmarkAsync(int bookmarkId)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(b => b.Id == bookmarkId)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
|
|
/// <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>
|
|
/// Returns all Bookmarks for a given set of Ids
|
|
/// </summary>
|
|
/// <param name="bookmarkIds"></param>
|
|
/// <returns></returns>
|
|
public async Task<IList<AppUserBookmark>> GetAllBookmarksByIds(IList<int> bookmarkIds)
|
|
{
|
|
return await _context.AppUserBookmark
|
|
.Where(b => bookmarkIds.Contains(b.Id))
|
|
.OrderBy(b => b.Created)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<AppUser?> GetUserByEmailAsync(string email)
|
|
{
|
|
var lowerEmail = email.ToLower();
|
|
return await _context.AppUser.SingleOrDefaultAsync(u => u.Email != null && u.Email.ToLower().Equals(lowerEmail));
|
|
}
|
|
|
|
|
|
public async Task<IEnumerable<AppUserPreferences>> GetAllPreferencesByThemeAsync(int themeId)
|
|
{
|
|
return await _context.AppUserPreferences
|
|
.Include(p => p.Theme)
|
|
.Where(p => p.Theme.Id == themeId)
|
|
.AsSplitQuery()
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<bool> HasAccessToLibrary(int libraryId, int userId)
|
|
{
|
|
return await _context.Library
|
|
.Include(l => l.AppUsers)
|
|
.AsSplitQuery()
|
|
.AnyAsync(library => library.AppUsers.Any(user => user.Id == userId));
|
|
}
|
|
|
|
public async Task<IEnumerable<AppUser>> GetAllUsersAsync(AppUserIncludes includeFlags = AppUserIncludes.None)
|
|
{
|
|
return await _context.AppUser
|
|
.Includes(includeFlags)
|
|
.ToListAsync();
|
|
}
|
|
|
|
public async Task<AppUser?> GetUserByConfirmationToken(string token)
|
|
{
|
|
return await _context.AppUser
|
|
.SingleOrDefaultAsync(u => u.ConfirmationToken != null && u.ConfirmationToken.Equals(token));
|
|
}
|
|
|
|
public async Task<IEnumerable<AppUser>> GetAdminUsersAsync()
|
|
{
|
|
return await _userManager.GetUsersInRoleAsync(PolicyConstants.AdminRole);
|
|
}
|
|
|
|
public async Task<bool> IsUserAdminAsync(AppUser? user)
|
|
{
|
|
if (user == null) return false;
|
|
return await _userManager.IsInRoleAsync(user, PolicyConstants.AdminRole);
|
|
}
|
|
|
|
public async Task<AppUserRating?> GetUserRatingAsync(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)
|
|
.Include(p => p.Theme)
|
|
.AsSplitQuery()
|
|
.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.Created)
|
|
.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.Created)
|
|
.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.Created)
|
|
.AsNoTracking()
|
|
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
}
|
|
|
|
/// <summary>
|
|
/// Get all bookmarks for the user
|
|
/// </summary>
|
|
/// <param name="userId"></param>
|
|
/// <param name="filter">Only supports SeriesNameQuery</param>
|
|
/// <returns></returns>
|
|
public async Task<IEnumerable<BookmarkDto>> GetAllBookmarkDtos(int userId, FilterDto filter)
|
|
{
|
|
var query = _context.AppUserBookmark
|
|
.Where(x => x.AppUserId == userId)
|
|
.OrderBy(x => x.Created)
|
|
.AsNoTracking();
|
|
|
|
if (string.IsNullOrEmpty(filter.SeriesNameQuery))
|
|
return await query
|
|
.ProjectTo<BookmarkDto>(_mapper.ConfigurationProvider)
|
|
.ToListAsync();
|
|
|
|
var seriesNameQueryNormalized = filter.SeriesNameQuery.ToNormalized();
|
|
var filterSeriesQuery = query.Join(_context.Series, b => b.SeriesId, s => s.Id, (bookmark, series) => new
|
|
{
|
|
bookmark,
|
|
series
|
|
})
|
|
.Where(o => (EF.Functions.Like(o.series.Name, $"%{filter.SeriesNameQuery}%"))
|
|
|| (o.series.OriginalName != null && EF.Functions.Like(o.series.OriginalName, $"%{filter.SeriesNameQuery}%"))
|
|
|| (o.series.LocalizedName != null && EF.Functions.Like(o.series.LocalizedName, $"%{filter.SeriesNameQuery}%"))
|
|
|| (EF.Functions.Like(o.series.NormalizedName, $"%{seriesNameQueryNormalized}%"))
|
|
);
|
|
|
|
query = filterSeriesQuery.Select(o => o.bookmark);
|
|
|
|
|
|
return await query
|
|
.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 != null && u.ApiKey.Equals(apiKey))
|
|
.Select(u => u.Id)
|
|
.SingleOrDefaultAsync();
|
|
}
|
|
|
|
|
|
public async Task<IEnumerable<MemberDto>> GetEmailConfirmedMemberDtosAsync(bool emailConfirmed = true)
|
|
{
|
|
return await _context.Users
|
|
.Where(u => (emailConfirmed && u.EmailConfirmed) || !emailConfirmed)
|
|
.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,
|
|
Email = u.Email,
|
|
Created = u.Created,
|
|
LastActive = u.LastActive,
|
|
Roles = u.UserRoles.Select(r => r.Role.Name).ToList(),
|
|
IsPending = !u.EmailConfirmed,
|
|
AgeRestriction = new AgeRestrictionDto()
|
|
{
|
|
AgeRating = u.AgeRestriction,
|
|
IncludeUnknowns = u.AgeRestrictionIncludeUnknowns
|
|
},
|
|
Libraries = u.Libraries.Select(l => new LibraryDto
|
|
{
|
|
Name = l.Name,
|
|
Type = l.Type,
|
|
LastScanned = l.LastScanned,
|
|
Folders = l.Folders.Select(x => x.Path).ToList()
|
|
}).ToList()
|
|
})
|
|
.AsSplitQuery()
|
|
.AsNoTracking()
|
|
.ToListAsync();
|
|
}
|
|
}
|