refactor(#1141): extract submit_review, list_reviews, fetch_inline_comments helpers

hive-forge/src/verbs/pr_reviews.rs

@@ -32,8 +32,6 @@ pub struct Args {
 }
 
 pub fn run(client: &Client, args: Args) -> Result<()> {
-    let repo = client.repo();
-
     let event = if args.approve {
         Some("APPROVED")
     } else if args.request_changes {
@@ -45,30 +43,54 @@ pub fn run(client: &Client, args: Args) -> Result<()> {
     };
 
     if let Some(ev) = event {
-        // Submit a review.
+        submit_review(client, args.number, ev, args.body)
-        let payload = json!({
-            "event": ev,
-            "body": args.body.unwrap_or_default(),
-        });
-        let v = client.post_json(
-            &format!("/repos/{repo}/pulls/{}/reviews", args.number),
-            &payload,
-        )?;
-        // Print a compact summary rather than the full review blob.
-        let summary = json!({
-            "id": v.get("id"),
-            "state": v.get("state"),
-            "user": v.get("user").and_then(|u| u.get("login")),
-        });
-        print_json(&summary)
     } else {
         if args.body.is_some() {
             bail!("--body requires one of --approve / --request-changes / --comment");
         }
-        // List mode: fetch reviews, then fetch inline comments for each review
+        list_reviews(client, args.number)
-        // so the full review content is visible without curl fallbacks.
+    }
-        let v =
+}
-            client.get_json(&format!("/repos/{repo}/pulls/{}/reviews", args.number))?;
+
+/// Submit a review event (APPROVED / REQUEST_CHANGES / COMMENT) and print
+/// a compact summary of the created review.
+fn submit_review(
+    client: &Client,
+    number: u64,
+    event: &str,
+    body: Option<String>,
+) -> Result<()> {
+    let repo = client.repo();
+    let payload = json!({
+        "event": event,
+        "body": body.unwrap_or_default(),
+    });
+    let v = client.post_json(
+        &format!("/repos/{repo}/pulls/{number}/reviews"),
+        &payload,
+    )?;
+    print_json(&json!({
+        "id": v.get("id"),
+        "state": v.get("state"),
+        "user": v.get("user").and_then(|u| u.get("login")),
+    }))
+}
+
+/// Fetch inline diff comments for a single review. Returns an empty vec on
+/// any error (missing review, network failure) so callers can degrade
+/// gracefully.
+fn fetch_inline_comments(client: &Client, repo: &str, pr: u64, review_id: u64) -> Vec<Value> {
+    client
+        .get_json(&format!("/repos/{repo}/pulls/{pr}/reviews/{review_id}/comments"))
+        .ok()
+        .and_then(|v| v.as_array().cloned())
+        .unwrap_or_default()
+}
+
+/// List all reviews for a PR, including inline diff comments per review.
+fn list_reviews(client: &Client, number: u64) -> Result<()> {
+    let repo = client.repo();
+    let v = client.get_json(&format!("/repos/{repo}/pulls/{number}/reviews"))?;
     let reviews = v.as_array().cloned().unwrap_or_default();
 
     if client.json_mode() {
@@ -76,16 +98,8 @@ pub fn run(client: &Client, args: Args) -> Result<()> {
             .iter()
             .map(|r| {
                 let id = r.get("id").and_then(Value::as_u64).unwrap_or(0);
-                    let inline = if id > 0 {
+                let inline: Vec<Value> = if id > 0 {
-                        client
+                    fetch_inline_comments(client, repo, number, id)
-                            .get_json(&format!(
-                                "/repos/{repo}/pulls/{}/reviews/{id}/comments",
-                                args.number
-                            ))
-                            .ok()
-                            .and_then(|v| v.as_array().cloned())
-                            .map(|comments| {
-                                comments
                         .iter()
                         .map(|c| {
                             json!({
@@ -95,9 +109,7 @@ pub fn run(client: &Client, args: Args) -> Result<()> {
                                 "body": c.get("body"),
                             })
                         })
-                                    .collect::<Vec<_>>()
+                        .collect()
-                            })
-                            .unwrap_or_default()
                 } else {
                     vec![]
                 };
@@ -130,29 +142,20 @@ pub fn run(client: &Client, args: Args) -> Result<()> {
             if !body.is_empty() {
                 println!("{body}");
             }
-                // Fetch and print inline comments for this review.
             if id > 0 {
-                    if let Ok(ic) = client.get_json(&format!(
+                for c in &fetch_inline_comments(client, repo, number, id) {
-                        "/repos/{repo}/pulls/{}/reviews/{id}/comments",
-                        args.number
-                    )) {
-                        let inline = ic.as_array().cloned().unwrap_or_default();
-                        for c in &inline {
                     let path = c.get("path").and_then(Value::as_str).unwrap_or("?");
                     let line = c
                         .get("line")
                         .and_then(Value::as_u64)
                         .map(|n| n.to_string())
                         .unwrap_or_else(|| "?".to_string());
-                            let cbody =
+                    let cbody = c.get("body").and_then(Value::as_str).unwrap_or("").trim();
-                                c.get("body").and_then(Value::as_str).unwrap_or("").trim();
                     println!("  [{path}:{line}] {cbody}");
                 }
             }
-                }
             println!();
         }
         Ok(())
     }
 }
-}