diff --git a/User/UserCrud.cs b/User/UserCrud.cs index 23fae81..928191b 100644 --- a/User/UserCrud.cs +++ b/User/UserCrud.cs @@ -407,10 +407,6 @@ namespace raven_integration //CREATE FILTER - d = new JObject(); - d.name = Util.Uniquify(ObjectNameStart); - d["public"] = true; - d.listKey = "UserDataList"; //FILTER IN BY NAME FOR TESTING THIS RUN ONLY dynamic dfilter = new JArray(); @@ -420,7 +416,6 @@ namespace raven_integration DataFilterNameStart.op = Util.OpStartsWith; DataFilterNameStart.value = ObjectNameStart; dfilter.Add(DataFilterNameStart); - d.filter = dfilter.ToString(); dynamic dsortarray = new JArray(); @@ -437,15 +432,9 @@ namespace raven_integration 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(); - //NOW FETCH WIDGET LIST WITH FILTER UserDataList - a = await Util.GetAsync($"DataList/list?DataListKey=UserDataList&Offset=0&Limit=999&DataFilterId={DataFilterId.ToString()}", await Util.GetTokenAsync("manager", "l3tm3in")); + // a = await Util.GetAsync($"DataList/list?DataListKey=UserDataList&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, 999, 0, false, "UserDataList")); Util.ValidateDataReturnResponseOk(a); Util.ValidateHTTPStatusCode(a, 200); @@ -467,16 +456,12 @@ namespace raven_integration a = await Util.DeleteAsync("User/" + ThirdInOrderId.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); - } -//DEPRECATED THESE BECAUSE THEY DON'T TEST ANYTHING UNIQUELY THAT ISN'T ALREADY COVERED BY THE DATALISTFILTER AND ORDER BY TESTS ELSEWHERE -//AND THE PICKLIST IS NOW MINI FORMAT OF REGULAR LIST + //DEPRECATED THESE BECAUSE THEY DON'T TEST ANYTHING UNIQUELY THAT ISN'T ALREADY COVERED BY THE DATALISTFILTER AND ORDER BY TESTS ELSEWHERE + //AND THE PICKLIST IS NOW MINI FORMAT OF REGULAR LIST // /// // /// // ///