From 8c0bdb05de5df6aa6ddb9b14971b662408d4a40d Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 14 Feb 2020 20:53:33 +0000 Subject: [PATCH] --- server/AyaNova/biz/DataListViewBiz.cs | 143 +++++++++++++------------- 1 file changed, 70 insertions(+), 73 deletions(-) diff --git a/server/AyaNova/biz/DataListViewBiz.cs b/server/AyaNova/biz/DataListViewBiz.cs index 8460eb8f..69e65400 100644 --- a/server/AyaNova/biz/DataListViewBiz.cs +++ b/server/AyaNova/biz/DataListViewBiz.cs @@ -232,21 +232,23 @@ namespace AyaNova.Biz AddError(ApiErrorCode.VALIDATION_LENGTH_EXCEEDED, "ListKey", "255 max"); //Filter json must parse + //this is all automated normally so not going to do too much parsing here + //just ensure it's basically there if (!string.IsNullOrWhiteSpace(inObj.ListView)) { try { - var v = JArray.Parse(inObj.Filter); + var v = JArray.Parse(inObj.ListView); for (int i = 0; i < v.Count; i++) { var filterItem = v[i]; if (filterItem["fld"] == null) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "Filter", $"Filter array item {i}, object is missing required \"fld\" property "); + AddError(ApiErrorCode.VALIDATION_REQUIRED, "ListView", $"ListView array item {i}, object is missing required \"fld\" property "); else { var fld = filterItem["fld"].Value(); if (string.IsNullOrWhiteSpace(fld)) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "Filter", $"Filter array item {i}, \"fld\" property is empty and required"); + AddError(ApiErrorCode.VALIDATION_REQUIRED, "ListView", $"ListView array item {i}, \"fld\" property is empty and required"); //validate the field name if we can if (DataList != null) @@ -256,38 +258,33 @@ namespace AyaNova.Biz if (TheField == null) { - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Filter", $"Filter array item {i}, fld property value \"{fld}\" is not a valid value for ListKey specified"); + AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "ListView", $"ListView array item {i}, fld property value \"{fld}\" is not a valid value for ListKey specified"); } - else if (TheField.IsFilterable == false) - { - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Filter", $"Filter array item {i}, fld property value \"{fld}\" is not filterable"); - } - - - + } } - if (filterItem["op"] == null) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "Filter", $"Filter array item {i}, object is missing required \"op\" property "); - else - { - var opType = filterItem["op"].Value(); - if (!DataListFilterComparisonOperator.Operators.Contains(opType)) - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Filter", $"Filter array item {i}, \"op\" property value of \"{opType}\" is not a valid FilterComparisonOperator type"); - } + //This is the old filter validation code but at this point only going to validate that the fields are present and valid as the bare minimum + // if (filterItem["op"] == null) + // AddError(ApiErrorCode.VALIDATION_REQUIRED, "Filter", $"Filter array item {i}, object is missing required \"op\" property "); + // else + // { + // var opType = filterItem["op"].Value(); + // if (!DataListFilterComparisonOperator.Operators.Contains(opType)) + // AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Filter", $"Filter array item {i}, \"op\" property value of \"{opType}\" is not a valid FilterComparisonOperator type"); + // } - if (filterItem["value"] == null) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "Filter", $"Filter array item {i}, object is missing or is empty the required \"value\" property "); - else - { - //check if the value is present, not what it is exactly, just that it's present - //value also could contain relative date tokens, not that it checks them anyway but just noting it here - if (filterItem["value"].Type == JTokenType.String && string.IsNullOrWhiteSpace(filterItem["value"].Value())) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "Filter", $"Filter array item {i}, object is missing or is empty the required \"value\" property "); + // if (filterItem["value"] == null) + // AddError(ApiErrorCode.VALIDATION_REQUIRED, "Filter", $"Filter array item {i}, object is missing or is empty the required \"value\" property "); + // else + // { + // //check if the value is present, not what it is exactly, just that it's present + // //value also could contain relative date tokens, not that it checks them anyway but just noting it here + // if (filterItem["value"].Type == JTokenType.String && string.IsNullOrWhiteSpace(filterItem["value"].Value())) + // AddError(ApiErrorCode.VALIDATION_REQUIRED, "Filter", $"Filter array item {i}, object is missing or is empty the required \"value\" property "); - if (filterItem["value"].Type == JTokenType.Array && filterItem["value"].Count() == 0) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "Filter", $"Filter array item {i}, object is missing or is empty the required \"value\" property ARRAY "); - } + // if (filterItem["value"].Type == JTokenType.Array && filterItem["value"].Count() == 0) + // AddError(ApiErrorCode.VALIDATION_REQUIRED, "Filter", $"Filter array item {i}, object is missing or is empty the required \"value\" property ARRAY "); + // } //NOTE: value of nothing, null or empty is a valid value so no checking for it here @@ -295,58 +292,58 @@ namespace AyaNova.Biz } catch (Newtonsoft.Json.JsonReaderException ex) { - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Filter", "Filter is not valid JSON string: " + ex.Message); + AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "ListView", "ListView is not valid JSON string: " + ex.Message); } } - //VALIDATE SORT - //Filter json must parse - if (!string.IsNullOrWhiteSpace(inObj.Sort)) - { - try - { - var v = JArray.Parse(inObj.Sort); - for (int i = 0; i < v.Count; i++) - { - var sortItem = v[i]; - if (sortItem["fld"] == null) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "Sort", $"Sort array item {i}, object is missing required \"fld\" property "); - else - { - var fld = sortItem["fld"].Value(); - if (string.IsNullOrWhiteSpace(fld)) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "Sort", $"Sort array item {i}, \"fld\" property is empty and required"); + // //VALIDATE SORT + // //Filter json must parse + // if (!string.IsNullOrWhiteSpace(inObj.Sort)) + // { + // try + // { + // var v = JArray.Parse(inObj.Sort); + // for (int i = 0; i < v.Count; i++) + // { + // var sortItem = v[i]; + // if (sortItem["fld"] == null) + // AddError(ApiErrorCode.VALIDATION_REQUIRED, "Sort", $"Sort array item {i}, object is missing required \"fld\" property "); + // else + // { + // var fld = sortItem["fld"].Value(); + // if (string.IsNullOrWhiteSpace(fld)) + // AddError(ApiErrorCode.VALIDATION_REQUIRED, "Sort", $"Sort array item {i}, \"fld\" property is empty and required"); - //validate the field name if we can - if (DataList != null) - { + // //validate the field name if we can + // if (DataList != null) + // { - if (!DataList.FieldDefinitions.Exists(x => x.FieldKey.ToLowerInvariant() == fld && x.IsFilterable)) - { - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Sort", $"Sort array item {i}, fld property value \"{fld}\" is not a valid value for ListKey specified"); - } + // if (!DataList.FieldDefinitions.Exists(x => x.FieldKey.ToLowerInvariant() == fld && x.IsFilterable)) + // { + // AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Sort", $"Sort array item {i}, fld property value \"{fld}\" is not a valid value for ListKey specified"); + // } - } - } - if (sortItem["dir"] == null) - AddError(ApiErrorCode.VALIDATION_REQUIRED, "Sort", $"Sort array item {i}, object is missing required \"dir\" sort direction property "); - else - { - var sortDir = sortItem["dir"].Value(); - if (sortDir != "+" && sortDir != "-") - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Sort", $"Sort array item {i}, \"dir\" property value of \"{sortDir}\" is not a valid sort direction value, must be \"+\" or \"-\" only"); - } - //NOTE: value of nothing, null or empty is a valid value so no checking for it here - } - } - catch (Newtonsoft.Json.JsonReaderException ex) - { - AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Sort", "Sort is not valid JSON string: " + ex.Message); + // } + // } + // if (sortItem["dir"] == null) + // AddError(ApiErrorCode.VALIDATION_REQUIRED, "Sort", $"Sort array item {i}, object is missing required \"dir\" sort direction property "); + // else + // { + // var sortDir = sortItem["dir"].Value(); + // if (sortDir != "+" && sortDir != "-") + // AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Sort", $"Sort array item {i}, \"dir\" property value of \"{sortDir}\" is not a valid sort direction value, must be \"+\" or \"-\" only"); + // } + // //NOTE: value of nothing, null or empty is a valid value so no checking for it here + // } + // } + // catch (Newtonsoft.Json.JsonReaderException ex) + // { + // AddError(ApiErrorCode.VALIDATION_INVALID_VALUE, "Sort", "Sort is not valid JSON string: " + ex.Message); - } - } + // } + // }