Update service_data

2 files changed, 18 insertions, 36 deletions

diff --git a/mod/mod-ci-github-service-data.cxx b/mod/mod-ci-github-service-data.cxx
index 0a37453..c4cd364 100644
--- a/mod/mod-ci-github-service-data.cxx
+++ b/mod/mod-ci-github-service-data.cxx
@@ -40,22 +40,16 @@ namespace brep
         p.next_expect_member_number<uint64_t> ("installation_id");
 
     repository_node_id = p.next_expect_member_string ("repository_node_id");
-    event_node_id = p.next_expect_member_string ("event_node_id");
+    repository_clone_url = p.next_expect_member_string ("repository_clone_url");
 
     {
-      string* s (p.next_expect_member_string_null ("repository_clone_url"));
+      string* s (p.next_expect_member_string_null ("pr_node_id"));
       if (s != nullptr)
-        repository_clone_url = *s;
+        pr_node_id = *s;
     }
 
     pr_number = p.next_expect_member_number_null<uint32_t> ("pr_number");
 
-    {
-      string* s (p.next_expect_member_string_null ("merge_node_id"));
-      if (s != nullptr)
-        merge_node_id = *s;
-    }
-
     report_sha = p.next_expect_member_string ("report_sha");
 
     p.next_expect_member_array ("check_runs");
@@ -106,7 +100,7 @@ namespace brep
                 timestamp iat_ea,
                 uint64_t iid,
                 string rid,
-                string eid,
+                string rcu,
                 kind_type k,
                 bool rr,
                 bool pc,
@@ -117,7 +111,7 @@ namespace brep
         installation_access (move (iat_tok), iat_ea),
         installation_id (iid),
         repository_node_id (move (rid)),
-        event_node_id (move (eid)),
+        repository_clone_url (move (rcu)),
         check_sha (move (cs)),
         report_sha (move (rs))
   {
@@ -131,21 +125,21 @@ namespace brep
                 timestamp iat_ea,
                 uint64_t iid,
                 string rid,
-                string eid,
+                string rcu,
+                string pid,
                 kind_type k,
                 bool rr,
                 bool pc,
                 string cs,
                 string rs,
-                string rcu,
                 uint32_t prn)
       : kind (k), pre_check (pc), re_request (rr),
         warning_success (ws),
         installation_access (move (iat_tok), iat_ea),
         installation_id (iid),
         repository_node_id (move (rid)),
-        event_node_id (move (eid)),
         repository_clone_url (move (rcu)),
+        pr_node_id (move (pid)),
         pr_number (prn),
         check_sha (move (cs)),
         report_sha (move (rs))
@@ -173,11 +167,11 @@ namespace brep
 
     s.member ("installation_id", installation_id);
     s.member ("repository_node_id", repository_node_id);
-    s.member ("event_node_id", event_node_id);
+    s.member ("repository_clone_url", repository_clone_url);
 
-    s.member_name ("repository_clone_url");
-    if (repository_clone_url)
-      s.value (*repository_clone_url);
+    s.member_name ("pr_node_id");
+    if (pr_node_id)
+      s.value (*pr_node_id);
     else
       s.value (nullptr);
 
@@ -187,12 +181,6 @@ namespace brep
     else
       s.value (nullptr);
 
-    s.member_name ("merge_node_id");
-    if (merge_node_id)
-      s.value (*merge_node_id);
-    else
-      s.value (nullptr);
-
     s.member ("report_sha", report_sha);
 
     s.member_begin_array ("check_runs");
diff --git a/mod/mod-ci-github-service-data.hxx b/mod/mod-ci-github-service-data.hxx
index c321edc..f563e29 100644
--- a/mod/mod-ci-github-service-data.hxx
+++ b/mod/mod-ci-github-service-data.hxx
@@ -92,20 +92,14 @@ namespace brep
 
     string repository_node_id; // GitHub-internal opaque repository id.
 
+    string repository_clone_url;
+
     // The following two are only used for pull requests.
     //
     // @@ TODO/LATER: maybe put them in a struct?
     //
     optional<string>   pr_node_id;
     optional<uint32_t> pr_number;
-    optional<string>   pr_repository_clone_url;
-
-    // The GitHub ID of the synthetic PR merge check run or absent if it
-    // hasn't been created yet.
-    //
-    // @@ TODO Remove once merge check run code has been removed.
-    //
-    optional<string> merge_node_id;
 
     // The commit ID the branch push or pull request (and its check runs) are
     // building. This will be the head commit for the branch push as well as
@@ -123,7 +117,7 @@ namespace brep
     vector<check_run> check_runs;
 
     // The GitHub ID of the synthetic conclusion check run or absent if it
-    // hasn't been created yet. See also merge_node_id above.
+    // hasn't been created yet.
     //
     optional<string> conclusion_node_id;
 
@@ -150,7 +144,7 @@ namespace brep
                   timestamp iat_expires_at,
                   uint64_t installation_id,
                   string repository_node_id,
-                  string event_node_id,
+                  string repository_clone_url,
                   kind_type kind,
                   bool pre_check,
                   bool re_request,
@@ -164,13 +158,13 @@ namespace brep
                   timestamp iat_expires_at,
                   uint64_t installation_id,
                   string repository_node_id,
-                  string event_node_id,
+                  string repository_clone_url,
+                  string pr_node_id,
                   kind_type kind,
                   bool pre_check,
                   bool re_request,
                   string check_sha,
                   string report_sha,
-                  string repository_clone_url,
                   uint32_t pr_number);
 
     service_data () = default;