From d86e35f77c8743b60fa02f3da7b714b86cf58aab Mon Sep 17 00:00:00 2001 From: Biarity Date: Sun, 17 Nov 2019 09:15:07 +1000 Subject: [PATCH] v2.3.3 --- Sieve/Services/SieveProcessor.cs | 2 +- Sieve/Sieve.csproj | 7 +++++-- SieveTests/Controllers/PostsController.cs | 2 +- SieveTests/Entities/ApplicationDbContext.cs | 2 +- SieveTests/Entities/Post.cs | 2 +- .../Migrations/20180522013323_AddDateLastViewedColumn.cs | 5 ++--- SieveTests/Services/ApplicationSieveProcessor.cs | 2 +- SieveTests/Services/SieveCustomFilterMethods.cs | 6 +++--- SieveTests/Startup.cs | 2 +- SieveUnitTests/Entities/BaseEntity.cs | 2 +- SieveUnitTests/Entities/Comment.cs | 5 ++--- SieveUnitTests/Entities/Post.cs | 2 +- SieveUnitTests/General.cs | 2 +- SieveUnitTests/Mapper.cs | 8 ++++---- SieveUnitTests/Services/ApplicationSieveProcessor.cs | 2 +- 15 files changed, 26 insertions(+), 25 deletions(-) diff --git a/Sieve/Services/SieveProcessor.cs b/Sieve/Services/SieveProcessor.cs index 58b9267..5913960 100644 --- a/Sieve/Services/SieveProcessor.cs +++ b/Sieve/Services/SieveProcessor.cs @@ -186,7 +186,7 @@ namespace Sieve.Services { propertyValue = Expression.PropertyOrField(propertyValue, part); } - + if (filterTerm.Values == null) continue; foreach (var filterTermValue in filterTerm.Values) diff --git a/Sieve/Sieve.csproj b/Sieve/Sieve.csproj index c0c3446..344c5af 100644 --- a/Sieve/Sieve.csproj +++ b/Sieve/Sieve.csproj @@ -2,7 +2,7 @@ netstandard2.0 - 2.3.2 + 2.3.3 Sieve is a simple, clean, and extensible framework for .NET Core that adds sorting, filtering, and pagination functionality out of the box. Most common use case would be for serving ASP.NET Core GET queries. Documentation available on GitHub: https://github.com/Biarity/Sieve/ Copyright 2018 @@ -10,7 +10,10 @@ https://github.com/Biarity/Sieve https://emojipedia-us.s3.amazonaws.com/thumbs/240/twitter/120/alembic_2697.png - Allow subvalues with identical names (#54) + Only Skip when pageSize > 0 (#63) +Added support for generic filter and sort methods (#60) +Don't process when filterTerm.Values is null (#59) + true true Biarity diff --git a/SieveTests/Controllers/PostsController.cs b/SieveTests/Controllers/PostsController.cs index 30df4db..6ab09fa 100644 --- a/SieveTests/Controllers/PostsController.cs +++ b/SieveTests/Controllers/PostsController.cs @@ -7,7 +7,7 @@ using SieveTests.Entities; namespace SieveTests.Controllers { - [Route("api/[controller]/[action]")] + [Route("api/[controller]/[action]")] public class PostsController : Controller { private readonly ISieveProcessor _sieveProcessor; diff --git a/SieveTests/Entities/ApplicationDbContext.cs b/SieveTests/Entities/ApplicationDbContext.cs index 9bcd634..6c745e7 100644 --- a/SieveTests/Entities/ApplicationDbContext.cs +++ b/SieveTests/Entities/ApplicationDbContext.cs @@ -2,7 +2,7 @@ namespace SieveTests.Entities { - public class ApplicationDbContext : DbContext + public class ApplicationDbContext : DbContext { public ApplicationDbContext(DbContextOptions options) : base(options) { } diff --git a/SieveTests/Entities/Post.cs b/SieveTests/Entities/Post.cs index 23d2cb4..e275c3c 100644 --- a/SieveTests/Entities/Post.cs +++ b/SieveTests/Entities/Post.cs @@ -4,7 +4,7 @@ using Sieve.Attributes; namespace SieveTests.Entities { - public class Post + public class Post { public int Id { get; set; } diff --git a/SieveTests/Migrations/20180522013323_AddDateLastViewedColumn.cs b/SieveTests/Migrations/20180522013323_AddDateLastViewedColumn.cs index f702d89..b42ab3e 100644 --- a/SieveTests/Migrations/20180522013323_AddDateLastViewedColumn.cs +++ b/SieveTests/Migrations/20180522013323_AddDateLastViewedColumn.cs @@ -1,6 +1,5 @@ -using Microsoft.EntityFrameworkCore.Migrations; -using System; -using System.Collections.Generic; +using System; +using Microsoft.EntityFrameworkCore.Migrations; namespace SieveTests.Migrations { diff --git a/SieveTests/Services/ApplicationSieveProcessor.cs b/SieveTests/Services/ApplicationSieveProcessor.cs index 87e64db..039352a 100644 --- a/SieveTests/Services/ApplicationSieveProcessor.cs +++ b/SieveTests/Services/ApplicationSieveProcessor.cs @@ -5,7 +5,7 @@ using SieveTests.Entities; namespace SieveTests.Services { - public class ApplicationSieveProcessor : SieveProcessor + public class ApplicationSieveProcessor : SieveProcessor { public ApplicationSieveProcessor(IOptions options, ISieveCustomSortMethods customSortMethods, ISieveCustomFilterMethods customFilterMethods) : base(options, customSortMethods, customFilterMethods) { diff --git a/SieveTests/Services/SieveCustomFilterMethods.cs b/SieveTests/Services/SieveCustomFilterMethods.cs index b1df4c7..2a366ea 100644 --- a/SieveTests/Services/SieveCustomFilterMethods.cs +++ b/SieveTests/Services/SieveCustomFilterMethods.cs @@ -1,10 +1,10 @@ -using Sieve.Services; +using System.Linq; +using Sieve.Services; using SieveTests.Entities; -using System.Linq; namespace SieveTests.Services { - public class SieveCustomFilterMethods : ISieveCustomFilterMethods + public class SieveCustomFilterMethods : ISieveCustomFilterMethods { public IQueryable IsNew(IQueryable source, string op, string[] values) => source.Where(p => p.LikeCount < 100 && p.CommentCount < 5); diff --git a/SieveTests/Startup.cs b/SieveTests/Startup.cs index c5b9e3e..415abd9 100644 --- a/SieveTests/Startup.cs +++ b/SieveTests/Startup.cs @@ -15,7 +15,7 @@ using SieveTests.Services; namespace SieveTests { - public class Startup + public class Startup { public Startup(IConfiguration configuration) { diff --git a/SieveUnitTests/Entities/BaseEntity.cs b/SieveUnitTests/Entities/BaseEntity.cs index 1ea6697..1bb6af3 100644 --- a/SieveUnitTests/Entities/BaseEntity.cs +++ b/SieveUnitTests/Entities/BaseEntity.cs @@ -3,7 +3,7 @@ using Sieve.Attributes; namespace SieveUnitTests.Entities { - public class BaseEntity + public class BaseEntity { public int Id { get; set; } diff --git a/SieveUnitTests/Entities/Comment.cs b/SieveUnitTests/Entities/Comment.cs index 0e67563..4d3a299 100644 --- a/SieveUnitTests/Entities/Comment.cs +++ b/SieveUnitTests/Entities/Comment.cs @@ -1,9 +1,8 @@ -using System; -using Sieve.Attributes; +using Sieve.Attributes; namespace SieveUnitTests.Entities { - public class Comment : BaseEntity + public class Comment : BaseEntity { [Sieve(CanFilter = true)] public string Text { get; set; } diff --git a/SieveUnitTests/Entities/Post.cs b/SieveUnitTests/Entities/Post.cs index 1503486..9ae8e34 100644 --- a/SieveUnitTests/Entities/Post.cs +++ b/SieveUnitTests/Entities/Post.cs @@ -3,7 +3,7 @@ using Sieve.Attributes; namespace SieveUnitTests.Entities { - public class Post : BaseEntity + public class Post : BaseEntity { [Sieve(CanFilter = true, CanSort = true)] diff --git a/SieveUnitTests/General.cs b/SieveUnitTests/General.cs index 58eb50a..b9dfa48 100644 --- a/SieveUnitTests/General.cs +++ b/SieveUnitTests/General.cs @@ -351,7 +351,7 @@ namespace SieveUnitTests Assert.AreEqual(1, resultCount); Assert.AreEqual(3, entry.Id); } - + [TestMethod] public void OrValueFilteringWorks() { diff --git a/SieveUnitTests/Mapper.cs b/SieveUnitTests/Mapper.cs index be32dd1..7da20a4 100644 --- a/SieveUnitTests/Mapper.cs +++ b/SieveUnitTests/Mapper.cs @@ -1,14 +1,14 @@ +using System.Collections.Generic; +using System.Linq; using Microsoft.VisualStudio.TestTools.UnitTesting; +using Sieve.Exceptions; using Sieve.Models; using SieveUnitTests.Entities; using SieveUnitTests.Services; -using System.Linq; -using System.Collections.Generic; -using Sieve.Exceptions; namespace SieveUnitTests { - [TestClass] + [TestClass] public class Mapper { private readonly ApplicationSieveProcessor _processor; diff --git a/SieveUnitTests/Services/ApplicationSieveProcessor.cs b/SieveUnitTests/Services/ApplicationSieveProcessor.cs index 7cee456..726c706 100644 --- a/SieveUnitTests/Services/ApplicationSieveProcessor.cs +++ b/SieveUnitTests/Services/ApplicationSieveProcessor.cs @@ -5,7 +5,7 @@ using SieveUnitTests.Entities; namespace SieveUnitTests.Services { - public class ApplicationSieveProcessor : SieveProcessor + public class ApplicationSieveProcessor : SieveProcessor { public ApplicationSieveProcessor( IOptions options,