DataList/DataListSorting.cs

@@ -55,10 +55,7 @@ namespace raven_integration
 
 
             //CREATE FILTER
-            dynamic d = new JObject();
+
-            d.name = Util.Uniquify(WidgetNameStart);
-            d["public"] = true;
-            d.listKey = "TestWidgetDataList";
             dynamic dfilter = new JArray();
 
 
@@ -68,15 +65,11 @@ namespace raven_integration
             DataFilterNameStart.op = Util.OpStartsWith;
             DataFilterNameStart.value = WidgetNameStart;
             dfilter.Add(DataFilterNameStart);
-            d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
 
-            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString());
-            Util.ValidateDataReturnResponseOk(a);
-
-            long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
 
             //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.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));
             Util.ValidateDataReturnResponseOk(a);
             Util.ValidateHTTPStatusCode(a, 200);
 
@@ -97,10 +90,6 @@ namespace raven_integration
 
             a = await Util.DeleteAsync("Widget/" + ThirdInOrderWidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
             Util.ValidateHTTPStatusCode(a, 204);
-
-            //DELETE DATAFILTER
-            a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
-            Util.ValidateHTTPStatusCode(a, 204);
         }
 
 
@@ -155,11 +144,6 @@ namespace raven_integration
 
 
             //CREATE FILTER
-            dynamic d = new JObject();
-            d.name = Util.Uniquify(WidgetNameStart);
-            d["public"] = true;
-            d.listKey = "TestWidgetDataList";
-
             //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
@@ -168,7 +152,6 @@ namespace raven_integration
             DataFilterNameStart.op = Util.OpStartsWith;
             DataFilterNameStart.value = WidgetNameStart;
             dfilter.Add(DataFilterNameStart);
-            d.filter = dfilter.ToString();
 
             //SORT ORDER ###################
             dynamic dsortarray = new JArray();
@@ -176,15 +159,10 @@ namespace raven_integration
             dsort.fld = "widgetstartdate";
             dsort.dir = "+";
             dsortarray.Add(dsort);
-            d.sort = dsortarray.ToString();
 
-            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString());
-            Util.ValidateDataReturnResponseOk(a);
-
-            long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
 
             //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, dsortarray));
             Util.ValidateDataReturnResponseOk(a);
             Util.ValidateHTTPStatusCode(a, 200);
 
@@ -206,10 +184,6 @@ namespace raven_integration
             a = await Util.DeleteAsync("Widget/" + ThirdInOrderWidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
             Util.ValidateHTTPStatusCode(a, 204);
 
-            //DELETE DATAFILTER
-            a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
-            Util.ValidateHTTPStatusCode(a, 204);
-
         }
 
 
@@ -261,10 +235,6 @@ namespace raven_integration
 
 
             //CREATE FILTER
-            dynamic d = new JObject();
-            d.name = Util.Uniquify(WidgetNameStart);
-            d["public"] = true;
-            d.listKey = "TestWidgetDataList";
 
             //FILTER IN BY NAME FOR TESTING THIS RUN ONLY
             dynamic dfilter = new JArray();
@@ -282,15 +252,9 @@ namespace raven_integration
             dsort.fld = "widgetcount";
             dsort.dir = "-";
             dsortarray.Add(dsort);
-            d.sort = dsortarray.ToString();
-
-            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString());
-            Util.ValidateDataReturnResponseOk(a);
-
-            long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
 
             //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, dsortarray));
             Util.ValidateDataReturnResponseOk(a);
             Util.ValidateHTTPStatusCode(a, 200);
 
@@ -312,10 +276,6 @@ namespace raven_integration
             a = await Util.DeleteAsync("Widget/" + ThirdInOrderWidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
             Util.ValidateHTTPStatusCode(a, 204);
 
-            //DELETE DATAFILTER
-            a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
-            Util.ValidateHTTPStatusCode(a, 204);
-
         }
 
 
@@ -401,10 +361,6 @@ namespace raven_integration
 
 
             //CREATE FILTER
-            dynamic d = new JObject();
-            d.name = Util.Uniquify(WidgetNameStart);
-            d["public"] = true;
-            d.listKey = "TestWidgetDataList";
 
             //FILTER IN BY NAME FOR TESTING THIS RUN ONLY
             dynamic dfilter = new JArray();
@@ -414,7 +370,6 @@ namespace raven_integration
             DataFilterNameStart.op = Util.OpStartsWith;
             DataFilterNameStart.value = WidgetNameStart;
             dfilter.Add(DataFilterNameStart);
-            d.filter = dfilter.ToString();
 
             //SORT ORDER ###################
             dynamic dsortarray = new JArray();
@@ -432,15 +387,8 @@ namespace raven_integration
             dsortarray.Add(dsort2);
 
 
-            d.sort = dsortarray.ToString();
-
-            a = await Util.PostAsync("DataListFilter", await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString());
-            Util.ValidateDataReturnResponseOk(a);
-
-            long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
-
             //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, dsortarray));
             Util.ValidateDataReturnResponseOk(a);
             Util.ValidateHTTPStatusCode(a, 200);
 
@@ -466,10 +414,6 @@ namespace raven_integration
             a = await Util.DeleteAsync("Widget/" + FourthInOrderWidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
             Util.ValidateHTTPStatusCode(a, 204);
 
-            //DELETE DATAFILTER
-            a = await Util.DeleteAsync("DataListFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
-            Util.ValidateHTTPStatusCode(a, 204);
-
         }
 
         //========================================================================