public-mirrors/Sieve
1
0
Fork 0
mirror of https://github.com/Biarity/Sieve.git synced 2024-11-23 22:12:48 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #90 from awegg/fix_filter_ordering

Browse Source 
Fix issue where the order of Filter expressions changed the result.
This commit is contained in:
Ashish Patel 2020-10-23 00:28:14 +05:30 committed by GitHub
commit 9bbc09898e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Sieve/Models/SieveModel.cs
View File

@ -44,11 +44,8 @@ namespace Sieve.Models
{ {
Filter = subfilters + filterOpAndVal Filter = subfilters + filterOpAndVal
}; };
if (!value.Any(f => f.Names.Any(n => filterTerm.Names.Any(n2 => n2 == n))))
{
value.Add(filterTerm); value.Add(filterTerm);
} }
}
else else
{ {
var filterTerm = new TFilterTerm var filterTerm = new TFilterTerm

18
SieveUnitTests/General.cs
View File

@ -352,6 +352,24 @@ namespace SieveUnitTests
Assert.AreEqual(3, entry.Id); Assert.AreEqual(3, entry.Id);
} }
[DataTestMethod]
[DataRow("CategoryId==1,(CategoryId|LikeCount)==50")]
[DataRow("(CategoryId|LikeCount)==50,CategoryId==1")]
public void CombinedAndOrFilterIndependentOfOrder(string filter)
{
var model = new SieveModel()
{
Filters = filter,
};
var result = _processor.Apply(model, _posts);
var entry = result.FirstOrDefault();
var resultCount = result.Count();
Assert.IsNotNull(entry);
Assert.AreEqual(1, resultCount);
}
[TestMethod] [TestMethod]
public void OrValueFilteringWorks() public void OrValueFilteringWorks()
{ {