diff --git a/server/AyaNova/biz/FilterSqlOrderByBuilder.cs b/server/AyaNova/biz/FilterSqlOrderByBuilder.cs
index 23b2f05f..d839ea2e 100644
--- a/server/AyaNova/biz/FilterSqlOrderByBuilder.cs
+++ b/server/AyaNova/biz/FilterSqlOrderByBuilder.cs
@@ -12,17 +12,22 @@ namespace AyaNova.Biz
public static class FilterSqlOrderByBuilder
{
- public static string DefaultOrderBy()
+ public static string DefaultGetManyOrderBy()
{
return " ORDER BY ID DESC";
}
+ public static string DefaultPickListOrderBy()
+ {
+ return " ORDER BY NAME ASC";
+ }
+
public static string DataFilterToSQLOrderBy(AyaNova.Models.DataFilter dataFilter)
{
if (string.IsNullOrWhiteSpace(dataFilter.Sort))
{
- return DefaultOrderBy();
+ return DefaultGetManyOrderBy();
}
StringBuilder sb = new StringBuilder();
diff --git a/server/AyaNova/biz/PickListFetcher.cs b/server/AyaNova/biz/PickListFetcher.cs
index 80429653..60a93014 100644
--- a/server/AyaNova/biz/PickListFetcher.cs
+++ b/server/AyaNova/biz/PickListFetcher.cs
@@ -47,7 +47,7 @@ namespace AyaNova.Biz
else
{
//GET DEFAULT ORDER BY
- qSort= FilterSqlOrderByBuilder.DefaultOrderBy();
+ qSort = FilterSqlOrderByBuilder.DefaultPickListOrderBy();
}
//ITEMS
diff --git a/server/AyaNova/biz/UserBiz.cs b/server/AyaNova/biz/UserBiz.cs
index 069aa42a..7d1a9079 100644
--- a/server/AyaNova/biz/UserBiz.cs
+++ b/server/AyaNova/biz/UserBiz.cs
@@ -191,7 +191,7 @@ namespace AyaNova.Biz
else
{
//GET DEFAULT ORDER BY
- q = q + FilterSqlOrderByBuilder.DefaultOrderBy();
+ q = q + FilterSqlOrderByBuilder.DefaultGetManyOrderBy();
}
diff --git a/server/AyaNova/biz/WidgetBiz.cs b/server/AyaNova/biz/WidgetBiz.cs
index db59e57d..21670aee 100644
--- a/server/AyaNova/biz/WidgetBiz.cs
+++ b/server/AyaNova/biz/WidgetBiz.cs
@@ -187,7 +187,7 @@ namespace AyaNova.Biz
else
{
//GET DEFAULT ORDER BY
- q = q + FilterSqlOrderByBuilder.DefaultOrderBy();
+ q = q + FilterSqlOrderByBuilder.DefaultGetManyOrderBy();
}
diff --git a/test/raven-integration/Widget/WidgetLists.cs b/test/raven-integration/Widget/WidgetLists.cs
index 776003f3..789737c6 100644
--- a/test/raven-integration/Widget/WidgetLists.cs
+++ b/test/raven-integration/Widget/WidgetLists.cs
@@ -12,8 +12,6 @@ namespace raven_integration
public class WidgetLists
{
-
-
///
///
///
@@ -21,52 +19,53 @@ namespace raven_integration
public async void WidgetPickListSortByFieldAscendingWorks()
{
- var WidgetNameStart = Util.Uniquify("WidgetPickListSortByFieldAscendingWorks");
+ var NameStart = Util.Uniquify("WidgetPickListSortByFieldAscendingWorks");
+ var RouteName="Widget";
- //CREATE 3 TEST WIDGETS TO TEST ORDER
- long FirstInOrderWidgetId = 0;
- long SecondInOrderWidgetId = 0;
- long ThirdInOrderWidgetId = 0;
+ //CREATE 3 TEST OBJECTS TO TEST ORDER
+ long FirstInOrderId = 0;
+ long SecondInOrderId = 0;
+ long ThirdInOrderId = 0;
- dynamic w = new JObject();
- w.name = Util.Uniquify(WidgetNameStart);
- w.startDate = DateTime.Now;
- w.endDate = DateTime.Now.AddHours(1);
+ dynamic d = new JObject();
+ d.name = Util.Uniquify(NameStart);
+ d.startDate = DateTime.Now;
+ d.endDate = DateTime.Now.AddHours(1);
- ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
+ ApiResponse a = await Util.PostAsync(RouteName, await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString());
Util.ValidateDataReturnResponseOk(a);
- FirstInOrderWidgetId = a.ObjectResponse["data"]["id"].Value();
+ FirstInOrderId = a.ObjectResponse["data"]["id"].Value();
- w = new JObject();
- w.name = Util.Uniquify(WidgetNameStart);
- w.startDate = DateTime.Now.AddHours(1);
- w.endDate = DateTime.Now.AddHours(2);
- a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
+ d = new JObject();
+ d.name = Util.Uniquify(NameStart);
+ d.startDate = DateTime.Now.AddHours(1);
+ d.endDate = DateTime.Now.AddHours(2);
+ a = await Util.PostAsync(RouteName, await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString());
Util.ValidateDataReturnResponseOk(a);
- SecondInOrderWidgetId = a.ObjectResponse["data"]["id"].Value();
+ SecondInOrderId = a.ObjectResponse["data"]["id"].Value();
- w = new JObject();
- w.name = Util.Uniquify(WidgetNameStart);
- w.startDate = DateTime.Now.AddHours(2);
- w.endDate = DateTime.Now.AddHours(3);
- a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
+ d = new JObject();
+ d.name = Util.Uniquify(NameStart);
+ d.startDate = DateTime.Now.AddHours(2);
+ d.endDate = DateTime.Now.AddHours(3);
+ a = await Util.PostAsync(RouteName, await Util.GetTokenAsync("manager", "l3tm3in"), d.ToString());
Util.ValidateDataReturnResponseOk(a);
- ThirdInOrderWidgetId = a.ObjectResponse["data"]["id"].Value();
+ ThirdInOrderId = a.ObjectResponse["data"]["id"].Value();
//CREATE FILTER
- dynamic d = new JObject();
- d.name = Util.Uniquify(WidgetNameStart);
+ d = new JObject();
+ d.name = Util.Uniquify(NameStart);
d["public"] = true;
d.listKey = "widget";
//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
+ //name starts with filter to constrict to objects that this test block created only
dynamic DataFilterNameStart = new JObject();
DataFilterNameStart.fld = "name";
DataFilterNameStart.op = Util.OpStartsWith;
- DataFilterNameStart.value = WidgetNameStart;
+ DataFilterNameStart.value = NameStart;
dfilter.Add(DataFilterNameStart);
d.filter = dfilter.ToString();
@@ -83,8 +82,8 @@ namespace raven_integration
long DataFilterId = a.ObjectResponse["data"]["id"].Value();
- //NOW FETCH WIDGET LIST WITH FILTER
- a = await Util.GetAsync($"Widget/picklist?Offset=0&Limit=999&DataFilterId={DataFilterId.ToString()}", await Util.GetTokenAsync("manager", "l3tm3in"));
+ //NOW FETCH LIST WITH FILTER
+ a = await Util.GetAsync($"{RouteName}/picklist?Offset=0&Limit=999&DataFilterId={DataFilterId.ToString()}", await Util.GetTokenAsync("manager", "l3tm3in"));
Util.ValidateDataReturnResponseOk(a);
Util.ValidateHTTPStatusCode(a, 200);
@@ -92,18 +91,18 @@ namespace raven_integration
((JArray)a.ObjectResponse["data"]).Count.Should().Be(3);
//assert the order returned
- a.ObjectResponse["data"][0]["id"].Value().Should().Be(FirstInOrderWidgetId);
- a.ObjectResponse["data"][1]["id"].Value().Should().Be(SecondInOrderWidgetId);
- a.ObjectResponse["data"][2]["id"].Value().Should().Be(ThirdInOrderWidgetId);
+ a.ObjectResponse["data"][0]["id"].Value().Should().Be(FirstInOrderId);
+ a.ObjectResponse["data"][1]["id"].Value().Should().Be(SecondInOrderId);
+ a.ObjectResponse["data"][2]["id"].Value().Should().Be(ThirdInOrderId);
- a = await Util.DeleteAsync("Widget/" + FirstInOrderWidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
+ a = await Util.DeleteAsync($"{RouteName}/" + FirstInOrderId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
Util.ValidateHTTPStatusCode(a, 204);
- a = await Util.DeleteAsync("Widget/" + SecondInOrderWidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
+ a = await Util.DeleteAsync($"{RouteName}/" + SecondInOrderId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
Util.ValidateHTTPStatusCode(a, 204);
- a = await Util.DeleteAsync("Widget/" + ThirdInOrderWidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
+ a = await Util.DeleteAsync($"{RouteName}/" + ThirdInOrderId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
Util.ValidateHTTPStatusCode(a, 204);
//DELETE DATAFILTER