Merge branch 'main' into fix_github_actions_and_unit_tests

Author: pdevito3

QueryKit.IntegrationTests/Tests/DatabaseSortingTests.cs

@@ -3,6 +3,7 @@ namespace QueryKit.IntegrationTests.Tests;
 using Bogus;
 using FluentAssertions;
 using Microsoft.EntityFrameworkCore;
+using QueryKit.Exceptions;
 using SharedTestingHelper.Fakes;
 using WebApiTestProject.Entities;
 
@@ -165,7 +166,7 @@ public async Task a_prop_with_hasconversion_must_match_that_configuration()
         var act = () => appliedQueryable.ToListAsync();
 
         // Assert
-        await act.Should().ThrowAsync<InvalidOperationException>();
+        await act.Should().ThrowAsync<ParsingException>();
     }
 
     [Fact]
@@ -242,4 +243,4 @@ public async Task can_sort_items_with_null_value_property()
         people[2].Id.Should().Be(fakePersonFour.Id);
         people[3].Id.Should().Be(fakePersonThree.Id);
     }
-}
+}

QueryKit.UnitTests/FilterParserTests.cs

@@ -808,5 +808,14 @@ public void primitive_collection_does_not_have_case_insensitive()
         filterExpression.ToString().Should()
             .Be(""""x => x.Tags.Any(z => (z.ToLower() != "winner".ToLower()))"""");
     }
+    
+    [Fact]
+    public void can_throw_exception_when_invalid_enum_value()
+    {
+        var input = $"""BirthMonth == invalid""";
+        var act = () => FilterParser.ParseFilter<TestingPerson>(input);
+        act.Should().Throw<ParsingException>()
+        .WithMessage("There was a parsing failure, likely due to an invalid comparison or logical operator. You may also be missing double quotes surrounding a string or guid.");
+    }
 }
 

…Kit/Exceptions/FilterParsingException.cs QueryKit/Exceptions/ParsingException.csQueryKit/Exceptions/FilterParsingException.cs renamed to QueryKit/Exceptions/ParsingException.cs QueryKit/Exceptions/FilterParsingException.cs renamed to QueryKit/Exceptions/ParsingException.cs

@@ -2,7 +2,7 @@ namespace QueryKit.Exceptions;
 
 public sealed class ParsingException : Exception
 {
-    public ParsingException(Exception exception) 
+    public ParsingException(Exception exception)
         : base($"There was a parsing failure, likely due to an invalid comparison or logical operator. You may also be missing double quotes surrounding a string or guid.", exception)
     {
     }

QueryKit/Exceptions/QueryKitDbContextTypeException.cs

@@ -1,8 +1,8 @@
 namespace QueryKit.Exceptions;
 
-public sealed class QueryKitDbContextTypeException : Exception
+public sealed class QueryKitDbContextTypeException : QueryKitException
 {
-    public QueryKitDbContextTypeException(string specificMessage) 
+    public QueryKitDbContextTypeException(string specificMessage)
         : base($"There no DbContext type provided in your QueryKit config, but one was needed for this operation. {specificMessage}")
     {
     }

QueryKit/Exceptions/QueryKitException.cs

@@ -0,0 +1,10 @@
+namespace QueryKit.Exceptions;
+
+/// <summary>
+/// Base QueryKit exception, all exceptions thrown by QueryKit inherit this.
+/// </summary>
+public class QueryKitException : Exception
+{
+    public QueryKitException(string message, Exception exception) : base(message, exception) {}
+    public QueryKitException(string message) : base(message) {}
+}

QueryKit/Exceptions/QueryKitParsingException.cs

@@ -1,8 +1,8 @@
 namespace QueryKit.Exceptions;
 
-public sealed class QueryKitParsingException : Exception
+public sealed class QueryKitParsingException : QueryKitException
 {
-    public QueryKitParsingException(string message) 
+    public QueryKitParsingException(string message)
         : base(message)
     {
     }

QueryKit/Exceptions/SortParsingException.cs

@@ -1,8 +1,8 @@
 namespace QueryKit.Exceptions;
 
-public sealed class SortParsingException : Exception
+public sealed class SortParsingException : QueryKitException
 {
-    public SortParsingException(string propertyName) 
+    public SortParsingException(string propertyName)
         : base($"Parsing failed during sorting. '{propertyName}' was not recognized.")
     {
     }

QueryKit/Exceptions/SoundsLikeNotImplementedException.cs

@@ -1,8 +1,8 @@
 namespace QueryKit.Exceptions;
 
-public sealed class SoundsLikeNotImplementedException : Exception
+public sealed class SoundsLikeNotImplementedException : QueryKitException
 {
-    public SoundsLikeNotImplementedException(string dbContextType) 
+    public SoundsLikeNotImplementedException(string dbContextType)
         : base($"The DbContext type {dbContextType} does not have a SoundsLike method.")
     {
     }

QueryKit/Exceptions/UnknownFilterPropertyException.cs

@@ -1,8 +1,8 @@
 namespace QueryKit.Exceptions;
 
-public sealed class UnknownFilterPropertyException : Exception
+public sealed class UnknownFilterPropertyException : QueryKitException
 {
-    public UnknownFilterPropertyException(string propertyName) 
+    public UnknownFilterPropertyException(string propertyName)
         : base($"The filter property '{propertyName}' was not recognized.")
     {
     }

QueryKit/FilterParser.cs

@@ -31,6 +31,9 @@ public static Expression<Func<T, bool>> ParseFilter<T>(string input, IQueryKitCo
         {
             expr = ExprParser<T>(parameter, config).End().Parse(input);
         }
+        catch (InvalidOperationException e) {
+            throw new ParsingException(e);
+        }
         catch (ParseException e)
         {
             throw new ParsingException(e);
@@ -314,29 +317,12 @@ private static Expression CreateRightExprFromType(Type leftExprType, string righ
                 return Expression.Constant(null, rawType);
             }
 
-            if (right.StartsWith("[") && right.EndsWith("]"))
+            var parsed = Enum.TryParse(enumType, right, out var enumValue);
+            if (!parsed) 
             {
-                var values = right.Trim('[', ']').Split(',').Select(x => x.Trim()).ToList();
-                var elementType = targetType.IsArray ? targetType.GetElementType() : targetType;
-            
-                var expressions = values.Select<string, Expression>(x =>
-                {
-                    if (elementType == typeof(string) && x.StartsWith("\"") && x.EndsWith("\""))
-                    {
-                        x = x.Trim('"');
-                    }
-            
-                    var enumValue = Enum.Parse(enumType, x);
-                    var constant = Expression.Constant(enumValue, enumType);
-
-                    return constant;
-                }).ToArray();
-            
-                var newArrayExpression = Expression.NewArrayInit(enumType, expressions);
-                return newArrayExpression;
+                throw new InvalidOperationException($"Unsupported value '{right}' for type '{targetType.Name}'");
             }
 
-            var enumValue = Enum.Parse(enumType, right);
             var constant = Expression.Constant(enumValue, enumType);
 
             if (rawType == enumType) return constant;