ignore case during contains query (#77)

dex36 · web-flow · commit 2d753eefff48 · 2025-05-09T10:53:54.000+01:00
diff --git a/src/Extensions/QueryableExtension.cs b/src/Extensions/QueryableExtension.cs
@@ -55,13 +55,20 @@ public static (IQueryable, int?) Apply<T>(this IQueryable<T> queryable, Query qu
                     property = propertyName;
                 }
 
-                if (operand.Equals("contains", StringComparison.OrdinalIgnoreCase))
+                if (typeof(T).GetProperties().FirstOrDefault(x => x.Name.Equals(property, StringComparison.OrdinalIgnoreCase))?.PropertyType == typeof(string))
                 {
-                    where.Append($"{property}.{_filterOperations[operand]}({value})");
+                    if (operand.Equals("contains", StringComparison.OrdinalIgnoreCase))
+                    {
+                        where.Append($"{property}.ToLower().Contains({value}.ToLower())");
+                    }
+                    else
+                    {
+                        where.Append($"{property}.ToLower() {_filterOperations[operand]} {value}.ToLower()");
+                    }
                 }
-                else if (typeof(T).GetProperties().FirstOrDefault(x => x.Name.Equals(property, StringComparison.OrdinalIgnoreCase))?.PropertyType == typeof(string))
+                else if (operand.Equals("contains", StringComparison.OrdinalIgnoreCase))
                 {
-                    where.Append($"{property}.ToLower() {_filterOperations[operand]} {value}.ToLower()");
+                    where.Append($"{property}.{_filterOperations[operand]}({value})");
                 }
                 else if (typeof(T).GetProperties().FirstOrDefault(x => x.Name.Equals(property, StringComparison.OrdinalIgnoreCase))?.PropertyType == typeof(Guid))
                 {

Original file line number	Diff line number	Diff line change
`@@ -55,13 +55,20 @@ public static (IQueryable, int?) Apply<T>(this IQueryable<T> queryable, Query qu`
`55`	`55`	`property = propertyName;`
`56`	`56`	`}`
`57`	`57`
`58`		`- if (operand.Equals("contains", StringComparison.OrdinalIgnoreCase))`
	`58`	`+ if (typeof(T).GetProperties().FirstOrDefault(x => x.Name.Equals(property, StringComparison.OrdinalIgnoreCase))?.PropertyType == typeof(string))`
`59`	`59`	`{`
`60`		`- where.Append($"{property}.{_filterOperations[operand]}({value})");`
	`60`	`+ if (operand.Equals("contains", StringComparison.OrdinalIgnoreCase))`
	`61`	`+ {`
	`62`	`+ where.Append($"{property}.ToLower().Contains({value}.ToLower())");`
	`63`	`+ }`
	`64`	`+ else`
	`65`	`+ {`
	`66`	`+ where.Append($"{property}.ToLower() {_filterOperations[operand]} {value}.ToLower()");`
	`67`	`+ }`
`61`	`68`	`}`
`62`		`- else if (typeof(T).GetProperties().FirstOrDefault(x => x.Name.Equals(property, StringComparison.OrdinalIgnoreCase))?.PropertyType == typeof(string))`
	`69`	`+ else if (operand.Equals("contains", StringComparison.OrdinalIgnoreCase))`
`63`	`70`	`{`
`64`		`- where.Append($"{property}.ToLower() {_filterOperations[operand]} {value}.ToLower()");`
	`71`	`+ where.Append($"{property}.{_filterOperations[operand]}({value})");`
`65`	`72`	`}`
`66`	`73`	`else if (typeof(T).GetProperties().FirstOrDefault(x => x.Name.Equals(property, StringComparison.OrdinalIgnoreCase))?.PropertyType == typeof(Guid))`
`67`	`74`	`{`