public-mirrors/Sieve
1
0
Fork 0
mirror of https://github.com/Biarity/Sieve.git synced 2025-11-04 10:49:09 +01:00
Code Issues Projects Releases Wiki Activity

Convert parsing from getters to methods

Browse Source
This commit is contained in:
Biarity
2018-07-06 11:12:45 +10:00
parent c816cf2f2a
commit f9c7fb4cb0
4 changed files with 57 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Sieve/Models/ISieveModel.cs
View File

@@ -20,8 +20,8 @@ namespace Sieve.Models
int? PageSize { get; set; }
List<TFilterTerm> FiltersParsed { get; }
List<TFilterTerm> GetFiltersParsed();
List<TSortTerm> SortsParsed { get; }
List<TSortTerm> GetSortsParsed();
}
}

102
Sieve/Models/SieveModel.cs
View File

@@ -24,77 +24,71 @@ namespace Sieve.Models
[DataMember, Range(1, int.MaxValue)]
public int? PageSize { get; set; }
public List<TFilterTerm> FiltersParsed
{
get
{
if (Filters != null)
{
var value = new List<TFilterTerm>();
foreach (var filter in Filters.Split(','))
{
if (string.IsNullOrWhiteSpace(filter)) continue;
if (filter.StartsWith("("))
public List<TFilterTerm> GetFiltersParsed()
{
if (Filters != null)
{
var value = new List<TFilterTerm>();
foreach (var filter in Filters.Split(','))
{
if (string.IsNullOrWhiteSpace(filter)) continue;
if (filter.StartsWith("("))
{
var filterOpAndVal = filter.Substring(filter.LastIndexOf(")") + 1);
var subfilters = filter.Replace(filterOpAndVal, "").Replace("(", "").Replace(")", "");
var filterTerm = new TFilterTerm
{
var filterOpAndVal = filter.Substring(filter.LastIndexOf(")") + 1);
var subfilters = filter.Replace(filterOpAndVal, "").Replace("(", "").Replace(")", "");
var filterTerm = new TFilterTerm
{
Filter = subfilters + filterOpAndVal
};
if (!value.Any(f => f.Names.Any(n => filterTerm.Names.Any(n2 => n2 == n))))
{
value.Add(filterTerm);
}
}
else
Filter = subfilters + filterOpAndVal
};
if (!value.Any(f => f.Names.Any(n => filterTerm.Names.Any(n2 => n2 == n))))
{
var filterTerm = new TFilterTerm
{
Filter = filter
};
value.Add(filterTerm);
}
}
return value;
}
else
{
return null;
else
{
var filterTerm = new TFilterTerm
{
Filter = filter
};
value.Add(filterTerm);
}
}
return value;
}
else
{
return null;
}
}
public List<TSortTerm> SortsParsed
public List<TSortTerm> GetSortsParsed()
{
get
if (Sorts != null)
{
if (Sorts != null)
var value = new List<TSortTerm>();
foreach (var sort in Sorts.Split(','))
{
var value = new List<TSortTerm>();
foreach (var sort in Sorts.Split(','))
if (string.IsNullOrWhiteSpace(sort)) continue;
var sortTerm = new TSortTerm()
{
if (string.IsNullOrWhiteSpace(sort)) continue;
var sortTerm = new TSortTerm()
{
Sort = sort
};
if (!value.Any(s => s.Name == sortTerm.Name))
{
value.Add(sortTerm);
}
Sort = sort
};
if (!value.Any(s => s.Name == sortTerm.Name))
{
value.Add(sortTerm);
}
return value;
}
else
{
return null;
}
return value;
}
else
{
return null;
}
}
}
}

8
Sieve/Services/SieveProcessor.cs
View File

@@ -164,14 +164,14 @@ namespace Sieve.Services
IQueryable<TEntity> result,
object[] dataForCustomMethods = null)
{
if (model?.FiltersParsed == null)
if (model?.GetFiltersParsed() == null)
{
return result;
}
Expression outerExpression = null;
var parameterExpression = Expression.Parameter(typeof(TEntity), "e");
foreach (var filterTerm in model.FiltersParsed)
foreach (var filterTerm in model.GetFiltersParsed())
{
Expression innerExpression = null;
foreach (var filterTermName in filterTerm.Names)
@@ -281,13 +281,13 @@ namespace Sieve.Services
IQueryable<TEntity> result,
object[] dataForCustomMethods = null)
{
if (model?.SortsParsed == null)
if (model?.GetSortsParsed() == null)
{
return result;
}
var useThenBy = false;
foreach (var sortTerm in model.SortsParsed)
foreach (var sortTerm in model.GetSortsParsed())
{
var property = GetSieveProperty<TEntity>(true, false, sortTerm.Name);