From 5e874da195314b5fdc1f2c89ea6e5e2f132faa2b Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Thu, 23 Jan 2020 01:05:07 +0000 Subject: [PATCH] --- ApiResponse.cs | 11 +- DataFilter/DataFilterFilteringLists.cs | 151 +++++++++++++------------ DataFilter/DataFilterOrderBy.cs | 16 +-- User/UserCrud.cs | 8 +- Widget/WidgetLists.cs | 4 +- 5 files changed, 100 insertions(+), 90 deletions(-) diff --git a/ApiResponse.cs b/ApiResponse.cs index b626901..df76a38 100644 --- a/ApiResponse.cs +++ b/ApiResponse.cs @@ -5,8 +5,15 @@ namespace raven_integration { public class ApiResponse { - public HttpResponseMessage HttpResponse {get;set;} - public JObject ObjectResponse {get;set;} + public HttpResponseMessage HttpResponse { get; set; } + public JObject ObjectResponse { get; set; } + public string CompactResponse + { + get + { + return ObjectResponse.ToString(Newtonsoft.Json.Formatting.None); + } + } }//eoc diff --git a/DataFilter/DataFilterFilteringLists.cs b/DataFilter/DataFilterFilteringLists.cs index 38c3925..25b4481 100644 --- a/DataFilter/DataFilterFilteringLists.cs +++ b/DataFilter/DataFilterFilteringLists.cs @@ -178,7 +178,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -280,7 +280,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -382,7 +382,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -483,7 +483,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -585,7 +585,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -687,7 +687,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -789,7 +789,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -892,7 +892,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -994,7 +994,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -1096,7 +1096,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -1199,7 +1199,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -1303,7 +1303,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -1407,7 +1407,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -1513,7 +1513,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -1622,7 +1622,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -1726,7 +1726,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -1832,7 +1832,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -1935,7 +1935,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -2039,7 +2039,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -2145,7 +2145,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -2251,7 +2251,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -2354,7 +2354,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -2457,7 +2457,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -2579,7 +2579,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -2696,7 +2696,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -2811,7 +2811,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -2927,7 +2927,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -3033,7 +3033,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -3137,7 +3137,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -3242,7 +3242,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -3347,7 +3347,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -3451,7 +3451,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -3557,7 +3557,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -3661,7 +3661,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -3766,7 +3766,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -3870,7 +3870,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -3974,7 +3974,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -4079,7 +4079,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -4183,7 +4183,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -4320,7 +4320,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -4445,7 +4445,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -4567,7 +4567,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -4690,7 +4690,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -4813,7 +4813,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -4936,7 +4936,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -5059,7 +5059,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -5182,7 +5182,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -5304,7 +5304,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -5426,7 +5426,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -5548,7 +5548,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -5670,7 +5670,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -5793,7 +5793,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -5910,7 +5910,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -6012,7 +6012,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -6114,7 +6114,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -6218,7 +6218,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -6321,7 +6321,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -6425,7 +6425,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -6445,7 +6445,6 @@ same as the server does but in a central location here for all tests to use. public async void BoolOpEqualityFilterWorks() { - ApiResponse test = await Util.GetAsync("DataList/test2", await Util.GetTokenAsync("manager", "l3tm3in")); //OPS: equal to, not equal to //values: true, false @@ -6542,12 +6541,16 @@ same as the server does but in a central location here for all tests to use. //bugbug: now this is an array (should have been before no?) //anyway it's not a jobject, the whole list is an array of arrays so the tests are probably all going to need hand tweaking //blarg! - foreach (JObject o in v) + foreach (JArray ja in v) { - if (ActiveWidgetIdList.Contains(o["id"].Value())) - nActiveMatches++; - if (NotActiveWidgetIdList.Contains(o["id"].Value())) - nInactiveMatches++; + JObject o=ja[0] as JObject; + // foreach (JObject o in ja) + // { + if (ActiveWidgetIdList.Contains(o["v"].Value())) + nActiveMatches++; + if (NotActiveWidgetIdList.Contains(o["v"].Value())) + nInactiveMatches++; + //} } nActiveMatches.Should().Be(ActiveWidgetIdList.Count); @@ -6567,7 +6570,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -6695,7 +6698,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -6805,7 +6808,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -6907,7 +6910,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -7009,7 +7012,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -7113,7 +7116,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -7216,7 +7219,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -7320,7 +7323,7 @@ same as the server does but in a central location here for all tests to use. //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -7472,7 +7475,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } @@ -7613,7 +7616,7 @@ same as the server does but in a central location here for all tests to use. } //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull")); Util.ValidateHTTPStatusCode(a, 204); } diff --git a/DataFilter/DataFilterOrderBy.cs b/DataFilter/DataFilterOrderBy.cs index cd1930e..49f6038 100644 --- a/DataFilter/DataFilterOrderBy.cs +++ b/DataFilter/DataFilterOrderBy.cs @@ -67,7 +67,7 @@ namespace raven_integration dfilter.Add(DataFilterNameStart); d.filter = dfilter.ToString();//it expects it to be a json string, not actual json - a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); + a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); Util.ValidateDataReturnResponseOk(a); long DataFilterId = a.ObjectResponse["data"]["id"].Value(); @@ -96,7 +96,7 @@ namespace raven_integration Util.ValidateHTTPStatusCode(a, 204); //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); Util.ValidateHTTPStatusCode(a, 204); } @@ -172,7 +172,7 @@ namespace raven_integration dsortarray.Add(dsort); d.sort = dsortarray.ToString(); - a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); + a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); Util.ValidateDataReturnResponseOk(a); long DataFilterId = a.ObjectResponse["data"]["id"].Value(); @@ -201,7 +201,7 @@ namespace raven_integration Util.ValidateHTTPStatusCode(a, 204); //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); Util.ValidateHTTPStatusCode(a, 204); } @@ -275,7 +275,7 @@ namespace raven_integration dsortarray.Add(dsort); d.sort = dsortarray.ToString(); - a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); + a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); Util.ValidateDataReturnResponseOk(a); long DataFilterId = a.ObjectResponse["data"]["id"].Value(); @@ -304,7 +304,7 @@ namespace raven_integration Util.ValidateHTTPStatusCode(a, 204); //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); Util.ValidateHTTPStatusCode(a, 204); } @@ -421,7 +421,7 @@ namespace raven_integration d.sort = dsortarray.ToString(); - a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); + a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); Util.ValidateDataReturnResponseOk(a); long DataFilterId = a.ObjectResponse["data"]["id"].Value(); @@ -454,7 +454,7 @@ namespace raven_integration Util.ValidateHTTPStatusCode(a, 204); //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); Util.ValidateHTTPStatusCode(a, 204); } diff --git a/User/UserCrud.cs b/User/UserCrud.cs index 2b025e4..8cfd1e0 100644 --- a/User/UserCrud.cs +++ b/User/UserCrud.cs @@ -439,7 +439,7 @@ namespace raven_integration d.sort = dsortarray.ToString(); - a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); + a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); Util.ValidateDataReturnResponseOk(a); long DataFilterId = a.ObjectResponse["data"]["id"].Value(); @@ -468,7 +468,7 @@ namespace raven_integration Util.ValidateHTTPStatusCode(a, 204); //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); Util.ValidateHTTPStatusCode(a, 204); } @@ -587,7 +587,7 @@ namespace raven_integration dsortarray.Add(dsort); d.sort = dsortarray.ToString(); - a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); + a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); Util.ValidateDataReturnResponseOk(a); long DataFilterId = a.ObjectResponse["data"]["id"].Value(); @@ -616,7 +616,7 @@ namespace raven_integration Util.ValidateHTTPStatusCode(a, 204); //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); Util.ValidateHTTPStatusCode(a, 204); } diff --git a/Widget/WidgetLists.cs b/Widget/WidgetLists.cs index aa227b6..8d26acf 100644 --- a/Widget/WidgetLists.cs +++ b/Widget/WidgetLists.cs @@ -113,7 +113,7 @@ namespace raven_integration dsortarray.Add(dsort); d.sort = dsortarray.ToString(); - a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); + a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString()); Util.ValidateDataReturnResponseOk(a); long DataFilterId = a.ObjectResponse["data"]["id"].Value(); @@ -142,7 +142,7 @@ namespace raven_integration Util.ValidateHTTPStatusCode(a, 204); //DELETE DATAFILTER - a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); + a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in")); Util.ValidateHTTPStatusCode(a, 204); }