From c50889c72055432f4ff82dd4bc653d96d3e4fbe3 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Wed, 12 Dec 2018 18:34:00 +0000
Subject: [PATCH]

---
 server/AyaNova/biz/FilterSqlOrderByBuilder.cs |   2 +-
 .../DataFilter/DataFilterOrderBy.cs           | 105 ++++++++++++++++++
 2 files changed, 106 insertions(+), 1 deletion(-)

diff --git a/server/AyaNova/biz/FilterSqlOrderByBuilder.cs b/server/AyaNova/biz/FilterSqlOrderByBuilder.cs
index 509bc4a9..acbe4867 100644
--- a/server/AyaNova/biz/FilterSqlOrderByBuilder.cs
+++ b/server/AyaNova/biz/FilterSqlOrderByBuilder.cs
@@ -28,7 +28,7 @@ namespace AyaNova.Biz
             StringBuilder sb = new StringBuilder();
 
             //iterate the datafilter and concatenate a sql query from it
-            var SortArray = JArray.Parse(dataFilter.Filter);
+            var SortArray = JArray.Parse(dataFilter.Sort);
             for (int i = 0; i < SortArray.Count; i++)
             {
 
diff --git a/test/raven-integration/DataFilter/DataFilterOrderBy.cs b/test/raven-integration/DataFilter/DataFilterOrderBy.cs
index b1b779f2..c189c357 100644
--- a/test/raven-integration/DataFilter/DataFilterOrderBy.cs
+++ b/test/raven-integration/DataFilter/DataFilterOrderBy.cs
@@ -81,6 +81,105 @@ namespace raven_integration
             a.ObjectResponse["data"][2]["id"].Value<long>().Should().Be(ThirdInOrderWidgetId);
 
 
+            a = await Util.DeleteAsync("Widget/" + FirstInOrderWidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
+            Util.ValidateHTTPStatusCode(a, 204);
+
+            a = await Util.DeleteAsync("Widget/" + SecondInOrderWidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
+            Util.ValidateHTTPStatusCode(a, 204);
+
+            a = await Util.DeleteAsync("Widget/" + ThirdInOrderWidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
+            Util.ValidateHTTPStatusCode(a, 204);
+
+            //DELETE DATAFILTER
+            a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
+            Util.ValidateHTTPStatusCode(a, 204);
+        }
+
+
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [Fact]
+        public async void SortByFieldAscendingWorks()
+        {
+
+            var WidgetNameStart = Util.Uniquify("SortByFieldAscendingWorks");
+
+            //CREATE 3 TEST WIDGETS TO TEST ORDER
+            long FirstInOrderWidgetId = 0;
+            long SecondInOrderWidgetId = 0;
+            long ThirdInOrderWidgetId = 0;
+
+            dynamic w = new JObject();
+            w.name = Util.Uniquify(WidgetNameStart);
+            w.startDate = DateTime.Now;
+            w.endDate = DateTime.Now.AddHours(1);
+
+            ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
+            Util.ValidateDataReturnResponseOk(a);
+            FirstInOrderWidgetId = 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());
+            Util.ValidateDataReturnResponseOk(a);
+            SecondInOrderWidgetId = 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());
+            Util.ValidateDataReturnResponseOk(a);
+            ThirdInOrderWidgetId = a.ObjectResponse["data"]["id"].Value<long>();
+
+
+            //CREATE FILTER
+            dynamic d = new JObject();
+            d.name = Util.Uniquify(WidgetNameStart);
+            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
+            dynamic DataFilterNameStart = new JObject();
+            DataFilterNameStart.fld = "name";
+            DataFilterNameStart.op = OpStartsWith;
+            DataFilterNameStart.value = WidgetNameStart;
+            dfilter.Add(DataFilterNameStart);
+            d.filter = dfilter.ToString();
+
+            //SORT ORDER ###################
+            dynamic dsortarray = new JArray();
+            dynamic dsort = new JObject();
+            dsort.fld = "startdate";
+            dsort.dir = "+";
+            dsortarray.Add(dsort);
+            d.sort = dsortarray.ToString();
+
+            a = await Util.PostAsync("DataFilter", 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($"Widget/listwidgets?Offset=0&Limit=999&DataFilterId={DataFilterId.ToString()}", await Util.GetTokenAsync("manager", "l3tm3in"));
+            Util.ValidateDataReturnResponseOk(a);
+            Util.ValidateHTTPStatusCode(a, 200);
+
+            //assert contains exactly 3 records
+            ((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 = await Util.DeleteAsync("Widget/" + FirstInOrderWidgetId.ToString(), await Util.GetTokenAsync("manager", "l3tm3in"));
             Util.ValidateHTTPStatusCode(a, 204);
 
@@ -96,5 +195,11 @@ namespace raven_integration
 
         }
 
+
+
+
+
+        //========================================================================
+
     }//eoc
 }//eons