group count fix?

coronabytes · coronabytes · commit 2b6f34289266 · 2022-09-03T14:37:49.000+02:00
diff --git a/Core.Arango.DevExtreme.Tests/Core.Arango.DevExtreme.Tests.csproj b/Core.Arango.DevExtreme.Tests/Core.Arango.DevExtreme.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <PrivateAssets>all</PrivateAssets>
diff --git a/Core.Arango.DevExtreme/ArangoTransform.cs b/Core.Arango.DevExtreme/ArangoTransform.cs
@@ -111,9 +111,14 @@ public async Task<DxLoadResult> ExecuteAsync<T>(IArangoContext arango,
                 var res = await arango.Query.ExecuteAsync<JObject>(handle, query, Parameter,
                     cancellationToken: cancellationToken);
 
+                var groupData = BuildGrouping(this, res);
+
                 return new DxLoadResult
                 {
-                    Data = BuildGrouping(this, res)
+                    Data = groupData,
+                    // Experimental
+                    TotalCount = _loadOption.RequireTotalCount ? groupData.Sum(x=> x.Count ?? 0) : -1,
+                    GroupCount = _loadOption.RequireGroupCount ? groupData.Count : -1,
                 };
             }
             else
@@ -154,7 +159,7 @@ public async Task<DxLoadResult> ExecuteAsync<T>(IArangoContext arango,
                 {
                     Data = res,
                     Summary = summary,
-                    TotalCount = res.FullCount ?? -1
+                    TotalCount = res.FullCount ?? -1,
                 };
             }
         }
diff --git a/Core.Arango.Migration.Tests/Core.Arango.Migration.Tests.csproj b/Core.Arango.Migration.Tests/Core.Arango.Migration.Tests.csproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

Original file line number	Diff line number	Diff line change
`@@ -111,9 +111,14 @@ public async Task<DxLoadResult> ExecuteAsync<T>(IArangoContext arango,`
`111`	`111`	`var res = await arango.Query.ExecuteAsync<JObject>(handle, query, Parameter,`
`112`	`112`	`cancellationToken: cancellationToken);`
`113`	`113`
	`114`	`+ var groupData = BuildGrouping(this, res);`
	`115`	`+`
`114`	`116`	`return new DxLoadResult`
`115`	`117`	`{`
`116`		`- Data = BuildGrouping(this, res)`
	`118`	`+ Data = groupData,`
	`119`	`+ // Experimental`
	`120`	`+ TotalCount = _loadOption.RequireTotalCount ? groupData.Sum(x=> x.Count ?? 0) : -1,`
	`121`	`+ GroupCount = _loadOption.RequireGroupCount ? groupData.Count : -1,`
`117`	`122`	`};`
`118`	`123`	`}`
`119`	`124`	`else`
`@@ -154,7 +159,7 @@ public async Task<DxLoadResult> ExecuteAsync<T>(IArangoContext arango,`
`154`	`159`	`{`
`155`	`160`	`Data = res,`
`156`	`161`	`Summary = summary,`
`157`		`- TotalCount = res.FullCount ?? -1`
	`162`	`+ TotalCount = res.FullCount ?? -1,`
`158`	`163`	`};`
`159`	`164`	`}`
`160`	`165`	`}`