Added tests for start/end with and fixed bug

Author: garvincasimir

src/DatatablesParser/DatatablesParser.cs

@@ -19,8 +19,8 @@ public class Parser<T> where T : class
         private int _take;
         private int _skip;
         private bool _sortDisabled = false;
-        private string _startsWithtoken = "*|";
-        private string _endsWithToken = "|*";
+        private string _startsWithtoken = Constants.DEFAULT_STARTS_WITH_TOKEN;
+        private string _endsWithToken = Constants.DEFAULT_ENDS_WITH_TOKEN;
         private bool _isEnumerableQuery; 
 
         private Dictionary<string,Expression> _converters = new Dictionary<string, Expression>();
@@ -282,6 +282,23 @@ private string GetFilterFn(string filter)
             }
         }
 
+        private string RemoveFilterTokens(string filter)
+        {
+            string untoken = filter;
+
+            if(untoken.StartsWith(_startsWithtoken))
+            {
+                untoken = untoken.Remove(0,_startsWithtoken.Length);
+            }
+            
+            if(untoken.EndsWith(_endsWithToken))
+            {
+                untoken = untoken.Remove(filter.LastIndexOf(_endsWithToken),_endsWithToken.Length);
+            }
+
+            return untoken;
+        }
+
         /// <summary>
         /// Generate a lamda expression based on a search filter for all mapped columns
         /// </summary>
@@ -297,6 +314,7 @@ private Expression<Func<T, bool>> GenerateEntityFilter()
                 if(!string.IsNullOrWhiteSpace(filter))
                 {
                     globalFilterFn = GetFilterFn(filter);
+                    filter = RemoveFilterTokens(filter);
                     globalFilterConst = Expression.Constant(filter.ToLower());
                 }
 
@@ -318,7 +336,8 @@ private Expression<Func<T, bool>> GenerateEntityFilter()
                     ConstantExpression individualFilterConst = null;
                     if(!string.IsNullOrWhiteSpace(propMap.Value.Filter))
                     {
-                        propFilterFn = GetFilterFn(propMap.Value.Filter);    
+                        propFilterFn = GetFilterFn(propMap.Value.Filter); 
+                        propMap.Value.Filter = RemoveFilterTokens(propMap.Value.Filter);   
                         individualFilterConst = Expression.Constant(propMap.Value.Filter.ToLower());
                     } 
 
@@ -440,6 +459,9 @@ public class Constants
         public const string STARTS_WITH_FN = "StartsWith";
         public const string ENDS_WITH_FN = "EndsWith";
 
+        public const string DEFAULT_STARTS_WITH_TOKEN = "*|";
+        public const string DEFAULT_ENDS_WITH_TOKEN = "|*";
+
         public static string GetKey(string format,string index)
         {
             return String.Format(format, index);

test/DatatablesParser.Tests/LinqToObjectTests.cs

@@ -105,5 +105,42 @@ public void TotalDisplayIndividualMutiTest()
 
         }
 
+        [Fact]
+        public void StartsWithTest()
+        {
+            var context = TestHelper.GetInMemoryContext();
+            var p = TestHelper.CreateParams();
+            var displayLength = 1;
+
+            //Set filter parameter
+            p[Constants.SEARCH_KEY] = new StringValues(Constants.DEFAULT_STARTS_WITH_TOKEN + "Cr");
+
+            var parser = new Parser<Person>(p, context.People.ToList().AsQueryable());
+
+            Console.WriteLine("InMemory - StartsWithTest: {0}",context.People.Count());
+
+            Assert.Equal(displayLength, parser.Parse().recordsFiltered);
+
+        }
+
+        [Fact]
+        public void EndsWithTest()
+        {
+            var context = TestHelper.GetInMemoryContext();
+            var p = TestHelper.CreateParams();
+            var displayLength = 4;
+
+            //Set filter parameter
+            p[Constants.SEARCH_KEY] = new StringValues("ie" + Constants.DEFAULT_ENDS_WITH_TOKEN );
+
+            var parser = new Parser<Person>(p, context.People.ToList().AsQueryable());
+
+            Console.WriteLine("InMemory - EndsWithTest: {0}",context.People.Count());
+
+            Assert.Equal(displayLength, parser.Parse().recordsFiltered);
+
+        }
+
+
     }
 }