From 1cb3af8d2274854efd4601e6f5a0fd35f9ab7ca2 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Fri, 14 Feb 2020 16:38:26 +0000 Subject: [PATCH] --- DataList/DataListReturnFormat.cs | 2 +- DataList/DataListRights.cs | 2 +- DataList/DataListSorting.cs | 87 ++++++++++++++------------------ util.cs | 12 ++++- 4 files changed, 51 insertions(+), 52 deletions(-) diff --git a/DataList/DataListReturnFormat.cs b/DataList/DataListReturnFormat.cs index 945e02e..0642c85 100644 --- a/DataList/DataListReturnFormat.cs +++ b/DataList/DataListReturnFormat.cs @@ -20,7 +20,7 @@ namespace raven_integration public async void DataListReturnFormatShouldWorkAsExpected() { - ApiResponse a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(null, null, 3, 2)); + ApiResponse a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(null, 3, 2)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); diff --git a/DataList/DataListRights.cs b/DataList/DataListRights.cs index f7c02d5..439cd61 100644 --- a/DataList/DataListRights.cs +++ b/DataList/DataListRights.cs @@ -20,7 +20,7 @@ namespace raven_integration "{\"error\":{\"code\":\"2004\",\"message\":\"User not authorized for this resource operation (insufficient rights)\"}}" */ //ApiResponse a = await Util.GetAsync("DataList/list?DataListKey=TestWidgetDataList&Offset=0&Limit=3", await Util.GetTokenAsync("CustomerLimited")); - ApiResponse a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("CustomerLimited"), Util.BuildDataListRequest()); + ApiResponse a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("CustomerLimited"), Util.BuildDataListRequestEx()); Util.ValidateErrorCodeResponse(a, 2004, 403); } diff --git a/DataList/DataListSorting.cs b/DataList/DataListSorting.cs index 59dec83..0cd26f8 100644 --- a/DataList/DataListSorting.cs +++ b/DataList/DataListSorting.cs @@ -56,20 +56,16 @@ namespace raven_integration //CREATE FILTER - dynamic dfilter = new JArray(); + dynamic dListView = new JArray(); //name starts with filter to constrict to widgets that this test block created only - dynamic DataFilterNameStart = new JObject(); - DataFilterNameStart.fld = "widgetname"; - DataFilterNameStart.op = Util.OpStartsWith; - DataFilterNameStart.value = WidgetNameStart; - dfilter.Add(DataFilterNameStart); - + + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //NOW FETCH WIDGET LIST WITH FILTER // a = await Util.GetAsync($"DataList/list?DataListKey=TestWidgetDataList&Offset=0&Limit=999&DataFilterId={DataFilterId.ToString()}", await Util.GetTokenAsync("manager", "l3tm3in")); - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter)); + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -145,24 +141,22 @@ namespace raven_integration //CREATE FILTER //FILTER IN BY NAME FOR TESTING THIS RUN ONLY - dynamic dfilter = new JArray(); + dynamic dListView = new JArray(); //name starts with filter to constrict to widgets that this test block created only - dynamic DataFilterNameStart = new JObject(); - DataFilterNameStart.fld = "widgetname"; - DataFilterNameStart.op = Util.OpStartsWith; - DataFilterNameStart.value = WidgetNameStart; - dfilter.Add(DataFilterNameStart); + + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //SORT ORDER ################### - dynamic dsortarray = new JArray(); - dynamic dsort = new JObject(); - dsort.fld = "widgetstartdate"; - dsort.dir = "+"; - dsortarray.Add(dsort); + // dynamic dsortarray = new JArray(); + // dynamic dsort = new JObject(); + // dsort.fld = "widgetstartdate"; + // dsort.dir = "+"; + // dsortarray.Add(dsort); + dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetname", "+")); //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter, dsortarray)); + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -237,24 +231,21 @@ namespace raven_integration //CREATE FILTER //FILTER IN BY NAME FOR TESTING THIS RUN ONLY - dynamic dfilter = new JArray(); + dynamic dListView = new JArray(); //name starts with filter to constrict to widgets that this test block created only - dynamic DataFilterNameStart = new JObject(); - DataFilterNameStart.fld = "widgetname"; - DataFilterNameStart.op = Util.OpStartsWith; - DataFilterNameStart.value = WidgetNameStart; - dfilter.Add(DataFilterNameStart); + + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //SORT ORDER ################### - dynamic dsortarray = new JArray(); - dynamic dsort = new JObject(); - dsort.fld = "widgetcount"; - dsort.dir = "-"; - dsortarray.Add(dsort); + // dynamic dsortarray = new JArray(); + // dynamic dsort = new JObject(); + // dsort.fld = "widgetcount"; + // dsort.dir = "-"; + dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetcount", "-")); //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter, dsortarray)); + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -363,32 +354,30 @@ namespace raven_integration //CREATE FILTER //FILTER IN BY NAME FOR TESTING THIS RUN ONLY - dynamic dfilter = new JArray(); - //name starts with filter to constrict to widgets that this test block created only - dynamic DataFilterNameStart = new JObject(); - DataFilterNameStart.fld = "widgetname"; - DataFilterNameStart.op = Util.OpStartsWith; - DataFilterNameStart.value = WidgetNameStart; - dfilter.Add(DataFilterNameStart); + dynamic dListView = new JArray(); + //name starts with filter to constrict to widgets that this test block created only + dListView.Add(Util.BuildSimpleFilterDataListViewColumn("widgetname", Util.OpStartsWith, WidgetNameStart)); //SORT ORDER ################### - dynamic dsortarray = new JArray(); + // dynamic dsortarray = new JArray(); //First column - dynamic dsort1 = new JObject(); - dsort1.fld = "widgetdollaramount"; - dsort1.dir = "+"; - dsortarray.Add(dsort1); + // dynamic dsort1 = new JObject(); + // dsort1.fld = "widgetdollaramount"; + // dsort1.dir = "+"; + // dsortarray.Add(dsort1); + dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetdollaramount", "+")); //Second column - dynamic dsort2 = new JObject(); - dsort2.fld = "widgetcount"; - dsort2.dir = "-"; - dsortarray.Add(dsort2); + // dynamic dsort2 = new JObject(); + // dsort2.fld = "widgetcount"; + // dsort2.dir = "-"; + // dsortarray.Add(dsort2); + dListView.Add(Util.BuildSimpleSortDataListViewColumn("widgetcount", "-")); //NOW FETCH WIDGET LIST WITH FILTER - a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequest(dfilter, dsortarray)); + a = await Util.PostAsync($"DataList", await Util.GetTokenAsync("manager", "l3tm3in"), Util.BuildDataListRequestEx(dListView)); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); diff --git a/util.cs b/util.cs index 0a4942b..42bf33d 100644 --- a/util.cs +++ b/util.cs @@ -605,7 +605,17 @@ namespace raven_integration return d; } -//t(dfilter, dsortarray, 999, 0, false, "UserDataList")); + + + + public static object BuildSimpleSortDataListViewColumn(string fieldKey, string sort) + { + dynamic d = new JObject(); + d.fld = fieldKey; + d.sort = sort; + return d; + } + //t(dfilter, dsortarray, 999, 0, false, "UserDataList")); // public static string BuildDataListRequest(object p = null, object o = null, int limit = 999, int offset = 0, bool bWhatever=false, string dataListKey = "TestWidgetDataList") // { // throw new System.NotImplementedException();