Skip to content

Commit 188de7d

Browse files
MilosMilos
authored andcommitted
Fix sort and remove abstract BaseFilterQuery
1 parent 61dacea commit 188de7d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

src/JsonApiDotNetCore/Extensions/IQueryableExtensions.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ public static IOrderedQueryable<TSource> Sort<TSource>(this IOrderedQueryable<TS
6868
$" Use Sort method with IJsonApiContext parameter instead.");
6969

7070
return sortQuery.Direction == SortDirection.Descending
71-
? source.OrderByDescending(sortQuery.SortedAttribute.InternalAttributeName)
72-
: source.OrderBy(sortQuery.SortedAttribute.InternalAttributeName);
71+
? source.ThenByDescending(sortQuery.SortedAttribute.InternalAttributeName)
72+
: source.ThenBy(sortQuery.SortedAttribute.InternalAttributeName);
7373
}
7474

7575
public static IQueryable<TSource> Sort<TSource>(this IQueryable<TSource> source, IJsonApiContext jsonApiContext, List<SortQuery> sortQueries)
@@ -120,8 +120,8 @@ public static IOrderedQueryable<TSource> Sort<TSource>(this IOrderedQueryable<TS
120120
attr = new AttrSortQuery(jsonApiContext, sortQuery);
121121

122122
return sortQuery.Direction == SortDirection.Descending
123-
? source.OrderByDescending(attr.GetPropertyPath())
124-
: source.OrderBy(attr.GetPropertyPath());
123+
? source.ThenByDescending(attr.GetPropertyPath())
124+
: source.ThenBy(attr.GetPropertyPath());
125125
}
126126

127127
public static IOrderedQueryable<TSource> OrderBy<TSource>(this IQueryable<TSource> source, string propertyName)

src/JsonApiDotNetCore/Internal/Query/BaseFilterQuery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
namespace JsonApiDotNetCore.Internal.Query
66
{
7-
public abstract class BaseFilterQuery : BaseAttrQuery
7+
public class BaseFilterQuery : BaseAttrQuery
88
{
99
public BaseFilterQuery(
1010
IJsonApiContext jsonApiContext,

0 commit comments

Comments
 (0)