Reorder app_id arguments

3 files changed, 21 insertions, 21 deletions

diff --git a/mod/mod-ci-github-gq.cxx b/mod/mod-ci-github-gq.cxx
index 6f40cd6..f27603f 100644
--- a/mod/mod-ci-github-gq.cxx
+++ b/mod/mod-ci-github-gq.cxx
@@ -227,9 +227,9 @@ namespace brep
   // Serialize a query that fetches the most recent check runs on a commit.
   //
   static string
-  gq_query_get_check_runs (const string& ri, // Repository id
+  gq_query_get_check_runs (uint64_t ai,      // App id
+                           const string& ri, // Repository id
                            const string& ci, // Commit id
-                           uint64_t ai,      // App id
                            size_t cn)        // Check run count
   {
 
@@ -401,9 +401,9 @@ namespace brep
   //
   struct gq_create_data
   {
+    uint64_t                        app_id;
     reference_wrapper<const string> repository_id;
     reference_wrapper<const string> head_sha;
-    uint64_t                        app_id;
   };
 
   static bool
@@ -455,9 +455,9 @@ namespace brep
         // GraphQL query which fetches the most recently-created check runs.
         //
         string rq (gq_serialize_request (
-          gq_query_get_check_runs (create_data->repository_id,
+          gq_query_get_check_runs (create_data->app_id,
+                                   create_data->repository_id,
                                    create_data->head_sha,
-                                   create_data->app_id,
                                    crs_n)));
 
         // Type that parses the result of the above GraphQL query.
@@ -817,9 +817,9 @@ namespace brep
   gq_create_check_runs (const basic_mark& error,
                         vector<check_run>& crs,
                         const string& iat,
+                        uint64_t ai,
                         const string& rid,
-                        const string& hs,
-                        uint64_t ai)
+                        const string& hs)
   {
     // No support for result_status so state cannot be built.
     //
@@ -855,7 +855,7 @@ namespace brep
                                  i, e,
                                  iat,
                                  move (rq),
-                                 gq_create_data {rid, hs, ai}))
+                                 gq_create_data {ai, rid, hs}))
         return false;
     }
 
@@ -866,9 +866,9 @@ namespace brep
   gq_create_check_run (const basic_mark& error,
                        check_run& cr,
                        const string& iat,
+                       uint64_t ai,
                        const string& rid,
                        const string& hs,
-                       uint64_t ai,
                        const optional<string>& du,
                        build_state st,
                        string ti, string su)
@@ -894,7 +894,7 @@ namespace brep
                                   crs,
                                   iat,
                                   move (rq),
-                                  gq_create_data {rid, hs, ai}));
+                                  gq_create_data {ai, rid, hs}));
 
     cr = move (crs[0]);
 
@@ -905,9 +905,9 @@ namespace brep
   gq_create_check_run (const basic_mark& error,
                        check_run& cr,
                        const string& iat,
+                       uint64_t ai,
                        const string& rid,
                        const string& hs,
-                       uint64_t ai,
                        const optional<string>& du,
                        gq_built_result br)
   {
@@ -928,7 +928,7 @@ namespace brep
                                   crs,
                                   iat,
                                   move (rq),
-                                  gq_create_data {rid, hs, ai}));
+                                  gq_create_data {ai, rid, hs}));
 
     cr = move (crs[0]);
 
diff --git a/mod/mod-ci-github-gq.hxx b/mod/mod-ci-github-gq.hxx
index d66d0fb..45f1ad9 100644
--- a/mod/mod-ci-github-gq.hxx
+++ b/mod/mod-ci-github-gq.hxx
@@ -37,9 +37,9 @@ namespace brep
   gq_create_check_runs (const basic_mark& error,
                         vector<check_run>& check_runs,
                         const string& installation_access_token,
+                        uint64_t app_id,
                         const string& repository_id,
-                        const string& head_sha,
-                        uint64_t app_id);
+                        const string& head_sha);
 
   // Create a new check run on GitHub for a build in the queued or building
   // state. Note that the state cannot be built because in that case a
@@ -58,9 +58,9 @@ namespace brep
   gq_create_check_run (const basic_mark& error,
                        check_run& cr,
                        const string& installation_access_token,
+                       uint64_t app_id,
                        const string& repository_id,
                        const string& head_sha,
-                       uint64_t app_id,
                        const optional<string>& details_url,
                        build_state,
                        string title,
@@ -80,9 +80,9 @@ namespace brep
   gq_create_check_run (const basic_mark& error,
                        check_run& cr,
                        const string& installation_access_token,
+                       uint64_t app_id,
                        const string& repository_id,
                        const string& head_sha,
-                       uint64_t app_id,
                        const optional<string>& details_url,
                        gq_built_result);
 
diff --git a/mod/mod-ci-github.cxx b/mod/mod-ci-github.cxx
index c62f33e..5570beb 100644
--- a/mod/mod-ci-github.cxx
+++ b/mod/mod-ci-github.cxx
@@ -1530,7 +1530,7 @@ namespace brep
                        conclusion_building_summary};
 
     if (gq_create_check_runs (error, check_runs, iat->token,
-                              repo_node_id, head_sha, cr.check_run.app_id))
+                              cr.check_run.app_id, repo_node_id, head_sha))
     {
       assert (bcr.state == build_state::queued);
       assert (ccr.state == build_state::building);
@@ -2009,9 +2009,9 @@ namespace brep
       if (gq_create_check_run (error,
                                cr,
                                iat->token,
+                               sd.app_id,
                                sd.repository_node_id,
                                sd.report_sha,
-                               sd.app_id,
                                details_url (tenant_id),
                                build_state::building,
                                title, summary))
@@ -2414,9 +2414,9 @@ namespace brep
       if (gq_create_check_runs (error,
                                 crs,
                                 iat->token,
+                                sd.app_id,
                                 sd.repository_node_id,
-                                sd.report_sha,
-                                sd.app_id))
+                                sd.report_sha))
       {
         for (const check_run& cr: crs)
         {
@@ -2899,9 +2899,9 @@ namespace brep
         if (gq_create_check_run (error,
                                  cr,
                                  iat->token,
+                                 sd.app_id,
                                  sd.repository_node_id,
                                  sd.report_sha,
-                                 sd.app_id,
                                  details_url (b),
                                  move (br)))
         {