fix: filtering with parenthesis and case-insensitive operator #171

alirezanet · Oct 31, 2024 · e1feb5d · e1feb5d
1 parent e8fc334
commit e1feb5d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/src/Gridify/Syntax/Parser.cs b/src/Gridify/Syntax/Parser.cs
@@ -107,7 +107,12 @@ private ValueExpressionSyntax ParseValueExpression()
    {
       // field=
       if (Current.Kind != SyntaxKind.ValueToken)
-         return new ValueExpressionSyntax(new SyntaxToken(), false, true);
+      {
+         if (Current.Kind != SyntaxKind.CaseInsensitive) return new ValueExpressionSyntax(new SyntaxToken(), false, true);
+         NextToken(); // field=/i
+         return new ValueExpressionSyntax(new SyntaxToken(), true, true);
+      }
+
 
       var valueToken = Match(SyntaxKind.ValueToken);
       var isCaseInsensitive = TryMatch(SyntaxKind.CaseInsensitive, out _);

diff --git a/test/Gridify.Tests/IssueTests/Issue171Tests.cs b/test/Gridify.Tests/IssueTests/Issue171Tests.cs
@@ -1,4 +1,4 @@
-using System.Collections.Generic;
+using System.Collections.Generic;
 using System.Linq;
 using Xunit;
 
@@ -7,7 +7,18 @@ namespace Gridify.Tests.IssueTests;
 public class Issue171Tests
 {
 
-   private readonly List<TestClass> _fakeRepository = [..GridifyExtensionsShould.GetSampleData(), new TestClass(4444,"/i",null)];
+   private readonly List<TestClass> _fakeRepository = [.. GridifyExtensionsShould.GetSampleData(), new TestClass(4444, "/i", null)];
+
+   [Fact]
+   public void ApplyFiltering_CaseInsensitiveEmptyFieldsWithParenthesis_ShouldFilter()
+   {
+      var actual = _fakeRepository.AsQueryable().ApplyFiltering("(tag=/i)").ToList();
+      var expected = _fakeRepository.Where(q => string.IsNullOrEmpty(q.Tag)).ToList();
+
+      Assert.Equal(expected.Count, actual.Count);
+      Assert.Equal(expected, actual);
+      Assert.True(actual.Any());
+   }
 
    [Fact]
    public void ApplyFiltering_CaseInsensitiveEmptyFields_ShouldFilter()