Fix expression constant in contains (#411)

redis · Oct 26, 2023 · ffb3a40 · ffb3a40
1 parent 968fa76
commit ffb3a40
Show file tree

Hide file tree

Showing 4 changed files with 84 additions and 3 deletions.
diff --git a/src/Redis.OM/Common/ExpressionParserUtilities.cs b/src/Redis.OM/Common/ExpressionParserUtilities.cs
@@ -868,6 +868,12 @@ private static string TranslateContainsStandardQuerySyntax(MethodCallExpression
                 searchFieldAttribute = DetermineSearchAttribute(expression);
             }
 
+            if (exp.Arguments.LastOrDefault() is MemberExpression memEx && exp.Arguments.FirstOrDefault() is ConstantExpression cs)
+            {
+                var propertyName = $"{GetOperandString(memEx)}";
+                return $"({GetContainsStringForConstantExpression(propertyName, cs)})";
+            }
+
             if (expression == null)
             {
                 throw new InvalidOperationException($"Could not parse query for Contains");
@@ -885,6 +891,45 @@ private static string TranslateContainsStandardQuerySyntax(MethodCallExpression
             return (type == typeof(string)) ? $"({memberName}:{{*{EscapeTagField(literal)}*}})" : $"({memberName}:{{{EscapeTagField(literal)}}})";
         }
 
+        private static string GetContainsStringForConstantExpression(string propertyNameOperand, ConstantExpression cs)
+        {
+            var enumerable = cs.Value as IEnumerable;
+            if (enumerable is null)
+            {
+                throw new ArgumentException("Could not create contains predicate from non-enumerable value");
+            }
+
+            var isNumeric = TypeDeterminationUtilities.IsNumericEnumerable(enumerable);
+            var sb = new StringBuilder();
+
+            if (!isNumeric)
+            {
+                sb.Append($"{propertyNameOperand}:{{");
+            }
+
+            foreach (var o in enumerable)
+            {
+                if (isNumeric)
+                {
+                    sb.Append($"{propertyNameOperand}:[{o} {o}]");
+                }
+                else
+                {
+                    sb.Append(EscapeTagField(o.ToString()));
+                }
+
+                sb.Append("|");
+            }
+
+            sb.Remove(sb.Length - 1, 1);
+            if (!isNumeric)
+            {
+                sb.Append("}");
+            }
+
+            return sb.ToString();
+        }
+
         private static string TranslateAnyForEmbeddedObjects(MethodCallExpression exp)
         {
             var type = exp.Arguments.Last().Type;

diff --git a/src/Redis.OM/Modeling/TypeDeterminationUtilities.cs b/src/Redis.OM/Modeling/TypeDeterminationUtilities.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using System.Reflection;
@@ -27,6 +28,23 @@ internal static class TypeDeterminationUtilities
             typeof(DateTime),
         };
 
+        /// <summary>
+        /// Determins whether the collection is a numeric collection.
+        /// </summary>
+        /// <param name="enumerable">The enumerable.</param>
+        /// <returns>whether the enumerable is a numeric enumerable.</returns>
+        internal static bool IsNumericEnumerable(in IEnumerable enumerable)
+        {
+            var type = enumerable.GetType().IsArray ? enumerable.GetType().GetElementType() : enumerable.GetType().GenericTypeArguments[0];
+            if (type is null)
+            {
+                throw new ArgumentNullException(nameof(type));
+            }
+
+            var underlyingType = Nullable.GetUnderlyingType(type) ?? type;
+            return NumericTypes.Contains(underlyingType);
+        }
+
         /// <summary>
         /// Is the type numeric.
         /// </summary>

diff --git a/src/Redis.OM/Redis.OM.csproj b/src/Redis.OM/Redis.OM.csproj
@@ -6,9 +6,9 @@
     <RootNamespace>Redis.OM</RootNamespace>
     <Nullable>enable</Nullable>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <PackageVersion>0.5.3</PackageVersion>
-    <Version>0.5.3</Version>
-    <PackageReleaseNotes>https://github.com/redis/redis-om-dotnet/releases/tag/v0.5.3</PackageReleaseNotes>
+    <PackageVersion>0.5.4</PackageVersion>
+    <Version>0.5.4</Version>
+    <PackageReleaseNotes>https://github.com/redis/redis-om-dotnet/releases/tag/v0.5.4</PackageReleaseNotes>
     <Description>Object Mapping and More for Redis</Description>
     <Title>Redis OM</Title>
     <Authors>Steve Lorello</Authors>

diff --git a/test/Redis.OM.Unit.Tests/RediSearchTests/SearchTests.cs b/test/Redis.OM.Unit.Tests/RediSearchTests/SearchTests.cs
@@ -1,8 +1,10 @@
 #nullable enable
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Linq.Expressions;
+using System.Reflection;
 using System.Threading.Tasks;
 using NSubstitute;
 using NSubstitute.ClearExtensions;
@@ -3428,5 +3430,21 @@ public void NonNullableNumericFieldContains()
                 "0",
                 "100");
         }
+
+        [Fact]
+        public void TestConstantExpressionContains()
+        {
+            _substitute.ClearSubstitute();
+            _substitute.Execute(Arg.Any<string>(), Arg.Any<string[]>()).Returns(_mockReply);
+            var collection = new RedisCollection<Person>(_substitute);
+            var parameter = Expression.Parameter(typeof(Person), "b");
+            var property = Expression.Property(parameter, "TagField");
+            var values = new string[] { "James", "Bond" };
+            MethodInfo contains = typeof(Enumerable).GetMethods(BindingFlags.Static | BindingFlags.Public).Where(x => x.Name.Contains(nameof(Enumerable.Contains))).Single(x => x.GetParameters().Length == 2).MakeGenericMethod(property.Type);
+            var body = Expression.Call(contains, Expression.Constant(values), property);
+            var lambada = Expression.Lambda<Func<Person, bool>>(body, parameter);
+            _ = collection.Where(lambada).ToList();
+            _substitute.Received().Execute("FT.SEARCH", "person-idx", "(@TagField:{James|Bond})", "LIMIT", "0", "100");
+        }
     }
 }