admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2018-11-30 00:10:05 +00:00
parent dc06fb0d87
commit 0ccb63afa0
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/AyaNova/biz/DataFilterBiz.cs
View File

@@ -263,9 +263,15 @@ namespace AyaNova.Biz
AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing required \"fld\" property "); AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing required \"fld\" property ");
if (filterItem["op"] == null) if (filterItem["op"] == null)
AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing required \"op\" property "); AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing required \"op\" property ");
else
{
var opType = filterItem["op"].Value<string>();
if (!FilterComparisonOperator.Operators.Contains(opType))
AddError(ValidationErrorType.InvalidValue, "Filter", $"Filter array item {i}, \"op\" value of \"{opType}\" is not a valid FilterComparisonOperator type");
}
if (filterItem["value"] == null) if (filterItem["value"] == null)
AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing required \"value\" property "); AddError(ValidationErrorType.RequiredPropertyEmpty, "Filter", $"Filter array item {i}, object is missing required \"value\" property ");
} }
} }
catch (Newtonsoft.Json.JsonReaderException ex) catch (Newtonsoft.Json.JsonReaderException ex)
{ {

33
server/AyaNova/biz/FilterComparisonOperator.cs
View File

@@ -1,3 +1,4 @@
using System.Collections.Generic;
namespace AyaNova.Biz namespace AyaNova.Biz
{ {
public static class FilterComparisonOperator public static class FilterComparisonOperator
@@ -6,13 +7,39 @@ namespace AyaNova.Biz
public const string GreaterThan = ">"; public const string GreaterThan = ">";
public const string GreaterThanOrEqualTo = ">="; public const string GreaterThanOrEqualTo = ">=";
public const string LessThan = "<"; public const string LessThan = "<";
public const string LessThanOrEqualTo = "<="; public const string LessThanOrEqualTo = "<=";
public const string NotEqual = "!="; public const string NotEqual = "!=";
public const string NotLike = "!%"; public const string NotLike = "!%";
public const string StartsWith = "%-"; public const string StartsWith = "%-";
public const string EndsWith = "-%"; public const string EndsWith = "-%";
public const string Contains = "-%-"; public const string Contains = "-%-";
public const string NotContains = "!-%-"; public const string NotContains = "!-%-";
public static List<string> operators = null;
public static List<string> Operators
{
get
{
if (operators == null)
{
operators = new List<string>();
operators.Add(Equality);
operators.Add(GreaterThan);
operators.Add(GreaterThanOrEqualTo);
operators.Add(LessThan);
operators.Add(LessThanOrEqualTo);
operators.Add(NotEqual);
operators.Add(NotLike);
operators.Add(StartsWith);
operators.Add(EndsWith);
operators.Add(Contains);
operators.Add(NotContains);
}
return operators;
}
}
} }
} }