From 6684524fcd77bce7b6d38d9d184c453f954df45a Mon Sep 17 00:00:00 2001
From: Alexander Weggerle <alexander@weggerle.de>
Date: Sat, 4 Jul 2020 21:16:54 +0200
Subject: [PATCH] Fix issue with spaces after comma and or filters

Combined filters separated with comma and a space resulted in an error.
Example:
Title==D, (Title|LikeCount)==3
Caused the error: "(Title not found"

Extended regex to allow whitespaces after the comma as documented.
---
 Sieve/Models/SieveModel.cs |  2 +-
 SieveUnitTests/General.cs  | 17 +++++++++++++++++
 2 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/Sieve/Models/SieveModel.cs b/Sieve/Models/SieveModel.cs
index c17910e..c05e633 100644
--- a/Sieve/Models/SieveModel.cs
+++ b/Sieve/Models/SieveModel.cs
@@ -13,7 +13,7 @@ namespace Sieve.Models
         where TFilterTerm : IFilterTerm, new()
         where TSortTerm : ISortTerm, new()
     {
-        private const string EscapedCommaPattern = @"(?<!($|[^\\])(\\\\)*?\\),";
+        private const string EscapedCommaPattern = @"(?<!($|[^\\])(\\\\)*?\\),\s*";
 
         [DataMember]
         public string Filters { get; set; }
diff --git a/SieveUnitTests/General.cs b/SieveUnitTests/General.cs
index b9dfa48..ba1e4c7 100644
--- a/SieveUnitTests/General.cs
+++ b/SieveUnitTests/General.cs
@@ -352,6 +352,23 @@ namespace SieveUnitTests
             Assert.AreEqual(3, entry.Id);
         }
 
+        [TestMethod]
+        public void CombinedAndOrWithSpaceFilteringWorks()
+        {
+            var model = new SieveModel()
+            {
+                Filters = "Title==D, (Title|LikeCount)==3",
+            };
+
+            var result = _processor.Apply(model, _posts);
+            var entry = result.FirstOrDefault();
+            var resultCount = result.Count();
+
+            Assert.IsNotNull(entry);
+            Assert.AreEqual(1, resultCount);
+            Assert.AreEqual(3, entry.Id);
+        }
+
         [TestMethod]
         public void OrValueFilteringWorks()
         {