mirror of
https://github.com/jellyfin/jellyfin.git
synced 2025-12-24 01:34:45 +03:00
fixes #14952 apply sort on ItemValue query
This commit is contained in:
@@ -1232,8 +1232,21 @@ public sealed class BaseItemRepository
|
|||||||
ExcludeItemIds = filter.ExcludeItemIds
|
ExcludeItemIds = filter.ExcludeItemIds
|
||||||
};
|
};
|
||||||
|
|
||||||
var query = TranslateQuery(innerQuery, context, outerQueryFilter)
|
var masterQuery = TranslateQuery(innerQuery, context, outerQueryFilter)
|
||||||
.GroupBy(e => e.PresentationUniqueKey);
|
.GroupBy(e => e.PresentationUniqueKey)
|
||||||
|
.Select(e => e.FirstOrDefault())
|
||||||
|
.Select(e => e!.Id);
|
||||||
|
|
||||||
|
var query = context.BaseItems
|
||||||
|
.AsQueryable()
|
||||||
|
.Include(e => e.TrailerTypes)
|
||||||
|
.Include(e => e.Provider)
|
||||||
|
.Include(e => e.LockedFields)
|
||||||
|
.Include(e => e.Images)
|
||||||
|
.AsSingleQuery()
|
||||||
|
.Where(e => masterQuery.Contains(e.Id));
|
||||||
|
|
||||||
|
ApplyOrder(query, filter);
|
||||||
|
|
||||||
var result = new QueryResult<(BaseItemDto, ItemCounts?)>();
|
var result = new QueryResult<(BaseItemDto, ItemCounts?)>();
|
||||||
if (filter.EnableTotalRecordCount)
|
if (filter.EnableTotalRecordCount)
|
||||||
@@ -1288,12 +1301,7 @@ public sealed class BaseItemRepository
|
|||||||
|
|
||||||
var resultQuery = query.Select(e => new
|
var resultQuery = query.Select(e => new
|
||||||
{
|
{
|
||||||
item = e.AsQueryable()
|
item = e,
|
||||||
.Include(e => e.TrailerTypes)
|
|
||||||
.Include(e => e.Provider)
|
|
||||||
.Include(e => e.LockedFields)
|
|
||||||
.Include(e => e.Images)
|
|
||||||
.AsSingleQuery().First(),
|
|
||||||
// TODO: This is bad refactor!
|
// TODO: This is bad refactor!
|
||||||
itemCount = new ItemCounts()
|
itemCount = new ItemCounts()
|
||||||
{
|
{
|
||||||
@@ -1325,13 +1333,6 @@ public sealed class BaseItemRepository
|
|||||||
result.Items =
|
result.Items =
|
||||||
[
|
[
|
||||||
.. query
|
.. query
|
||||||
.Select(e => e.AsQueryable()
|
|
||||||
.Include(e => e.TrailerTypes)
|
|
||||||
.Include(e => e.Provider)
|
|
||||||
.Include(e => e.LockedFields)
|
|
||||||
.Include(e => e.Images)
|
|
||||||
.AsSingleQuery()
|
|
||||||
.First())
|
|
||||||
.AsEnumerable()
|
.AsEnumerable()
|
||||||
.Where(e => e is not null)
|
.Where(e => e is not null)
|
||||||
.Select<BaseItemEntity, (BaseItemDto, ItemCounts?)>(e =>
|
.Select<BaseItemEntity, (BaseItemDto, ItemCounts?)>(e =>
|
||||||
|
|||||||
Reference in New Issue
Block a user