server/AyaNova/biz/WidgetBiz.cs

@@ -196,7 +196,12 @@ namespace AyaNova.Biz
                                         .ToArrayAsync();
 
 
-            var totalRecordCount = await ct.Widget.CountAsync();
+            // var totalRecordCount = await ct.Widget.CountAsync();
+            var totalRecordCount = await ct.Widget
+                                                   .AsNoTracking()
+                                                   .FromSql(q)
+                                                   .CountAsync();
+
             var pageLinks = new PaginationLinkBuilder(Url, routeName, null, pagingOptions, totalRecordCount).PagingLinksObject();
 
             ApiPagedResponse<Widget> pr = new ApiPagedResponse<Widget>(items, pageLinks);

test/raven-integration/DataFilter/DataFilterFilteringLists.cs

@@ -42,6 +42,7 @@ namespace raven_integration
         //
 
         #region DATE FILTER TESTS
+
         /// <summary>
         /// 
         /// </summary>
@@ -141,6 +142,211 @@ namespace raven_integration
 
         }
 
+
+        /// <summary>
+        /// 
+        /// </summary>
+        [Fact]
+        public async void DateOpGreaterThanFilterWorks()
+        {
+
+            var WidgetNameStart = "DateOpGreaterThanFilterWorks";
+
+            long IncludedWidgetId = 0;
+            long ExcludedWidgetId = 0;
+
+            //CREATE TEST WIDGETS 
+
+            //included widget          
+            dynamic w = new JObject();
+            w.name = Util.Uniquify(WidgetNameStart);
+            w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime();
+            w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime();
+
+            ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
+            Util.ValidateDataReturnResponseOk(a);
+            IncludedWidgetId = a.ObjectResponse["data"]["id"].Value<long>();
+
+            //Excluded widget
+            w.name = Util.Uniquify(WidgetNameStart);
+            w.startDate = new DateTime(1968, 3, 10, 10, 0, 0).ToUniversalTime();
+            w.endDate = new DateTime(1968, 3, 10, 11, 0, 0).ToUniversalTime();
+
+            a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
+            Util.ValidateDataReturnResponseOk(a);
+            ExcludedWidgetId = a.ObjectResponse["data"]["id"].Value<long>();
+
+            //CREATE FILTER
+            dynamic d = new JObject();
+            d.name = Util.Uniquify("Test INT DataFilter");
+            // d.ownerId = 1L;
+            d["public"] = true;
+            d.listKey = "widget";
+
+            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);
+
+            //## INCLUSIVE FILTER
+            dynamic FilterItem = new JObject();
+            FilterItem.fld = "startdate";
+            FilterItem.op = OpGreaterThan;
+            FilterItem.value = new DateTime(1970, 3, 12, 9, 0, 0).ToUniversalTime();
+            dfilter.Add(FilterItem);
+
+            d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
+
+            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), 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 at least this test record
+            ((JArray)a.ObjectResponse["data"]).Count.Should().BeGreaterThan(0);
+            var v = ((JArray)a.ObjectResponse["data"]);
+            List<long> IDInResultList = new List<long>();
+            int InclusiveMatchCount = 0;
+            int ExclusiveMatchCount = 0;
+            foreach (JObject o in v)
+            {
+                if (IncludedWidgetId == o["id"].Value<long>())
+                    InclusiveMatchCount++;
+                if (ExcludedWidgetId == o["id"].Value<long>())//whups
+                    ExclusiveMatchCount++;
+            }
+
+            InclusiveMatchCount.Should().BeGreaterOrEqualTo(1);
+            ExclusiveMatchCount.Should().Be(0);
+
+            //DELETE WIDGETS
+            a = await Util.DeleteAsync("Widget/" + IncludedWidgetId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            Util.ValidateHTTPStatusCode(a, 204);
+
+            a = await Util.DeleteAsync("Widget/" + ExcludedWidgetId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            Util.ValidateHTTPStatusCode(a, 204);
+
+
+            //DELETE DATAFILTER
+            a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            Util.ValidateHTTPStatusCode(a, 204);
+        }
+
+
+        
+        /// <summary>
+        /// 
+        /// </summary>
+        [Fact]
+        public async void DateOpGreaterThanOrEqualToFilterWorks()
+        {
+
+            var WidgetNameStart = "DateOpGreaterThanOrEqualToFilterWorks";
+
+            long IncludedWidgetId = 0;
+            long ExcludedWidgetId = 0;
+
+            //CREATE TEST WIDGETS 
+
+            //included widget          
+            dynamic w = new JObject();
+            w.name = Util.Uniquify(WidgetNameStart);
+            w.startDate = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime();
+            w.endDate = new DateTime(1970, 3, 12, 11, 0, 0).ToUniversalTime();
+
+            ApiResponse a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
+            Util.ValidateDataReturnResponseOk(a);
+            IncludedWidgetId = a.ObjectResponse["data"]["id"].Value<long>();
+
+            //Excluded widget
+            w.name = Util.Uniquify(WidgetNameStart);
+            w.startDate = new DateTime(1968, 3, 10, 10, 0, 0).ToUniversalTime();
+            w.endDate = new DateTime(1968, 3, 10, 11, 0, 0).ToUniversalTime();
+
+            a = await Util.PostAsync("Widget", await Util.GetTokenAsync("manager", "l3tm3in"), w.ToString());
+            Util.ValidateDataReturnResponseOk(a);
+            ExcludedWidgetId = a.ObjectResponse["data"]["id"].Value<long>();
+
+            //CREATE FILTER
+            dynamic d = new JObject();
+            d.name = Util.Uniquify("Test INT DataFilter");
+            // d.ownerId = 1L;
+            d["public"] = true;
+            d.listKey = "widget";
+
+            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);
+
+            //## INCLUSIVE FILTER
+            dynamic FilterItem = new JObject();
+            FilterItem.fld = "startdate";
+            FilterItem.op = OpGreaterThanOrEqualTo;
+            FilterItem.value = new DateTime(1970, 3, 12, 10, 0, 0).ToUniversalTime();
+            dfilter.Add(FilterItem);
+
+            d.filter = dfilter.ToString();//it expects it to be a json string, not actual json
+
+            a = await Util.PostAsync("DataFilter", await Util.GetTokenAsync("BizAdminFull"), 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 at least this test record
+            ((JArray)a.ObjectResponse["data"]).Count.Should().BeGreaterThan(0);
+            var v = ((JArray)a.ObjectResponse["data"]);
+            List<long> IDInResultList = new List<long>();
+            int InclusiveMatchCount = 0;
+            int ExclusiveMatchCount = 0;
+            foreach (JObject o in v)
+            {
+                if (IncludedWidgetId == o["id"].Value<long>())
+                    InclusiveMatchCount++;
+                if (ExcludedWidgetId == o["id"].Value<long>())//whups
+                    ExclusiveMatchCount++;
+            }
+
+            InclusiveMatchCount.Should().BeGreaterOrEqualTo(1);
+            ExclusiveMatchCount.Should().Be(0);
+
+            //DELETE WIDGETS
+            a = await Util.DeleteAsync("Widget/" + IncludedWidgetId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            Util.ValidateHTTPStatusCode(a, 204);
+
+            a = await Util.DeleteAsync("Widget/" + ExcludedWidgetId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            Util.ValidateHTTPStatusCode(a, 204);
+
+
+            //DELETE DATAFILTER
+            a = await Util.DeleteAsync("DataFilter/" + DataFilterId.ToString(), await Util.GetTokenAsync("BizAdminFull"));
+            Util.ValidateHTTPStatusCode(a, 204);
+        }
+
+
+
+
+
+//========
+
         #endregion date filter tests