diff --git a/Sieve/Services/SievePropertyMapper.cs b/Sieve/Services/SievePropertyMapper.cs index fa6b1eb..3030b7c 100644 --- a/Sieve/Services/SievePropertyMapper.cs +++ b/Sieve/Services/SievePropertyMapper.cs @@ -88,13 +88,11 @@ namespace Sieve.Services { try { - var me = _map[typeof(TEntity)] - .FirstOrDefault(kv => + return _map[typeof(TEntity)] + .FirstOrDefault(kv => kv.Value.Name.Equals(name, isCaseSensitive ? StringComparison.Ordinal : StringComparison.OrdinalIgnoreCase) && (canSortRequired ? kv.Value.CanSort : true) && - (canFilterRequired ? kv.Value.CanFilter : true)); - - return me.Key; + (canFilterRequired ? kv.Value.CanFilter : true)).Key; } catch (Exception ex) when (ex is KeyNotFoundException || ex is ArgumentNullException) { diff --git a/SieveUnitTests/Services/ApplicationSieveProcessor.cs b/SieveUnitTests/Services/ApplicationSieveProcessor.cs index 112fc41..dd66117 100644 --- a/SieveUnitTests/Services/ApplicationSieveProcessor.cs +++ b/SieveUnitTests/Services/ApplicationSieveProcessor.cs @@ -11,7 +11,11 @@ namespace SieveUnitTests.Services { public class ApplicationSieveProcessor : SieveProcessor { - public ApplicationSieveProcessor(IOptions options, ISieveCustomSortMethods customSortMethods, ISieveCustomFilterMethods customFilterMethods) : base(options, customSortMethods, customFilterMethods) + public ApplicationSieveProcessor( + IOptions options, + ISieveCustomSortMethods customSortMethods, + ISieveCustomFilterMethods customFilterMethods) + : base(options, customSortMethods, customFilterMethods) { }