Partial fixed ExpressionParser when WrappedValue-string is used for in-operator and left operand is enum (zzzprojects#668)

Author: neilbgr

src/System.Linq.Dynamic.Core/Parser/ExpressionParser.cs

@@ -313,9 +313,16 @@ private Expression ParseIn()
                     Expression right = ParseUnary();
 
                     // if the identifier is an Enum, try to convert the right-side also to an Enum.
-                    if (left.Type.GetTypeInfo().IsEnum && right is ConstantExpression constantExpression)
+                    if (left.Type.GetTypeInfo().IsEnum)
                     {
-                        right = ParseEnumToConstantExpression(op.Pos, left.Type, constantExpression);
+                        if (right is ConstantExpression constantExprRight)
+                        {
+                            right = ParseEnumToConstantExpression(op.Pos, left.Type, constantExprRight);
+                        }
+                        else if (_expressionHelper.TryUnwrapAsExpression<string>(right, out var unwrappedConstantExprRight))
+                        {
+                            right = ParseEnumToConstantExpression(op.Pos, left.Type, unwrappedConstantExprRight);
+                        }
                     }
 
                     // else, check for direct type match

test/System.Linq.Dynamic.Core.Tests/QueryableTests.UseParameterizedNamesInDynamicQuery .cs

@@ -97,6 +97,176 @@ public void When_UseParameterizedNamesInDynamicQuery_IsTrue_WrappedStringValueEn
         // Assert
         result.Should().HaveCount(1);
     }
+
+    [Fact]
+    public void When_UseParameterizedNamesInDynamicQuery_IsTrue_WrappedStringValueEnumAsParameter_Should_Be_Unwrapped()
+    {
+        // Arrange
+        var list = new List<Customer>
+        {
+            new()
+            {
+                Name = "Duffy",
+                GenderType = Gender.Female
+            },
+            new()
+            {
+                Name = "Garry",
+                GenderType = Gender.Male
+            }
+        };
+
+        var config = new ParsingConfig
+        {
+            UseParameterizedNamesInDynamicQuery = true
+        };
+
+        // Act
+        var result = list.AsQueryable().Where(config, "GenderType = @0", "Female").ToArray();
+
+        // Assert
+        result.Should().HaveCount(1);
+    }
+
+    [Fact]
+    public void When_UseParameterizedNamesInDynamicQuery_IsTrue_WrappedStringValueEnumArray_Should_Be_Unwrapped()
+    {
+        // Arrange
+        var list = new List<Customer>
+        {
+            new()
+            {
+                Name = "Duffy",
+                GenderType = Gender.Female
+            },
+            new()
+            {
+                Name = "Garry",
+                GenderType = Gender.Male
+            },
+            new()
+            {
+                Name = "Garry",
+                GenderType = Gender.Other
+            },
+            new()
+            {
+                Name = "Garry",
+                GenderType = Gender.Male
+            }
+        };
+
+        var config = new ParsingConfig
+        {
+            UseParameterizedNamesInDynamicQuery = true
+        };
+
+        // Act
+        var result = list.AsQueryable().Where(config, "GenderType in (\"Female\", \"Other\")").ToArray();
+
+        // Assert
+        result.Should().HaveCount(2);
+    }
+
+    [Fact]
+    public void When_UseParameterizedNamesInDynamicQuery_IsTrue_WrappedIntergerValueEnumArray_Should_Be_Unwrapped()
+    {
+        // Arrange
+        var list = new List<Customer>
+        {
+            new()
+            {
+                Name = "Duffy",
+                GenderType = Gender.Female
+            },
+            new()
+            {
+                Name = "Garry",
+                GenderType = Gender.Male
+            },
+            new()
+            {
+                Name = "Garry",
+                GenderType = Gender.Other
+            },
+            new()
+            {
+                Name = "Garry",
+                GenderType = Gender.Male
+            }
+        };
+
+        var config = new ParsingConfig
+        {
+            UseParameterizedNamesInDynamicQuery = true
+        };
+
+        // Act
+        var result = list.AsQueryable().Where(config, "GenderType in (0, 2)").ToArray();
+
+        // Assert
+        result.Should().HaveCount(2);
+    }
+
+    [Fact]
+    public void When_UseParameterizedNamesInDynamicQuery_IsTrue_WrappedIntegerValueEnum_Should_Be_Unwrapped()
+    {
+        // Arrange
+        var list = new List<Customer>
+        {
+            new()
+            {
+                Name = "Duffy",
+                GenderType = Gender.Female
+            },
+            new()
+            {
+                Name = "Garry",
+                GenderType = Gender.Male
+            }
+        };
+
+        var config = new ParsingConfig
+        {
+            UseParameterizedNamesInDynamicQuery = true
+        };
+
+        // Act
+        var result = list.AsQueryable().Where(config, "GenderType = 1").ToArray();
+
+        // Assert
+        result.Should().HaveCount(1);
+    }
+
+    [Fact]
+    public void When_UseParameterizedNamesInDynamicQuery_IsTrue_WrappedIntegerStringValueEnumAsParameter_Should_Be_Unwrapped()
+    {
+        // Arrange
+        var list = new List<Customer>
+        {
+            new()
+            {
+                Name = "Duffy",
+                GenderType = Gender.Female
+            },
+            new()
+            {
+                Name = "Garry",
+                GenderType = Gender.Male
+            }
+        };
+
+        var config = new ParsingConfig
+        {
+            UseParameterizedNamesInDynamicQuery = true
+        };
+
+        // Act
+        var result = list.AsQueryable().Where(config, "GenderType = @0", 1).ToArray();
+
+        // Assert
+        result.Should().HaveCount(1);
+    }
 }
 
 public class Customer