Merge branch 'main' into relationship-primary-filter

Author: erlendellefsen

JsonApiToolkit.Tests/Extensions/IncludeFilterParserTests.cs

@@ -286,39 +286,6 @@ public void SeparateIncludeFilters_WithFilterOnNonIncludedRelationship_ReturnsAs
         Assert.Empty(includeFilters);
     }
 
-    [Fact]
-    public void SeparateIncludeFilters_WithTooManyOrConditions_ThrowsException()
-    {
-        // Arrange
-        var filters = new FilterGroup
-        {
-            LogicalOperator = LogicalOperator.Or,
-            Filters = new List<FilterParameter>(),
-        };
-
-        // Add 11 OR conditions (exceeds limit of 10)
-        for (int i = 0; i < 11; i++)
-        {
-            filters.Filters.Add(
-                new FilterParameter
-                {
-                    Field = "comments.status",
-                    Operator = FilterOperator.Eq,
-                    Value = $"value{i}",
-                }
-            );
-        }
-
-        var includePaths = new List<string> { "comments" };
-
-        // Act & Assert
-        var exception = Assert.Throws<JsonApiBadRequestException>(
-            () => IncludeFilterParser.SeparateIncludeFilters(filters, includePaths)
-        );
-
-        Assert.Contains("Too many OR conditions", exception.Message);
-    }
-
     [Fact]
     public void SeparateIncludeFilters_WithTooDeepNesting_ThrowsException()
     {

JsonApiToolkit.Tests/Filters/JsonApiExceptionFilterTests.cs

@@ -213,4 +213,29 @@ public void OnException_WithUnhandledException_LogsWithStackTrace()
             Times.Once
         );
     }
+
+    [Theory]
+    [InlineData(402, "Payment Required")]
+    [InlineData(410, "Gone")]
+    [InlineData(422, "Unprocessable Entity")]
+    [InlineData(451, "Unavailable For Legal Reasons")]
+    public void OnException_WithJsonApiHttpException_ReturnsCorrectStatusAndTitle(
+        int statusCode,
+        string expectedTitle
+    )
+    {
+        var exception = new JsonApiHttpException(statusCode, "Test message");
+        var context = CreateExceptionContext(exception);
+
+        _filter.OnException(context);
+
+        Assert.True(context.ExceptionHandled);
+        var result = Assert.IsType<ObjectResult>(context.Result);
+        Assert.Equal(statusCode, result.StatusCode);
+        var errorResponse = Assert.IsType<JsonApiErrorResponse>(result.Value);
+
+        Assert.Single(errorResponse.Errors);
+        Assert.Equal(statusCode.ToString(), errorResponse.Errors[0].Status);
+        Assert.Equal(expectedTitle, errorResponse.Errors[0].Title);
+    }
 }

JsonApiToolkit/Extensions/Querying/Filtering/IncludeFilterParser.cs

@@ -10,7 +10,6 @@ public static class IncludeFilterParser
 {
     private const int MaxIncludeFilterDepth = 3;
     private const int MaxIncludeFilters = 20;
-    private const int MaxOrConditions = 10;
 
     /// <summary>
     /// Separates main filters from include filters.
@@ -59,14 +58,6 @@ Dictionary<string, FilterGroup> filtersByRelationship
     {
         var newGroup = new FilterGroup { LogicalOperator = group.LogicalOperator };
 
-        // Check OR conditions count
-        if (group.LogicalOperator == LogicalOperator.Or && group.Filters.Count > MaxOrConditions)
-        {
-            throw new JsonApiBadRequestException(
-                $"Too many OR conditions in filter group. Maximum allowed: {MaxOrConditions}"
-            );
-        }
-
         // Track filters for each relationship in this group
         var localIncludeFilters = new Dictionary<string, FilterGroup>(
             StringComparer.OrdinalIgnoreCase

JsonApiToolkit/Filters/JsonApiExceptionFilter.cs

@@ -1,3 +1,5 @@
+using System.Net;
+using System.Text.RegularExpressions;
 using JsonApiToolkit.Models.Errors;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Filters;
@@ -68,15 +70,14 @@ public void OnException(ExceptionContext context)
         context.ExceptionHandled = true;
     }
 
-    private static string GetTitleForStatusCode(int statusCode) =>
-        statusCode switch
+    private static string GetTitleForStatusCode(int statusCode)
+    {
+        if (Enum.IsDefined(typeof(HttpStatusCode), statusCode))
         {
-            400 => "Bad Request",
-            401 => "Unauthorized",
-            403 => "Forbidden",
-            404 => "Not Found",
-            409 => "Conflict",
-            429 => "Too Many Requests",
-            _ => "Error",
-        };
+            // Convert PascalCase enum name to Title Case with spaces
+            var name = ((HttpStatusCode)statusCode).ToString();
+            return Regex.Replace(name, "(\\B[A-Z])", " $1");
+        }
+        return "Error";
+    }
 }

JsonApiToolkit/Models/Errors/JsonApiErrorTypes.cs

@@ -188,3 +188,29 @@ public JsonApiTooManyRequestsException(
     )
         : base(429, message, code, errorSource, meta, innerException) { }
 }
+
+/// <summary>
+/// General-purpose exception for any HTTP status code.
+/// Use this when the specific exception types don't cover your use case.
+/// </summary>
+public class JsonApiHttpException : JsonApiException
+{
+    /// <summary>
+    /// Initializes a new JSON:API HTTP exception with any status code.
+    /// </summary>
+    public JsonApiHttpException(int statusCode, string message)
+        : base(statusCode, message) { }
+
+    /// <summary>
+    /// Initializes a new JSON:API HTTP exception with additional details.
+    /// </summary>
+    public JsonApiHttpException(
+        int statusCode,
+        string message,
+        string? code = null,
+        ErrorSource? errorSource = null,
+        Dictionary<string, object>? meta = null,
+        Exception? innerException = null
+    )
+        : base(statusCode, message, code, errorSource, meta, innerException) { }
+}