fixed error, where Select returned 0 as total.

DCCS-IT-Business-Solutions · Jun 26, 2020 · 18e4c24 · 18e4c24
1 parent 7e6cdb0
commit 18e4c24
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 3 deletions.
diff --git a/DCCS.Data.Source.Tests/ResultTest.cs b/DCCS.Data.Source.Tests/ResultTest.cs
@@ -81,6 +81,8 @@ public void Should_map_data()
                 .Select(entry => new DummyDTO { Name = entry.Name, Length = (entry.Name ?? "").Length });
 
             Assert.IsInstanceOf(typeof(DummyDTO), sut.Data.First());
+            Assert.AreEqual(data.Count(), sut.Count);
+            Assert.AreEqual(data.Count(), sut.Total);
         }
 
         [Test]
@@ -172,6 +174,8 @@ public void Should_not_sort_if_unchecked()
             Assert.AreEqual("1", sorted[1].Name);
             Assert.AreEqual("7", sorted[2].Name);
 
+            Assert.AreEqual(3, sut.Total);
+
         }
 
         [Test]

diff --git a/DCCS.Data.Source/Result.cs b/DCCS.Data.Source/Result.cs
@@ -29,6 +29,23 @@ public override void SetData(IQueryable<T> data, bool sort, bool page)
             base.SetData(data, sort: sort, page: page);
         }
 
+        public new Result<DTO> Select<DTO>(Expression<Func<T, DTO>> predicate)
+        {
+            var result = new Result<DTO>(new Params
+            {
+                Count = Count,
+                OrderBy = OrderBy,
+                Desc = Desc,
+                Page = Page,
+            })
+            {
+                Data = Data.AsQueryable().Select(predicate)
+            };
+            result.Total = this.Total;
+
+            return result;
+        }
+
         public int Total { get; set; }
     }
 }
diff --git a/DCCS.Data.Source/ResultWithoutTotal.cs b/DCCS.Data.Source/ResultWithoutTotal.cs
@@ -45,14 +45,14 @@ public virtual void SetData(IQueryable<T> data, bool sort, bool page)
             }
         }
 
-        public Result<DTO> Select<DTO>(Expression<Func<T, DTO>> predicate)
+        public virtual ResultWithoutTotal<DTO> Select<DTO>(Expression<Func<T, DTO>> predicate)
         {
-            return new Result<DTO>(new Params
+            return new ResultWithoutTotal<DTO>(new Params
             {
                 Count = Count,
                 OrderBy = OrderBy,
                 Desc = Desc,
-                Page = Page
+                Page = Page,
             })
             {
                 Data = Data.AsQueryable().Select(predicate)