admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2018-12-13 17:54:16 +00:00
parent 76009385d2
commit 49cfd66c65
5 changed files with 46 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
server/AyaNova/biz/FilterSqlOrderByBuilder.cs
View File

@@ -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();

2
server/AyaNova/biz/PickListFetcher.cs
View File

@@ -47,7 +47,7 @@ namespace AyaNova.Biz
else
{
//GET DEFAULT ORDER BY
qSort= FilterSqlOrderByBuilder.DefaultOrderBy();
qSort = FilterSqlOrderByBuilder.DefaultPickListOrderBy();
}
//ITEMS

2
server/AyaNova/biz/UserBiz.cs
View File

@@ -191,7 +191,7 @@ namespace AyaNova.Biz
else
{
//GET DEFAULT ORDER BY
q = q + FilterSqlOrderByBuilder.DefaultOrderBy();
q = q + FilterSqlOrderByBuilder.DefaultGetManyOrderBy();
}

2
server/AyaNova/biz/WidgetBiz.cs
View File

@@ -187,7 +187,7 @@ namespace AyaNova.Biz
else
{
//GET DEFAULT ORDER BY
q = q + FilterSqlOrderByBuilder.DefaultOrderBy();
q = q + FilterSqlOrderByBuilder.DefaultGetManyOrderBy();
}

73
test/raven-integration/Widget/WidgetLists.cs
View File

@@ -12,8 +12,6 @@ namespace raven_integration
public class WidgetLists
{
/// <summary>
///
/// </summary>
@@ -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<long>();
FirstInOrderId = a.ObjectResponse["data"]["id"].Value<long>();
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<long>();
SecondInOrderId = a.ObjectResponse["data"]["id"].Value<long>();
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<long>();
ThirdInOrderId = a.ObjectResponse["data"]["id"].Value<long>();
//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<long>();
//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<long>().Should().Be(FirstInOrderWidgetId);
a.ObjectResponse["data"][1]["id"].Value<long>().Should().Be(SecondInOrderWidgetId);
a.ObjectResponse["data"][2]["id"].Value<long>().Should().Be(ThirdInOrderWidgetId);
a.ObjectResponse["data"][0]["id"].Value<long>().Should().Be(FirstInOrderId);
a.ObjectResponse["data"][1]["id"].Value<long>().Should().Be(SecondInOrderId);
a.ObjectResponse["data"][2]["id"].Value<long>().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