From 948cecf376c7f83e52c0358af1ec203342bcd80f Mon Sep 17 00:00:00 2001 From: Siyovush Kadyrov Date: Thu, 19 Mar 2020 10:00:19 +0300 Subject: [PATCH 1/4] Add NotIn Operator --- DynamicQueryBuilder/ExpressionBuilder.cs | 4 ++++ DynamicQueryBuilder/Models/Enums/FilterOperation.cs | 1 + 2 files changed, 5 insertions(+) diff --git a/DynamicQueryBuilder/ExpressionBuilder.cs b/DynamicQueryBuilder/ExpressionBuilder.cs index 4f72e65..c596874 100644 --- a/DynamicQueryBuilder/ExpressionBuilder.cs +++ b/DynamicQueryBuilder/ExpressionBuilder.cs @@ -517,6 +517,10 @@ internal static Expression BuildFilterExpression(ParameterExpression param, Filt case FilterOperation.Contains: return Expression.Call(parentMember, _stringContainsMethod, constant); + case FilterOperation.NotIn: + var containsExpression = Expression.Call(parentMember, _stringContainsMethod, constant); + return Expression.Not(containsExpression); + case FilterOperation.GreaterThan: return parentMember.Type == typeof(string) ? Expression.GreaterThan(compareToExpression, comparisonConstant) diff --git a/DynamicQueryBuilder/Models/Enums/FilterOperation.cs b/DynamicQueryBuilder/Models/Enums/FilterOperation.cs index e5a88d2..06e270b 100644 --- a/DynamicQueryBuilder/Models/Enums/FilterOperation.cs +++ b/DynamicQueryBuilder/Models/Enums/FilterOperation.cs @@ -6,6 +6,7 @@ public enum FilterOperation Equals, LessThan, Contains, + NotIn, NotEqual, EndsWith, StartsWith, From 33cd6d8eedabaa3931728bc3c83eaaf60f49eae3 Mon Sep 17 00:00:00 2001 From: Siyovush Kadyrov Date: Thu, 19 Mar 2020 10:02:12 +0300 Subject: [PATCH 2/4] Add NotIn custom op code --- DynamicQueryBuilder.UnitTests/TestBase.cs | 1 + DynamicQueryBuilder/ExpressionBuilder.cs | 1 + 2 files changed, 2 insertions(+) diff --git a/DynamicQueryBuilder.UnitTests/TestBase.cs b/DynamicQueryBuilder.UnitTests/TestBase.cs index bfe1f0c..3ea9a96 100644 --- a/DynamicQueryBuilder.UnitTests/TestBase.cs +++ b/DynamicQueryBuilder.UnitTests/TestBase.cs @@ -22,6 +22,7 @@ public abstract class TestBase { "eq", FilterOperation.Equals }, { "lt", FilterOperation.LessThan }, { "cts", FilterOperation.Contains }, + { "nin", FilterOperation.NotIn }, { "ne", FilterOperation.NotEqual }, { "ew", FilterOperation.EndsWith }, { "sw", FilterOperation.StartsWith }, diff --git a/DynamicQueryBuilder/ExpressionBuilder.cs b/DynamicQueryBuilder/ExpressionBuilder.cs index c596874..1d7c35a 100644 --- a/DynamicQueryBuilder/ExpressionBuilder.cs +++ b/DynamicQueryBuilder/ExpressionBuilder.cs @@ -39,6 +39,7 @@ public static class ExpressionBuilder { "eq", FilterOperation.Equals }, { "lt", FilterOperation.LessThan }, { "cts", FilterOperation.Contains }, + { "nin", FilterOperation.NotIn }, { "ne", FilterOperation.NotEqual }, { "ew", FilterOperation.EndsWith }, { "sw", FilterOperation.StartsWith }, From 5ed5d510779706ff336aaff8e7ab81b0be43d4fa Mon Sep 17 00:00:00 2001 From: Siyovush Kadyrov Date: Thu, 19 Mar 2020 10:11:40 +0300 Subject: [PATCH 3/4] Add tests for NotIn operator --- DynamicQueryBuilder.UnitTests/TestData/FilterTestData.cs | 4 ++++ DynamicQueryBuilder/ExpressionBuilder.cs | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/DynamicQueryBuilder.UnitTests/TestData/FilterTestData.cs b/DynamicQueryBuilder.UnitTests/TestData/FilterTestData.cs index 5d699ea..9b3149d 100644 --- a/DynamicQueryBuilder.UnitTests/TestData/FilterTestData.cs +++ b/DynamicQueryBuilder.UnitTests/TestData/FilterTestData.cs @@ -23,6 +23,10 @@ public static IEnumerable FilterQueryData yield return new object[] { "x.Name.Contains(\"Test\")", FilterOperation.Contains, true, "Test", "Name" }; yield return new object[] { "x.Name.ToLowerInvariant().Contains(\"test\".ToLowerInvariant())", FilterOperation.Contains, false, "Test", "Name" }; + // NotIn + yield return new object[] { "Not(x.Name.Contains(\"Test\"))", FilterOperation.NotIn, true, "Test", "Name" }; + yield return new object[] { "Not(x.Name.ToLowerInvariant().Contains(\"test\".ToLowerInvariant()))", FilterOperation.NotIn, false, "Test", "Name" }; + // NotEquals // For checking strings yield return new object[] { "(x.Name != \"Test\")", FilterOperation.NotEqual, true, "Test", "Name" }; diff --git a/DynamicQueryBuilder/ExpressionBuilder.cs b/DynamicQueryBuilder/ExpressionBuilder.cs index 1d7c35a..a95cce8 100644 --- a/DynamicQueryBuilder/ExpressionBuilder.cs +++ b/DynamicQueryBuilder/ExpressionBuilder.cs @@ -519,8 +519,9 @@ internal static Expression BuildFilterExpression(ParameterExpression param, Filt return Expression.Call(parentMember, _stringContainsMethod, constant); case FilterOperation.NotIn: - var containsExpression = Expression.Call(parentMember, _stringContainsMethod, constant); - return Expression.Not(containsExpression); + return parentMember.Type == typeof(string) + ? Expression.Not(Expression.Call(parentMember, _stringContainsMethod, constant)) + : Expression.Not(Expression.Call(compareToExpression, _stringContainsMethod, constant)); case FilterOperation.GreaterThan: return parentMember.Type == typeof(string) From ec404e45491df0ec0856875ea0788a66509f7eba Mon Sep 17 00:00:00 2001 From: Siyovush Kadyrov Date: Thu, 19 Mar 2020 15:47:17 +0300 Subject: [PATCH 4/4] Integration test added and Docs updated --- .../Tests/EFIntegrationTests.cs | 29 ++++++++++++++++++- docs/dqb.org | 3 ++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/DynamicQueryBuilder.IntegrationTests/EntityFramework/Tests/EFIntegrationTests.cs b/DynamicQueryBuilder.IntegrationTests/EntityFramework/Tests/EFIntegrationTests.cs index 1ddbf8a..e306629 100644 --- a/DynamicQueryBuilder.IntegrationTests/EntityFramework/Tests/EFIntegrationTests.cs +++ b/DynamicQueryBuilder.IntegrationTests/EntityFramework/Tests/EFIntegrationTests.cs @@ -162,7 +162,7 @@ public void FiltersShouldWork() IgnorePredefinedOrders = true }).ToList(); - var resultOfStringsComparisonTest = queryable.ApplyFilters(new DynamicQueryOptions + var resultOfStringsComparisonTest = queryable.ApplyFilters(new DynamicQueryOptions { Filters = new List { @@ -417,5 +417,32 @@ public void CaseSensitivityShouldWork() Assert.Empty(resultOfnoResultFilterWithCSDisabledAndInvalidCase); Assert.True(stringsComparisonWithCaseSensitivity.Count == 0); } + + [Fact] + public void ShouldApplyNotInFilter() + { + var queryable = _ctx.Users.AsQueryable(); + + var notInFilter = new DynamicQueryOptions + { + Filters = new List + { + new Filter + { + Operator = FilterOperation.NotIn, + PropertyName = "Name", + Value = "_1", + CaseSensitive = false + } + }, + IgnorePredefinedOrders = true + }; + + var result = queryable.ApplyFilters(notInFilter).ToList(); + Assert.NotEmpty(result); + Assert.Equal("Test_2", result[0].Name); + Assert.Equal(queryable.Count()-1, result.Count()); + } } + } diff --git a/docs/dqb.org b/docs/dqb.org index e886980..fb90ca4 100644 --- a/docs/dqb.org +++ b/docs/dqb.org @@ -61,6 +61,7 @@ In, Equals, LessThan, Contains, +NotIn, NotEqual, EndsWith, StartsWith, @@ -429,6 +430,7 @@ DQB has default operation short codes for shorter HTTP queries which are below; { "eq", FilterOperation.Equals }, { "lt", FilterOperation.LessThan }, { "cts", FilterOperation.Contains }, +{ "nin", FilterOperation.NotIn }, { "ne", FilterOperation.NotEqual }, { "ew", FilterOperation.EndsWith }, { "sw", FilterOperation.StartsWith }, @@ -451,6 +453,7 @@ var mySettings = new DynamicQueryBuilderSettings { "my_eq", FilterOperation.Equals }, { "my_lt", FilterOperation.LessThan }, { "my_cts", FilterOperation.Contains }, + { "my_nin", FilterOperation.NotIn }, { "my_ne", FilterOperation.NotEqual }, { "my_ew", FilterOperation.EndsWith }, { "my_sw", FilterOperation.StartsWith },