fixed LuFilterDbo; tests; added filters in pkguid

Luticate2.Utils/Dbo/Filter/LuFilterBinder.cs

@@ -8,7 +8,7 @@ namespace Luticate2.Utils.Dbo.Filter
 {
     public class LuFilterBinder : IModelBinder
     {
-        private const string RegExp = "^([\\w\\-]+) *: *([^ \"\']+|\"[^\"]+\"|\'[^\']+\') *";
+        private const string RegExp = "^([\\w\\-]+) *: *([^ \"\']+|\"[^\"]*\"|\'[^\']*\') *";
 
         public static LuResult<LuFilterDbo> FromString(string data)
         {
@@ -24,13 +24,21 @@ namespace Luticate2.Utils.Dbo.Filter
                 match = Regex.Match(data, RegExp);
                 if (match.Success)
                 {
+                    var key = match.Groups[1].Value;
                     var value = match.Groups[2].Value;
                     if ((value.StartsWith("\"") && value.EndsWith("\"")) ||
                         (value.StartsWith("\'") && value.EndsWith("\'")))
                     {
-                        value = value.Remove(value.Length - 1, 1).Remove(0, 1);
+                        value = value.Remove(value.Length - 1, 1).Remove(0, 1).Trim();
+                    }
+                    if (!filters.ContainsKey(key))
+                    {
+                        filters.Add(key, value);
+                    }
+                    else
+                    {
+                        filters[key] = value;
                     }
-                    filters.Add(match.Groups[1].Value, value);
                     data = data.Remove(match.Index, match.Length);
                 }
             } while (match.Success);

Luticate2.Utils/Dbo/Filter/LuFilterDbo.cs

@@ -17,7 +17,7 @@ namespace Luticate2.Utils.Dbo.Filter
             return Filters[key];
         }
 
-        public bool GetFilterBool(string key, bool defaultValue)
+        public bool? GetFilterBool(string key, bool? defaultValue)
         {
             var value = GetFilterString(key, "").ToLower();
             if (value == "true")
@@ -31,7 +31,7 @@ namespace Luticate2.Utils.Dbo.Filter
             return defaultValue;
         }
 
-        public int GetFilterInt(string key, int defaultValue)
+        public int? GetFilterInt(string key, int? defaultValue)
         {
             int v;
             if (int.TryParse(GetFilterString(key, ""), out v))
@@ -41,7 +41,7 @@ namespace Luticate2.Utils.Dbo.Filter
             return defaultValue;
         }
 
-        public double GetFilterFloat(string key, double defaultValue)
+        public double? GetFilterFloat(string key, double? defaultValue)
         {
             double v;
             if (double.TryParse(GetFilterString(key, ""), out v))

TestUtils/Binders/LuFilterBinderTest.cs

@@ -98,12 +98,17 @@ namespace TestUtils.Binders
         [Fact]
         public void Test9()
         {
-            var res = LuFilterBinder.FromString("test: \'42 a filter value\' some text");
+            var res = LuFilterBinder.FromString("test: \'42 a filter value\' test-2: ' 42 ' test-3: ' 4 ' test-3: ' ' some text");
             Assert.NotNull(res);
             Assert.NotNull(res.Data);
             Assert.Equal(LuStatus.Success, res.Status);
             Assert.Equal("some text", res.Data.Query);
-            Assert.Equal(new Dictionary<string, string>{{"test", "42 a filter value"}}, res.Data.Filters);
+            Assert.Equal(new Dictionary<string, string>
+            {
+                {"test", "42 a filter value"},
+                {"test-2", "42"},
+                {"test-3", ""}
+            }, res.Data.Filters);
         }
 
         [Fact]

TestUtils/DataAccess/LuUtilsPkGuidDataAccess.cs

@@ -63,7 +63,11 @@ namespace TestUtils.DataAccess
 
         protected override Expression<Func<pk_guid, bool>> GetFilterExpression(LuFilterDbo filter)
         {
-            return model => LuUtilsDbContext.lu_texts_match(filter.Query, model.some_text + " " + model.some_int.ToString());
+            var someText = filter.GetFilterString("someText", null);
+            var someInt = filter.GetFilterInt("someInt", null);
+            return model => LuUtilsDbContext.lu_texts_match(filter.Query, model.some_text + " " + model.some_int.ToString())
+                && (someText == null || LuUtilsDbContext.lu_texts_match(someText, model.some_text))
+                            && (someInt == null || model.some_int == someInt);
         }
 
         protected override LuResult<bool> _Add(pk_guid model, PkGuidAddDbo dbo, LuUtilsDbContext db, DbSet<pk_guid> table)