AttrQuery and RelatedAttrQuery constructor overload.

Author: Milos

src/JsonApiDotNetCore/Extensions/IQueryableExtensions.cs

@@ -49,14 +49,14 @@ public static IOrderedQueryable<TSource> Sort<TSource>(this IQueryable<TSource>
         {
             if (sortQuery.IsAttributeOfRelationship)
             {
-                var relatedAttrQuery = new RelatedAttrSortQuery(jsonApiContext, sortQuery);
+                var relatedAttrQuery = new RelatedAttrQuery(jsonApiContext, sortQuery);
                 return sortQuery.Direction == SortDirection.Descending
                     ? source.OrderByDescending(relatedAttrQuery)
                     : source.OrderBy(relatedAttrQuery);
             }
             else
             {
-                var attrQuery = new AttrSortQuery(jsonApiContext, sortQuery);
+                var attrQuery = new AttrQuery(jsonApiContext, sortQuery);
                 return sortQuery.Direction == SortDirection.Descending
                     ? source.OrderByDescending(attrQuery)
                     : source.OrderBy(attrQuery);
@@ -67,14 +67,14 @@ public static IOrderedQueryable<TSource> Sort<TSource>(this IOrderedQueryable<TS
         {
             if (sortQuery.IsAttributeOfRelationship)
             {
-                var relatedAttrQuery = new RelatedAttrSortQuery(jsonApiContext, sortQuery);
+                var relatedAttrQuery = new RelatedAttrQuery(jsonApiContext, sortQuery);
                 return sortQuery.Direction == SortDirection.Descending
                     ? source.OrderByDescending(relatedAttrQuery)
                     : source.OrderBy(relatedAttrQuery);
             }
             else
             {
-                var attrQuery = new AttrSortQuery(jsonApiContext, sortQuery);
+                var attrQuery = new AttrQuery(jsonApiContext, sortQuery);
                 return sortQuery.Direction == SortDirection.Descending
                     ? source.OrderByDescending(attrQuery)
                     : source.OrderBy(attrQuery);
@@ -152,12 +152,12 @@ public static IQueryable<TSource> Filter<TSource>(this IQueryable<TSource> sourc
                 return source;
 
             if (filterQuery.IsAttributeOfRelationship)
-                return source.Filter(new RelatedAttrFilterQuery(jsonApiContext, filterQuery));
+                return source.Filter(new RelatedAttrQuery(jsonApiContext, filterQuery));
 
-            return source.Filter(new AttrFilterQuery(jsonApiContext, filterQuery));
+            return source.Filter(new AttrQuery(jsonApiContext, filterQuery));
         }
 
-        public static IQueryable<TSource> Filter<TSource>(this IQueryable<TSource> source, AttrFilterQuery filterQuery)
+        public static IQueryable<TSource> Filter<TSource>(this IQueryable<TSource> source, AttrQuery filterQuery)
         {
             if (filterQuery == null)
                 return source;
@@ -214,7 +214,7 @@ public static IQueryable<TSource> Filter<TSource>(this IQueryable<TSource> sourc
             }
         }
 
-        public static IQueryable<TSource> Filter<TSource>(this IQueryable<TSource> source, RelatedAttrFilterQuery filterQuery)
+        public static IQueryable<TSource> Filter<TSource>(this IQueryable<TSource> source, RelatedAttrQuery filterQuery)
         {
             if (filterQuery == null)
                 return source;

src/JsonApiDotNetCore/Internal/Query/AttrFilterQuery.cs

@@ -8,14 +8,46 @@ namespace JsonApiDotNetCore.Internal.Query
     public class AttrQuery
     {
         private readonly IJsonApiContext _jsonApiContext;
+        public AttrAttribute Attribute { get; }
+
+        // Filter properties
+        public string PropertyValue { get; }
+        public FilterOperations FilterOperation { get; }
+        // Sort properties
+        public SortDirection Direction { get; set; }
 
-        public AttrQuery(IJsonApiContext jsonApiContext, QueryAttribute query)
+        /// <summary>
+        /// Build AttrQuery base on FilterQuery values.
+        /// </summary>
+        /// <param name="jsonApiContext"></param>
+        /// <param name="query"></param>
+        public AttrQuery(IJsonApiContext jsonApiContext, FilterQuery query)
         {
             _jsonApiContext = jsonApiContext;
             Attribute = GetAttribute(query.Attribute);
+
+            if (Attribute.IsFilterable == false)
+                throw new JsonApiException(400, $"Filter is not allowed for attribute '{Attribute.PublicAttributeName}'.");
+
+            PropertyValue = query.Value;
+            FilterOperation = query.OperationType;
         }
 
-        public AttrAttribute Attribute { get; }
+        /// <summary>
+        /// Build AttrQuery base on SortQuery values.
+        /// </summary>
+        /// <param name="jsonApiContext"></param>
+        /// <param name="query"></param>
+        public AttrQuery(IJsonApiContext jsonApiContext, SortQuery sortQuery)
+        {
+            _jsonApiContext = jsonApiContext;
+            Attribute = GetAttribute(sortQuery.Attribute);
+
+            if (Attribute.IsSortable == false)
+                throw new JsonApiException(400, $"Sort is not allowed for attribute '{Attribute.PublicAttributeName}'.");
+
+            Direction = sortQuery.Direction;
+        }
 
         private AttrAttribute GetAttribute(string attribute)
         {

src/JsonApiDotNetCore/Internal/Query/AttrQuery.cs

@@ -8,17 +8,40 @@ namespace JsonApiDotNetCore.Internal.Query
     public class RelatedAttrQuery
     {
         private readonly IJsonApiContext _jsonApiContext;
+        public AttrAttribute Attribute { get; }
+        public RelationshipAttribute RelationshipAttribute { get; }
+
+        // Filter properties
+        public string PropertyValue { get; }
+        public FilterOperations FilterOperation { get; }
+        // Sort properties
+        public SortDirection Direction { get; set; }
 
-        public RelatedAttrQuery(IJsonApiContext jsonApiContext, QueryAttribute query)
+        public RelatedAttrQuery(IJsonApiContext jsonApiContext, FilterQuery filterQuery)
         {
             _jsonApiContext = jsonApiContext;
 
-            RelationshipAttribute = GetRelationshipAttribute(query.RelationshipAttribute);
-            Attribute = GetAttribute(RelationshipAttribute, query.Attribute);
+            RelationshipAttribute = GetRelationshipAttribute(filterQuery.RelationshipAttribute);
+            Attribute = GetAttribute(RelationshipAttribute, filterQuery.Attribute);
+
+            if (Attribute.IsFilterable == false)
+                throw new JsonApiException(400, $"Filter is not allowed for attribute '{Attribute.PublicAttributeName}'.");
+
+            PropertyValue = filterQuery.Value;
+            FilterOperation = filterQuery.OperationType;
         }
 
-        public AttrAttribute Attribute { get; }
-        public RelationshipAttribute RelationshipAttribute { get; }
+        public RelatedAttrQuery(IJsonApiContext jsonApiContext, SortQuery sortQuery)
+        {
+            _jsonApiContext = jsonApiContext;
+            RelationshipAttribute = GetRelationshipAttribute(sortQuery.RelationshipAttribute);
+            Attribute = GetAttribute(RelationshipAttribute, sortQuery.Attribute);
+
+            if (Attribute.IsSortable == false)
+                throw new JsonApiException(400, $"Sort is not allowed for attribute '{Attribute.PublicAttributeName}'.");
+
+            Direction = sortQuery.Direction;
+        }
 
         private RelationshipAttribute GetRelationshipAttribute(string relationship)
         {