Fix multi-paged queries (#297)

* Take a copy of variables passed into subquery

* Fix paged queries

Previously instances of PagedSubquery would not check their returned
PageInfo to see if they had any more pages of results to load and so
each subquery would only get run at most once.

It also didn't always call the `addResult` delegate to add a page of results to the
parent collection.

* Simplify code change and fix issue on subsequent loops

* webhooks-methods.js is no longer the last repo in the org

* Treat Bio like Email and coalesce it to an empty string

Author: jMarkP

Octokit.GraphQL.Core/Core/PagedQuery.cs

@@ -76,6 +76,7 @@ protected class Runner : IQueryRunner<TResult>, ISubqueryRunner
             readonly ResponseDeserializer deserializer = new ResponseDeserializer();
             Stack<IQueryRunner> subqueryRunners;
             Dictionary<ISubquery, List<Action<object>>> subqueryResultSinks;
+            private bool hasMore;
 
             public Runner(
                 PagedQuery<TResult> owner,
@@ -88,7 +89,7 @@ public Runner(
             }
 
             /// <inheritdoc />
-            public TResult Result { get; private set; }
+            public TResult Result { get; protected set; }
 
             /// <inheritdoc />
             object IQueryRunner.Result => Result;
@@ -98,12 +99,14 @@ public Runner(
             /// <inheritdoc />
             public virtual async Task<bool> RunPage(CancellationToken cancellationToken = default)
             {
-                if (subqueryRunners == null)
+                if (subqueryRunners == null || hasMore)
                 {
-                    subqueryRunners = new Stack<IQueryRunner>();
-                    subqueryResultSinks = new Dictionary<ISubquery, List<Action<object>>>();
+                    if (subqueryRunners == null)
+                    {
+                        subqueryRunners = new Stack<IQueryRunner>();
+                    }
 
-                    // This is the first run, so run the master page.
+                    subqueryResultSinks = new Dictionary<ISubquery, List<Action<object>>>();
                     var master = owner.MasterQuery;
                     var data = await connection.Run(master.GetPayload(Variables), cancellationToken).ConfigureAwait(false);
                     var json = deserializer.Deserialize(data);
@@ -133,8 +136,15 @@ public virtual async Task<bool> RunPage(CancellationToken cancellationToken = de
                             }
                         }
                     }
+
+                    if (owner is ISubquery ownerAsSubquery)
+                    {
+                        var pageInfo = ownerAsSubquery.PageInfo(json);
+                        hasMore = (bool)pageInfo["hasNextPage"];
+                        Variables["__after"] = (string)pageInfo["endCursor"];
+                    }
                 }
-                else
+                else if (subqueryRunners.Any())
                 {
                     // Get the next subquery runner.
                     var runner = subqueryRunners.Peek();
@@ -146,7 +156,7 @@ public virtual async Task<bool> RunPage(CancellationToken cancellationToken = de
                     }
                 }
 
-                return subqueryRunners.Count > 0;
+                return subqueryRunners.Count > 0 || hasMore;
             }
 
             /// <inheritdoc />

Octokit.GraphQL.Core/Core/PagedSubquery.cs

@@ -115,7 +115,8 @@ public SubqueryRunner(
                 string after,
                 IDictionary<string, object> variables,
                 Action<object> addResult)
-                : base(owner, connection, variables ?? new Dictionary<string, object>())
+                : base(owner, connection, variables?.ToDictionary(x => x.Key, x => x.Value) ?? 
+                                          new Dictionary<string, object>())
             {
                 Variables["__id"] = id;
                 Variables["__after"] = after;
@@ -127,14 +128,15 @@ public override async Task<bool> RunPage(CancellationToken cancellationToken = d
             {
                 var more = await base.RunPage(cancellationToken).ConfigureAwait(false);
 
-                if (!more)
+                if (Result == null) return more;
+                
+                foreach (var i in (IList)Result)
                 {
-                    foreach (var i in (IList)Result)
-                    {
-                        addResult(i);
-                    }
+                    addResult(i);
                 }
 
+                Result = default;
+
                 return more;
             }
         }

Octokit.GraphQL.IntegrationTests/Queries/IssueTests.cs

@@ -201,7 +201,7 @@ public async Task Can_AutoPage_Issues_Comments_With_Subquery()
         {
             var query = new Query()
                 .Repository(owner: "octokit", name: "octokit.net")
-                .Issues().AllPages(50)
+                .Issues().AllPages(100)
                 .Select(issue => new
                 {
                     issue.Id,
@@ -222,7 +222,7 @@ public async Task Can_AutoPage_Issues_With_Subquery()
         {
             var query = new Query()
                 .Repository(owner: "octokit", name: "octokit.net")
-                .Issues().AllPages(50)
+                .Issues().AllPages(100)
                 .Select(issue => new
                 {
                     issue.Id,

Octokit.GraphQL.IntegrationTests/Queries/RepositoryTests.cs

@@ -175,7 +175,7 @@ public async Task Query_Organization_Repositories_Select_Simple_Fragment()
 
             var repositoryName = (await Connection.Run(query)).OrderByDescending(s => s).First();
 
-            Assert.Equal("webhooks-methods.js", repositoryName);
+            Assert.Equal("webhooks.net", repositoryName);
         }
 
         [IntegrationTest]
@@ -260,7 +260,7 @@ public async Task Query_Organization_Repositories_Select_Object_Fragment()
 
             var testModelObject = (await Connection.Run(query)).OrderByDescending(s => s.StringField1).First();
 
-            Assert.Equal("webhooks-methods.js", testModelObject.StringField1);
+            Assert.Equal("webhooks.net", testModelObject.StringField1);
         }
 
         [IntegrationTest]

Octokit.GraphQL.IntegrationTests/Queries/ViewerTests.cs

@@ -55,7 +55,7 @@ public async Task Viewer_By_GraphyQL_Matches_Api()
             Assert.NotNull(graphqlUser);
 
             Assert.Equal(apiUser.AvatarUrl.Split("?").First(), graphqlUser.AvatarUrl.Split("?").First());
-            Assert.Equal(apiUser.Bio, graphqlUser.Bio);
+            Assert.Equal(apiUser.Bio ?? string.Empty, graphqlUser.Bio);
             Assert.Equal(apiUser.Company, graphqlUser.Company);
 
             Assert.Equal(apiUser.CreatedAt.ToUniversalTime(), graphqlUser.CreatedAt.ToUniversalTime());