Fixed logic in Enumerable path and added tests

garvincasimir · Nov 19, 2017 · 4635e7e · 4635e7e
1 parent 6a78c95
commit 4635e7e
Show file tree

Hide file tree

Showing 6 changed files with 98 additions and 6 deletions.
diff --git a/src/DatatablesParser/DatatablesParser.cs b/src/DatatablesParser/DatatablesParser.cs
@@ -246,20 +246,28 @@ private bool EnumerablFilter(T item)
         {
 
                 var globalFilter = _config[Constants.SEARCH_KEY]; 
-
+                var globalMatch = false;
+                var individualMatch = true;
                 foreach (var map in _propertyMap.Where(m => m.Value.Searchable))
                 {
                     var propValue = Convert.ToString(map.Value.Property.GetValue(item, null)).ToLower();
                     if (!string.IsNullOrWhiteSpace(globalFilter) && propValue.Contains(globalFilter.ToLower()))
                     {
-                        return true;
+                        globalMatch = true;
                     }
-                    if (!string.IsNullOrWhiteSpace(map.Value.Filter) && propValue.Contains(map.Value.Filter.ToLower()))
+                    if (!string.IsNullOrWhiteSpace(map.Value.Filter) && !propValue.Contains(map.Value.Filter.ToLower()))
                     {
-                        return true;
+                        individualMatch = false;
                     }
                 }
-                return false;
+
+                if(!string.IsNullOrWhiteSpace(globalFilter))
+                {
+                    return globalMatch && individualMatch;
+                }
+
+                return individualMatch;
+
         }
 
         /// <summary>

diff --git a/src/DatatablesParser/DatatablesParser.csproj b/src/DatatablesParser/DatatablesParser.csproj
@@ -4,7 +4,7 @@
     <TargetFramework>netstandard1.3</TargetFramework>
     <AssemblyName>DatatablesParser</AssemblyName>
     <PackageId>DatatablesParser-core</PackageId>
-    <PackageVersion>1.2.0</PackageVersion>
+    <PackageVersion>1.2.1</PackageVersion>
     <PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
     <PackageTags>C# Datatables Datatables.net javascript parser json Linq entity framework asp.net mvc grid table database query builder core</PackageTags>
     <PackageProjectUrl>https://github.com/garvincasimir/csharp-datatables-parser</PackageProjectUrl>

diff --git a/test/DatatablesParser.Tests/LinqToObjectTests.cs b/test/DatatablesParser.Tests/LinqToObjectTests.cs
@@ -84,6 +84,26 @@ public void TotalDisplayIndividualTest()
 
         }
 
+        [Fact]
+        public void TotalDisplayIndividualMutiTest()
+        {
+            var context = TestHelper.GetInMemoryContext();
+            var p = TestHelper.CreateParams();
+            var displayLength = 1;
+
+
+            //Set filter parameter
+            p[Constants.SEARCH_KEY] = new StringValues("a");
+            p[Constants.GetKey(Constants.SEARCH_VALUE_PROPERTY_FORMAT, "0")] = "omie";
+            p[Constants.GetKey(Constants.SEARCH_VALUE_PROPERTY_FORMAT, "1")] = "mmer";
+
+            var parser = new Parser<Person>(p, context.People);
+
+            Console.WriteLine("InMemory - Total People TotalDisplayIndividualMutiTest: {0}",context.People.Count());
+
+            Assert.Equal(displayLength, parser.Parse().recordsFiltered);
+
+        }
 
     }
 }
diff --git a/test/DatatablesParser.Tests/MssqlEntityTests.cs b/test/DatatablesParser.Tests/MssqlEntityTests.cs
@@ -105,6 +105,28 @@ public void TotalDisplayCustomFormatTest()
 
         }
 
+                [Fact]
+        public void TotalDisplayIndividualMutiTest()
+        {
+            var context = TestHelper.GetInMemoryContext();
+            var p = TestHelper.CreateParams();
+            var displayLength = 1;
+
+
+            //Set filter parameter
+            p[Constants.SEARCH_KEY] = new StringValues("a");
+            p[Constants.GetKey(Constants.SEARCH_VALUE_PROPERTY_FORMAT, "0")] = "omie";
+            p[Constants.GetKey(Constants.SEARCH_VALUE_PROPERTY_FORMAT, "1")] = "mmer";
+
+            var parser = new Parser<Person>(p, context.People);
+
+            Console.WriteLine("Mssql - Total People TotalDisplayIndividualMutiTest: {0}",context.People.Count());
+
+            Assert.Equal(displayLength, parser.Parse().recordsFiltered);
+
+        }
+
+
 
     }
 }
diff --git a/test/DatatablesParser.Tests/MysqlEntityTests.cs b/test/DatatablesParser.Tests/MysqlEntityTests.cs
@@ -107,6 +107,28 @@ public void TotalDisplayCustomFormatTest()
 
         }
 
+                [Fact]
+        public void TotalDisplayIndividualMutiTest()
+        {
+            var context = TestHelper.GetInMemoryContext();
+            var p = TestHelper.CreateParams();
+            var displayLength = 1;
+
+
+            //Set filter parameter
+            p[Constants.SEARCH_KEY] = new StringValues("a");
+            p[Constants.GetKey(Constants.SEARCH_VALUE_PROPERTY_FORMAT, "0")] = "omie";
+            p[Constants.GetKey(Constants.SEARCH_VALUE_PROPERTY_FORMAT, "1")] = "mmer";
+
+            var parser = new Parser<Person>(p, context.People);
+
+            Console.WriteLine("MySql - Total People TotalDisplayIndividualMutiTest: {0}",context.People.Count());
+
+            Assert.Equal(displayLength, parser.Parse().recordsFiltered);
+
+        }
+
+
 
     }
 }
diff --git a/test/DatatablesParser.Tests/PgsqlEntityTests.cs b/test/DatatablesParser.Tests/PgsqlEntityTests.cs
@@ -107,6 +107,26 @@ public void TotalDisplayCustomFormatTest()
 
         }
 
+                [Fact]
+        public void TotalDisplayIndividualMutiTest()
+        {
+            var context = TestHelper.GetInMemoryContext();
+            var p = TestHelper.CreateParams();
+            var displayLength = 1;
+
+
+            //Set filter parameter
+            p[Constants.SEARCH_KEY] = new StringValues("a");
+            p[Constants.GetKey(Constants.SEARCH_VALUE_PROPERTY_FORMAT, "0")] = "omie";
+            p[Constants.GetKey(Constants.SEARCH_VALUE_PROPERTY_FORMAT, "1")] = "mmer";
+
+            var parser = new Parser<Person>(p, context.People);
+
+            Console.WriteLine("Pgsql - Total People TotalDisplayIndividualMutiTest: {0}",context.People.Count());
+
+            Assert.Equal(displayLength, parser.Parse().recordsFiltered);
+
+        }
 
     }
 }