#117: Added support for string.Contains and .EndsWith

Author: jcachat

src/CHANGELOG.TXT

@@ -46,3 +46,4 @@
 2.8.1: Fixed case problem when checking for Devart Oracle provider
 2.9: Added filter options to turn off applying filters to child properties or to prevent them from being applied recursively
 2.9.1: Changed Oracle version check to use 'product_component_version' instead of 'v$instance' which is restricted to admins
+2.10: Added support for string.Contains and .EndsWith

src/DynamicFiltersTests/ChildCollectionFiltersTests.cs

@@ -96,6 +96,17 @@ public void ChildCollection_ManyToManyLoadGeneratedTable()
             }
         }
 
+        //  Tests issue #117
+        [TestMethod]
+        public void ChildCollection_AnyContains()
+        {
+            using (var context = new TestContext())
+            {
+                var list = context.EntityISet.ToList();
+                Assert.IsTrue((list.Count == 1) && list.All(a => (a.ID == 1)));
+            }
+        }
+
         #region Models
 
         public class EntityBase
@@ -211,6 +222,19 @@ public EntityH()
             public bool IsDeleted { get; set; }
         }
 
+        public class EntityI : EntityBase
+        {
+            public ICollection<EntityIChild> Children { get; set; }
+        }
+
+        public class EntityIChild : EntityBase
+        {
+            public int ParentID { get; set; }
+            public EntityI Parent { get; set; }
+
+            public string ChildValue { get; set; }
+        }
+
         #endregion
 
         #region TestContext
@@ -231,6 +255,8 @@ public class TestContext : TestContextBase<TestContext>, ITestContext
             public DbSet<EntityFChild> EntityFChildSet { get; set; }
             public DbSet<EntityG> EntityGSet { get; set; }
             public DbSet<EntityH> EntityHSet { get; set; }
+            public DbSet<EntityI> EntityISet { get; set; }
+            public DbSet<EntityIChild> EntityIChildSet { get; set; }
 
             protected override void OnModelCreating(DbModelBuilder modelBuilder)
             {
@@ -266,6 +292,8 @@ protected override void OnModelCreating(DbModelBuilder modelBuilder)
 
                 modelBuilder.Filter("ISoftDeleteFilter", (ISoftDelete d) => d.IsDeleted, false);
 
+                modelBuilder.Filter("EntityIFilter", (EntityI i, string val) => i.Children.Any(c => c.ChildValue.Contains(val)), () => "23");
+
                 //  TODO: Count()
                 //  TODO: Count([predicate])
                 //  TODO: Where([predicate])
@@ -362,6 +390,25 @@ public override void Seed()
                     }
                 });
 
+                EntityISet.Add(new EntityI
+                {
+                    ID = 1,
+                    Children = new List<EntityIChild>
+                    {
+                        new EntityIChild { ID = 1, ChildValue = "1234" },
+                        new EntityIChild { ID = 2, ChildValue = "5678" },
+                    }
+                });
+                EntityISet.Add(new EntityI
+                {
+                    ID = 2,
+                    Children = new List<EntityIChild>
+                    {
+                        new EntityIChild { ID = 3, ChildValue = "abcd" },
+                        new EntityIChild { ID = 4, ChildValue = "edfg" },
+                    }
+                });
+
                 SaveChanges();
             }
         }

src/DynamicFiltersTests/DynamicFiltersTests.csproj

@@ -110,7 +110,7 @@
     <Compile Include="EffortTests.cs" />
     <Compile Include="BitwiseOperatorTests.cs" />
     <Compile Include="ChildPropertyFiltersTests.cs" />
-    <Compile Include="StartsWithTests.cs" />
+    <Compile Include="StringFunctionsTests.cs" />
     <Compile Include="ContainsTests.cs" />
     <Compile Include="DataTypeTests.cs" />
     <Compile Include="DisableFilterTests.cs" />