Backup_Repos/Readarr
1
0
Fork 0
mirror of https://github.com/Readarr/Readarr synced 2025-12-10 02:15:16 +01:00
Code Issues Projects Releases Wiki Activity

Fixed: Frontend error sorting book index by status

Browse source 
Fixes #1426
This commit is contained in:
ta264 2021-12-23 21:41:43 +00:00
parent 29c7404185
commit 6d8adec7dc
2 changed files with 6 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frontend/src/Store/Actions/bookActions.js
View file

@ -160,7 +160,7 @@ export const sortPredicates = {
status: function(item) {
let result = 0;
const hasBookFile = !!item.statistics.bookFileCount;
const hasBookFile = !!item.statistics?.bookFileCount;
const isAvailable = Date.parse(item.releaseDate) < new Date();
if (isAvailable) {

19
src/NzbDrone.Core/AuthorStats/AuthorStatisticsRepository.cs
View file

@ -27,22 +27,12 @@ public AuthorStatisticsRepository(IMainDatabase database)
public List<BookStatistics> AuthorStatistics()
{
var time = DateTime.UtcNow;
#pragma warning disable CS0472
return Query(Builder().OrWhere<Book>(x => x.ReleaseDate < time)
.OrWhere<BookFile>(x => x.Id != null));
#pragma warning restore
return Query(Builder());
}
public List<BookStatistics> AuthorStatistics(int authorId)
{
var time = DateTime.UtcNow;
#pragma warning disable CS0472
return Query(Builder().OrWhere<Book>(x => x.ReleaseDate < time)
.OrWhere<BookFile>(x => x.Id != null)
.Where<Author>(x => x.Id == authorId));
#pragma warning restore
return Query(Builder().Where<Author>(x => x.Id == authorId));
}
private List<BookStatistics> Query(SqlBuilder builder)
@ -61,13 +51,14 @@ private List<BookStatistics> Query(SqlBuilder builder)
SUM(COALESCE(BookFiles.Size, 0)) AS SizeOnDisk,
1 AS TotalBookCount,
CASE WHEN BookFiles.Id IS NULL THEN 0 ELSE 1 END AS AvailableBookCount,
CASE WHEN Books.Monitored = 1 OR BookFiles.Id IS NOT NULL THEN 1 ELSE 0 END AS BookCount,
CASE WHEN (Books.Monitored = 1 AND (Books.ReleaseDate < @currentDate) OR Books.ReleaseDate IS NULL) OR BookFiles.Id IS NOT NULL THEN 1 ELSE 0 END AS BookCount,
CASE WHEN BookFiles.Id IS NULL THEN 0 ELSE COUNT(BookFiles.Id) END AS BookFileCount")
.Join<Edition, Book>((e, b) => e.BookId == b.Id)
.Join<Book, Author>((book, author) => book.AuthorMetadataId == author.AuthorMetadataId)
.LeftJoin<Edition, BookFile>((t, f) => t.Id == f.EditionId)
.Where<Edition>(x => x.Monitored == true)
.GroupBy<Author>(x => x.Id)
.GroupBy<Book>(x => x.Id);
.GroupBy<Book>(x => x.Id)
.AddParameters(new Dictionary<string, object> { { "currentDate", DateTime.UtcNow } });
}
}