Fixed incorrect TotalCount for MongoDB (#7669)

Author: glen-84

src/HotChocolate/Core/src/Types.CursorPagination/CursorPagingHandler.cs

@@ -179,7 +179,13 @@ protected async ValueTask<Connection<TEntity>> SliceAsync(
             return new Connection<TEntity>(ConnectionPageInfo.Empty, totalCount ?? -1);
         }
 
-        var data = await executor.QueryAsync(slicedQuery, offset, countRequired, cancellationToken).ConfigureAwait(false);
+        var data = await executor.QueryAsync(
+            slicedQuery,
+            originalQuery,
+            offset,
+            countRequired,
+            cancellationToken).ConfigureAwait(false);
+
         var moreItemsReturnedThanRequested = data.Edges.Length > length;
         var isSequenceFromStart = offset == 0;
         var edges = data.Edges;

src/HotChocolate/Core/src/Types.CursorPagination/ICursorPaginationQueryExecutor.cs

@@ -38,6 +38,9 @@ ValueTask<int> CountAsync(
     /// <param name="slicedQuery">
     /// The sliced query that should be executed.
     /// </param>
+    /// <param name="originalQuery">
+    /// The original query.
+    /// </param>
     /// <param name="offset">
     /// Teh offset for the index edge.
     /// </param>
@@ -52,6 +55,7 @@ ValueTask<int> CountAsync(
     /// </returns>
     ValueTask<CursorPaginationData<TEntity>> QueryAsync(
         TQuery slicedQuery,
+        TQuery originalQuery,
         int offset,
         bool includeTotalCount,
         CancellationToken cancellationToken);

src/HotChocolate/Core/src/Types.CursorPagination/QueryableCursorPagingHandler.cs

@@ -56,6 +56,7 @@ public ValueTask<int> CountAsync(
 
         public async ValueTask<CursorPaginationData<TEntity>> QueryAsync(
             IQueryable<TEntity> slicedQuery,
+            IQueryable<TEntity> originalQuery,
             int offset,
             bool includeTotalCount,
             CancellationToken cancellationToken)
@@ -65,7 +66,6 @@ public async ValueTask<CursorPaginationData<TEntity>> QueryAsync(
 
             if (includeTotalCount)
             {
-                var originalQuery = executable.Source;
                 var combinedQuery = slicedQuery.Select(t => new { TotalCount = originalQuery.Count(), Item = t });
                 totalCount = 0;
 

src/HotChocolate/MongoDb/src/Data/Paging/MongoDbCursorPagingHandler.cs

@@ -57,14 +57,15 @@ public async ValueTask<int> CountAsync(
 
         public async ValueTask<CursorPaginationData<TEntity>> QueryAsync(
             IMongoPagingContainer<TEntity> slicedQuery,
+            IMongoPagingContainer<TEntity> originalQuery,
             int offset,
             bool includeTotalCount,
             CancellationToken cancellationToken)
         {
             if (includeTotalCount)
             {
                 var itemsTask = slicedQuery.QueryAsync(offset, cancellationToken);
-                var countTask = slicedQuery.CountAsync(cancellationToken);
+                var countTask = originalQuery.CountAsync(cancellationToken);
 
                 await Task.WhenAll(itemsTask, countTask).ConfigureAwait(false);
 

src/HotChocolate/MongoDb/test/Data.MongoDb.Paging.Tests/MongoDbCursorPagingAggregateFluentTests.cs

@@ -200,6 +200,9 @@ public async Task TotalCount_AndFirst()
         var result = await executor.ExecuteAsync(
             @"{
                 foos(first:1) {
+                    nodes {
+                        bar
+                    }
                     totalCount
                 }
             }");

src/HotChocolate/MongoDb/test/Data.MongoDb.Paging.Tests/MongoDbCursorPagingFindFluentTests.cs

@@ -234,6 +234,9 @@ public async Task TotalCount_AndFirst()
         var result = await executor.ExecuteAsync(
             @"{
                 foos(first:1) {
+                    nodes {
+                        bar
+                    }
                     totalCount
                 }
             }");

src/HotChocolate/MongoDb/test/Data.MongoDb.Paging.Tests/__snapshots__/MongoDbCursorPagingAggregateFluentTests.TotalCount_AndFirst.snap

@@ -1,6 +1,11 @@
 {
   "data": {
     "foos": {
+      "nodes": [
+        {
+          "bar": "a"
+        }
+      ],
       "totalCount": 5
     }
   }

src/HotChocolate/MongoDb/test/Data.MongoDb.Paging.Tests/__snapshots__/MongoDbCursorPagingFindFluentTests.TotalCount_AndFirst.snap

@@ -1,6 +1,11 @@
 {
   "data": {
     "foos": {
+      "nodes": [
+        {
+          "bar": "a"
+        }
+      ],
       "totalCount": 5
     }
   }

src/HotChocolate/Raven/src/Data/Pagination/RavenCursorPagingHandler.cs

@@ -61,14 +61,15 @@ public async ValueTask<int> CountAsync(
 
         public async ValueTask<CursorPaginationData<TEntity>> QueryAsync(
             RavenPagingContainer<TEntity> slicedQuery,
+            RavenPagingContainer<TEntity> originalQuery,
             int offset,
             bool includeTotalCount,
             CancellationToken cancellationToken)
         {
             if (includeTotalCount)
             {
                 var itemsTask = slicedQuery.QueryAsync(offset, cancellationToken);
-                var countTask = slicedQuery.CountAsync(cancellationToken);
+                var countTask = originalQuery.CountAsync(cancellationToken);
 
                 await Task.WhenAll(itemsTask, countTask).ConfigureAwait(false);
 

src/HotChocolate/Raven/test/Data.Raven.Paging.Tests/RavenAsyncDocumentQueryTests.cs

@@ -190,6 +190,9 @@ public async Task Cursor_TotalCount_AndFirst()
         var result = await executor.ExecuteAsync(
             @"{
                 foos(first:1) {
+                    nodes {
+                        bar
+                    }
                     totalCount
                 }
             }");