From 80b7234e6edecf829a1466cdca1134b784eadeaa Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 23 Jan 2020 17:06:35 +0000
Subject: [PATCH]

---
 User/UserCrud.cs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/User/UserCrud.cs b/User/UserCrud.cs
index 8cfd1e0..c508216 100644
--- a/User/UserCrud.cs
+++ b/User/UserCrud.cs
@@ -410,13 +410,13 @@ namespace raven_integration
             d = new JObject();
             d.name = Util.Uniquify(ObjectNameStart);
             d["public"] = true;
-            d.listKey = "user";
+            d.listKey = "UserDataList";
 
             //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 = "name";
+            DataFilterNameStart.fld = "username";
             DataFilterNameStart.op = Util.OpStartsWith;
             DataFilterNameStart.value = ObjectNameStart;
             dfilter.Add(DataFilterNameStart);
@@ -428,12 +428,12 @@ namespace raven_integration
             //sort by active then by ID 
 
             dynamic dsort = new JObject();
-            dsort.fld = "active";
+            dsort.fld = "useractive";
             dsort.dir = "+";
             dsortarray.Add(dsort);
 
             dsort = new JObject();
-            dsort.fld = "id";
+            dsort.fld = "df";
             dsort.dir = "+";
             dsortarray.Add(dsort);
 
@@ -444,8 +444,8 @@ namespace raven_integration
 
             long DataFilterId = a.ObjectResponse["data"]["id"].Value<long>();
 
-            //NOW FETCH WIDGET LIST WITH FILTER
-            a = await Util.GetAsync($"User/listusers?Offset=0&Limit=999&DataFilterId={DataFilterId.ToString()}", await Util.GetTokenAsync("manager", "l3tm3in"));
+            //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"));
             Util.ValidateDataReturnResponseOk(a);
             Util.ValidateHTTPStatusCode(a, 200);
 
@@ -453,9 +453,9 @@ namespace raven_integration
             ((JArray)a.ObjectResponse["data"]).Count.Should().Be(3);
 
             //assert the order returned
-            a.ObjectResponse["data"][0]["id"].Value<long>().Should().Be(FirstInOrdertId);
-            a.ObjectResponse["data"][1]["id"].Value<long>().Should().Be(SecondInOrderId);
-            a.ObjectResponse["data"][2]["id"].Value<long>().Should().Be(ThirdInOrderId);
+            a.ObjectResponse["data"][0][0]["v"].Value<long>().Should().Be(FirstInOrdertId);
+            a.ObjectResponse["data"][1][0]["v"].Value<long>().Should().Be(SecondInOrderId);
+            a.ObjectResponse["data"][2][0]["v"].Value<long>().Should().Be(ThirdInOrderId);
 
 
             a = await Util.DeleteAsync("User/" + FirstInOrdertId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));