Use the original base query for counting total items, not the one wit…

…h paging on it
Cratis · Jul 23, 2024 · 35e9999 · 35e9999
1 parent bf2a1c8
commit 35e9999
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/Source/DotNET/MongoDB/MongoCollectionExtensions.cs b/Source/DotNET/MongoDB/MongoCollectionExtensions.cs
@@ -207,12 +207,13 @@ async Task Watch()
         {
             try
             {
-                var response = findCall();
-                await UpdateTotalItems(queryContext, response);
+                var query = findCall();
+                await UpdateTotalItems(queryContext, query);
+                var baseQuery = query;
 
-                response = AddSorting(queryContext, response);
-                response = AddPaging(queryContext, response);
-                documents = response.ToList();
+                query = AddSorting(queryContext, query);
+                query = AddPaging(queryContext, query);
+                documents = query.ToList();
                 onNext(documents, subject);
 
                 cursor = await collection.WatchAsync(pipeline, options);
@@ -234,7 +235,8 @@ await cursor.ForEachAsync(
                             onNext,
                             changeDocument,
                             invalidateFindOnAddOrDelete,
-                            response,
+                            baseQuery,
+                            query,
                             documents,
                             subject,
                             idProperty);
@@ -262,17 +264,18 @@ await cursor.ForEachAsync(
         return subject;
     }
 
-    static async Task UpdateTotalItems<TDocument>(QueryContext queryContext, IFindFluent<TDocument, TDocument> response)
+    static async Task UpdateTotalItems<TDocument>(QueryContext queryContext, IFindFluent<TDocument, TDocument> query)
     {
-        queryContext.TotalItems = await response.CountDocumentsAsync();
+        queryContext.TotalItems = await query.CountDocumentsAsync();
     }
 
     static async Task<List<TDocument>> HandleChange<TDocument, TResult>(
         QueryContext queryContext,
         Action<IEnumerable<TDocument>, ISubject<TResult>> onNext,
         ChangeStreamDocument<TDocument> changeDocument,
         bool invalidateFindOnAddOrDelete,
-        IFindFluent<TDocument, TDocument> response,
+        IFindFluent<TDocument, TDocument> baseQuery,
+        IFindFluent<TDocument, TDocument> query,
         List<TDocument> documents,
         ISubject<TResult> subject,
         PropertyInfo idProperty)
@@ -307,8 +310,8 @@ static async Task<List<TDocument>> HandleChange<TDocument, TResult>(
 
             if (invalidateFindOnAddOrDelete)
             {
-                await UpdateTotalItems(queryContext, response);
-                documents = await response.ToListAsync();
+                await UpdateTotalItems(queryContext, baseQuery);
+                documents = await query.ToListAsync();
             }
         }