Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: TR-EN Search problem, added Equals method expression #140

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,11 @@

<PropertyGroup>
<TargetFrameworks>net6.0;net5.0;netstandard2.1</TargetFrameworks>
<Version>3.3.3</Version>
<Version>3.3.4</Version>
<Description>
- 3.3.4
* WhereContains supported Equals method by "useTrEnSearch" property

- 3.3.3
* New functions with CancellationToken have been added in Repositories.

Expand Down
21 changes: 17 additions & 4 deletions Carbon.Domain.EntityFrameworkCore.Extensions/EFExtensions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@ public static IQueryable<T> WhereContains<T>(this IQueryable<T> query, Expressio
/// <param name="selector">Expression specifying the property to search within.</param>
/// <param name="search">The search term containing one or more words.</param>
/// <param name="searchByWords">A boolean value indicating whether to search for individual words in the search term (default is false).</param>
/// <param name="useTrEnSearch">A boolean value if is TRUE then generates Contains expression or if is FALSE then generates Equals expression (default is true)</param>
/// <returns>The filtered IQueryable containing elements where any word in the search term exists in the specified property's string value.</returns>
/// <remarks>
/// This method performs a case-insensitive search. If searchByWords is false, it performs a normal contains search for the entire search term. If searchByWords is true, it splits the search term into words and checks if any word exists in the specified property's string value.
Expand All @@ -567,7 +568,8 @@ public static IQueryable<T> WhereContains<T>(
this IQueryable<T> query,
Expression<Func<T, string>> selector,
List<string> search,
bool searchByWords = false)
bool searchByWords = false,
bool useTrEnSearch = true)
{
if (query == null || selector == null || !search.Any())
{
Expand Down Expand Up @@ -596,9 +598,20 @@ public static IQueryable<T> WhereContains<T>(
}
else
{
ConstantExpression constantExpression = Expression.Constant(value.ToLower(culture));
MethodCallExpression methodCallExpression = Expression.Call(instance2, "Contains", Type.EmptyTypes, constantExpression);
expression = ((expression != null) ? ((Expression)Expression.OrElse(expression, methodCallExpression)) : ((Expression)methodCallExpression));
if (useTrEnSearch)
altaygencaslan marked this conversation as resolved.
Show resolved Hide resolved
{
ConstantExpression constantExpression = Expression.Constant(value.ToLower(culture));
MethodCallExpression methodCallExpression = Expression.Call(instance2, "Contains", Type.EmptyTypes, constantExpression);
expression = ((expression != null) ? ((Expression)Expression.OrElse(expression, methodCallExpression)) : ((Expression)methodCallExpression));
}
else
{
MethodInfo methodEquals = typeof(string).GetMethod("Equals", new[] { typeof(string) });

ConstantExpression constantExpression = Expression.Constant(value.ToLower(culture));
MethodCallExpression methodCallExpression = Expression.Call(instance2, methodEquals, constantExpression);
expression = ((expression != null) ? ((Expression)Expression.OrElse(expression, methodCallExpression)) : ((Expression)methodCallExpression));
}
}
}

Expand Down
Loading