crossed wires between inverted contains and infix (#413)

redis · Oct 26, 2023 · fa80a84 · fa80a84
1 parent 13b0143
commit fa80a84
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 2 deletions.
diff --git a/src/Redis.OM/Common/ExpressionParserUtilities.cs b/src/Redis.OM/Common/ExpressionParserUtilities.cs
@@ -833,15 +833,21 @@ private static string TranslateContainsStandardQuerySyntax(MethodCallExpression
                 }
 
                 type = Nullable.GetUnderlyingType(propertyExpression.Type) ?? propertyExpression.Type;
+                var valueType = Nullable.GetUnderlyingType(valuesExpression.Type) ?? valuesExpression.Type;
                 memberName = GetOperandStringForMember(propertyExpression);
                 var treatEnumsAsInts = type.IsEnum && !(propertyExpression.Member.GetCustomAttributes(typeof(JsonConverterAttribute)).FirstOrDefault() is JsonConverterAttribute converter && converter.ConverterType == typeof(JsonStringEnumConverter));
                 literal = GetOperandStringForQueryArgs(valuesExpression, treatEnumsAsInts);
 
-                if ((type == typeof(string) || type == typeof(string[]) || type == typeof(List<string>) || type == typeof(Guid) || type == typeof(Guid[]) || type == typeof(List<Guid>) || type == typeof(Ulid) || (type.IsEnum && !treatEnumsAsInts)) && attribute is IndexedAttribute)
+                if ((valueType == typeof(List<string>) || valueType == typeof(string[]) || type == typeof(string[]) || type == typeof(List<string>) || type == typeof(Guid) || type == typeof(Guid[]) || type == typeof(List<Guid>) || type == typeof(Guid[]) || type == typeof(List<Guid>) || type == typeof(Ulid) || (type.IsEnum && !treatEnumsAsInts)) && attribute is IndexedAttribute)
                 {
                     return $"({memberName}:{{{EscapeTagField(literal).Replace("\\|", "|")}}})";
                 }
 
+                if (type == typeof(string) && attribute is IndexedAttribute)
+                {
+                    return $"({memberName}:{{*{EscapeTagField(literal)}*}})";
+                }
+
                 if (type == typeof(string) && attribute is SearchableAttribute)
                 {
                     return $"({memberName}:{literal})";

diff --git a/test/Redis.OM.Unit.Tests/RediSearchTests/SearchTests.cs b/test/Redis.OM.Unit.Tests/RediSearchTests/SearchTests.cs
@@ -372,7 +372,7 @@ public void TestMatchEndsWith()
                 "0",
                 "100");
         }
-        
+
         [Fact]
         public void TestMatchContains()
         {
@@ -390,6 +390,34 @@ public void TestMatchContains()
                 "100");
         }
 
+        [Fact]
+        public void TestTagContains()
+        {
+            _substitute.ClearSubstitute();
+            _substitute.Execute(Arg.Any<string>(), Arg.Any<string[]>()).Returns(_mockReply);
+
+            var ste = "Ste";
+            var person = new Person() { TagField = "ath" };
+            var collection = new RedisCollection<Person>(_substitute);
+            _ = collection.Where(x => x.TagField.Contains(ste)).ToList();
+            _ = collection.Where(x => x.TagField.Contains(person.TagField)).ToList();
+            _substitute.Received().Execute(
+                "FT.SEARCH",
+                "person-idx",
+                "(@TagField:{*Ste*})",
+                "LIMIT",
+                "0",
+                "100");
+
+            _substitute.Received().Execute(
+                "FT.SEARCH",
+                "person-idx",
+                "(@TagField:{*ath*})",
+                "LIMIT",
+                "0",
+                "100");
+        }
+
         [Fact]
         public void TestTagStartsWith()
         {