Fix: branche conficts in DefaultEntityRepository

Author: milosloub

src/JsonApiDotNetCore/Data/DefaultEntityRepository.cs

@@ -90,10 +90,10 @@ public virtual IQueryable<TEntity> Get()
         /// <inheritdoc />
         public virtual IQueryable<TEntity> Filter(IQueryable<TEntity> entities, FilterQuery filterQuery)
         {
-            if(_resourceDefinition != null) 
+            if (_resourceDefinition != null)
             {
                 var defaultQueryFilters = _resourceDefinition.GetQueryFilters();
-                if(defaultQueryFilters != null && defaultQueryFilters.TryGetValue(filterQuery.Attribute, out var defaultQueryFilter) == true)
+                if (defaultQueryFilters != null && defaultQueryFilters.TryGetValue(filterQuery.Attribute, out var defaultQueryFilter) == true)
                 {
                     return defaultQueryFilter(entities, filterQuery.Value);
                 }
@@ -106,15 +106,15 @@ public virtual IQueryable<TEntity> Filter(IQueryable<TEntity> entities, FilterQu
         public virtual IQueryable<TEntity> Sort(IQueryable<TEntity> entities, List<SortQuery> sortQueries)
         {
             if (sortQueries != null && sortQueries.Count > 0)
-                return entities.Sort(sortQueries);
-            
-            if(_resourceDefinition != null) 
+                return entities.Sort(_jsonApiContext, sortQueries);
+
+            if (_resourceDefinition != null)
             {
                 var defaultSortOrder = _resourceDefinition.DefaultSort();
-                if(defaultSortOrder != null && defaultSortOrder.Count > 0)
+                if (defaultSortOrder != null && defaultSortOrder.Count > 0)
                 {
-                    foreach(var sortProp in defaultSortOrder)
-                    { 
+                    foreach (var sortProp in defaultSortOrder)
+                    {
                         // this is dumb...add an overload, don't allocate for no reason
                         entities.Sort(new SortQuery(sortProp.Item2, sortProp.Item1));
                     }
@@ -189,10 +189,10 @@ private void AttachHasManyPointers(TEntity entity)
             var relationships = _jsonApiContext.HasManyRelationshipPointers.Get();
             foreach (var relationship in relationships)
             {
-                if(relationship.Key is HasManyThroughAttribute hasManyThrough)
+                if (relationship.Key is HasManyThroughAttribute hasManyThrough)
                     AttachHasManyThrough(entity, hasManyThrough, relationship.Value);
                 else
-                    AttachHasMany(relationship.Key as HasManyAttribute, relationship.Value);                
+                    AttachHasMany(relationship.Key as HasManyAttribute, relationship.Value);
             }
         }
 
@@ -289,15 +289,15 @@ public virtual async Task<bool> DeleteAsync(TId id)
         /// <inheritdoc />
         public virtual IQueryable<TEntity> Include(IQueryable<TEntity> entities, string relationshipName)
         {
-            if(string.IsNullOrWhiteSpace(relationshipName)) throw new JsonApiException(400, "Include parameter must not be empty if provided");
+            if (string.IsNullOrWhiteSpace(relationshipName)) throw new JsonApiException(400, "Include parameter must not be empty if provided");
 
             var relationshipChain = relationshipName.Split('.');
 
             // variables mutated in recursive loop
             // TODO: make recursive method
             string internalRelationshipPath = null;
             var entity = _jsonApiContext.RequestEntity;
-            for(var i = 0; i < relationshipChain.Length; i++)
+            for (var i = 0; i < relationshipChain.Length; i++)
             {
                 var requestedRelationship = relationshipChain[i];
                 var relationship = entity.Relationships.FirstOrDefault(r => r.PublicRelationshipName == requestedRelationship);
@@ -315,8 +315,8 @@ public virtual IQueryable<TEntity> Include(IQueryable<TEntity> entities, string
                 internalRelationshipPath = (internalRelationshipPath == null)
                     ? relationship.RelationshipPath
                     : $"{internalRelationshipPath}.{relationship.RelationshipPath}";
-                
-                if(i < relationshipChain.Length)
+
+                if (i < relationshipChain.Length)
                     entity = _jsonApiContext.ContextGraph.GetContextEntity(relationship.Type);
             }