Handle empty search tokens

FoundatioFx · Oct 22, 2024 · 7fae77c · 7fae77c
1 parent fd1859c
commit 7fae77c
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 3 deletions.
diff --git a/src/Foundatio.Parsers.SqlQueries/Extensions/SqlNodeExtensions.cs b/src/Foundatio.Parsers.SqlQueries/Extensions/SqlNodeExtensions.cs
@@ -149,9 +149,13 @@ public static string ToDynamicLinqString(this TermNode node, ISqlQueryVisitorCon
                 }
 
                 context.SearchTokenizer.Invoke(searchTerm);
+                if (searchTerm.Tokens == null)
+                    searchTerm.Tokens = [ searchTerm.Term ];
+                else
+                    searchTerm.Tokens = searchTerm.Tokens.Select(t => !String.IsNullOrWhiteSpace(t) ? t : "@__NOMATCH__").ToList();
             }
 
-            fieldTerms.ForEach((kvp, x) =>
+            fieldTerms.Where(f => f.Value.Tokens is { Count: > 0 }).ForEach((kvp, x) =>
             {
                 if (x.IsFirst && node.IsNegated.HasValue && node.IsNegated.Value)
                     builder.Append("!");

diff --git a/tests/Foundatio.Parsers.SqlQueries.Tests/SqlQueryParserTests.cs b/tests/Foundatio.Parsers.SqlQueries.Tests/SqlQueryParserTests.cs
@@ -85,7 +85,6 @@ public async Task CanSearchWithTokenizer()
     {
         var sp = GetServiceProvider();
         await using var db = await GetSampleContextWithDataAsync(sp);
-        var phoneNumberUtil = PhoneNumberUtil.GetInstance();
         var parser = sp.GetRequiredService<SqlQueryParser>();
         parser.Configuration.SetDefaultFields(["NationalPhoneNumber"]);
         parser.Configuration.SetSearchTokenizer(s =>
@@ -96,7 +95,7 @@ public async Task CanSearchWithTokenizer()
             if (s.FieldInfo.FullName != "NationalPhoneNumber")
                 return;
 
-            s.Tokens = [phoneNumberUtil.Parse(s.Term, "US").NationalNumber.ToString()];
+            s.Tokens = [TryGetNationalNumber(s.Term)];
             s.Operator = SqlSearchOperator.StartsWith;
         });
 
@@ -127,6 +126,27 @@ public async Task CanSearchWithTokenizer()
         Assert.Single(results);
     }
 
+    [Fact]
+    public async Task CanHandleEmptyTokens()
+    {
+        var sp = GetServiceProvider();
+        await using var db = await GetSampleContextWithDataAsync(sp);
+        var parser = sp.GetRequiredService<SqlQueryParser>();
+        parser.Configuration.SetDefaultFields(["NationalPhoneNumber"]);
+        parser.Configuration.SetSearchTokenizer(s =>
+        {
+            s.Tokens = ["", "    "];
+        });
+
+        var context = parser.GetContext(db.Employees.EntityType);
+
+        string sql = await parser.ToDynamicLinqAsync("test", context);
+        _logger.LogInformation(sql);
+        string sqlActual = db.Employees.Where(sql).ToQueryString();
+        var results = await db.Employees.Where(sql).ToListAsync();
+        Assert.Empty(results);
+    }
+
     [Fact]
     public async Task CanUseDateFilter()
     {
@@ -313,6 +333,19 @@ public async Task CanGenerateSql()
         Assert.Equal("John Doe", employee.FullName);
     }
 
+    public static string? TryGetNationalNumber(string phoneNumber, string regionCode = "US")
+    {
+        var phoneNumberUtil = PhoneNumberUtil.GetInstance();
+        try
+        {
+            return phoneNumberUtil.Parse(phoneNumber, regionCode).NationalNumber.ToString();
+        }
+        catch (NumberParseException)
+        {
+            return null;
+        }
+    }
+
     public IServiceProvider GetServiceProvider()
     {
         var services = new ServiceCollection();