mirror of
https://github.com/Biarity/Sieve.git
synced 2024-11-21 21:12:50 +01:00
Replace SieveModel with ISieveModel
This commit is contained in:
parent
897baff364
commit
d90e887d62
@ -8,9 +8,9 @@ namespace Sieve.Services
|
|||||||
|
|
||||||
public interface ISieveProcessor<TEntity> where TEntity : class
|
public interface ISieveProcessor<TEntity> where TEntity : class
|
||||||
{
|
{
|
||||||
IQueryable<TEntity> ApplyAll(SieveModel model, IQueryable<TEntity> source);
|
IQueryable<TEntity> ApplyAll(ISieveModel model, IQueryable<TEntity> source);
|
||||||
IQueryable<TEntity> ApplySorting(SieveModel model, IQueryable<TEntity> result);
|
IQueryable<TEntity> ApplySorting(ISieveModel model, IQueryable<TEntity> result);
|
||||||
IQueryable<TEntity> ApplyFiltering(SieveModel model, IQueryable<TEntity> result);
|
IQueryable<TEntity> ApplyFiltering(ISieveModel model, IQueryable<TEntity> result);
|
||||||
IQueryable<TEntity> ApplyPagination(SieveModel model, IQueryable<TEntity> result);
|
IQueryable<TEntity> ApplyPagination(ISieveModel model, IQueryable<TEntity> result);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -57,33 +57,12 @@ namespace Sieve.Services
|
|||||||
_customFilterMethods = customFilterMethods;
|
_customFilterMethods = customFilterMethods;
|
||||||
}
|
}
|
||||||
|
|
||||||
//public SieveProcessor(ISieveCustomSortMethods<TEntity> customSortMethods,
|
|
||||||
// ISieveCustomFilterMethods<TEntity> customFilterMethods)
|
|
||||||
//{
|
|
||||||
// _options = new SieveOptions();
|
|
||||||
// _customSortMethods = customSortMethods;
|
|
||||||
// _customFilterMethods = customFilterMethods;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//public SieveProcessor(ISieveCustomSortMethods<TEntity> customSortMethods)
|
|
||||||
//{
|
|
||||||
// _options = options;
|
|
||||||
// _customSortMethods = customSortMethods;
|
|
||||||
//}
|
|
||||||
//
|
|
||||||
//public SieveProcessor(ISieveCustomFilterMethods<TEntity> customFilterMethods)
|
|
||||||
//{
|
|
||||||
// _options = options;
|
|
||||||
// _customFilterMethods = customFilterMethods;
|
|
||||||
//}
|
|
||||||
|
|
||||||
|
|
||||||
public SieveProcessor(IOptions<SieveOptions> options)
|
public SieveProcessor(IOptions<SieveOptions> options)
|
||||||
{
|
{
|
||||||
_options = options;
|
_options = options;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IQueryable<TEntity> ApplyAll(SieveModel model, IQueryable<TEntity> source)
|
public IQueryable<TEntity> ApplyAll(ISieveModel model, IQueryable<TEntity> source)
|
||||||
{
|
{
|
||||||
var result = source;
|
var result = source;
|
||||||
|
|
||||||
@ -102,7 +81,7 @@ namespace Sieve.Services
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IQueryable<TEntity> ApplySorting(SieveModel model, IQueryable<TEntity> result)
|
public IQueryable<TEntity> ApplySorting(ISieveModel model, IQueryable<TEntity> result)
|
||||||
{
|
{
|
||||||
if (model?.SortParsed == null)
|
if (model?.SortParsed == null)
|
||||||
return result;
|
return result;
|
||||||
@ -129,7 +108,7 @@ namespace Sieve.Services
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IQueryable<TEntity> ApplyFiltering(SieveModel model, IQueryable<TEntity> result)
|
public IQueryable<TEntity> ApplyFiltering(ISieveModel model, IQueryable<TEntity> result)
|
||||||
{
|
{
|
||||||
if (model?.FilterParsed == null)
|
if (model?.FilterParsed == null)
|
||||||
return result;
|
return result;
|
||||||
@ -198,7 +177,7 @@ namespace Sieve.Services
|
|||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
public IQueryable<TEntity> ApplyPagination(SieveModel model, IQueryable<TEntity> result)
|
public IQueryable<TEntity> ApplyPagination(ISieveModel model, IQueryable<TEntity> result)
|
||||||
{
|
{
|
||||||
if (model?.Page == null || model?.PageSize == null)
|
if (model?.Page == null || model?.PageSize == null)
|
||||||
if (_options.Value.DefaultPageSize > 0)
|
if (_options.Value.DefaultPageSize > 0)
|
||||||
|
Loading…
Reference in New Issue
Block a user