Add more details to relevant FCPs steps

Author: Urgau

src/actions.rs

@@ -9,6 +9,7 @@ use tera::{Context, Tera};
 use crate::{
     github::{self, GithubClient, Repository},
     http_client::{CompilerMeeting, HttpClient},
+    rfcbot,
 };
 
 #[async_trait]
@@ -54,12 +55,22 @@ pub struct IssueDecorator {
     pub mcp_details: Option<MCPDetails>,
 }
 
+#[derive(Serialize, Deserialize, Debug)]
+pub struct FCPConcernDetails {
+    pub name: String,
+    pub reviewer_login: String,
+    pub concern_url: String,
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct FCPDetails {
     pub bot_tracking_comment_html_url: String,
     pub bot_tracking_comment_content: String,
     pub initiating_comment_html_url: String,
     pub initiating_comment_content: String,
+    pub disposition: String,
+    pub pending_reviewers: Vec<rfcbot::Reviewer>,
+    pub concerns: Vec<FCPConcernDetails>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]
@@ -130,6 +141,7 @@ impl<'a> Action for Step<'a> {
                     let query = query.clone();
                     handles.push(tokio::task::spawn(async move {
                         let _permit = semaphore.acquire().await?;
+                        let fcps_groups = ["proposed_fcp", "in_pre_fcp", "in_fcp"];
                         let mcps_groups = [
                             "mcp_new_not_seconded",
                             "mcp_old_not_seconded",
@@ -140,7 +152,7 @@ impl<'a> Action for Step<'a> {
                         let issues = query
                             .query(
                                 &repository,
-                                name == "proposed_fcp",
+                                fcps_groups.contains(&name.as_str()),
                                 mcps_groups.contains(&name.as_str())
                                     && repository.full_name.contains("rust-lang/compiler-team"),
                                 &gh,

src/github.rs

@@ -1712,7 +1712,9 @@ impl<'q> IssuesQuery for Query<'q> {
             .with_context(|| "Unable to get issues.")?;
 
         let fcp_map = if include_fcp_details {
-            crate::rfcbot::get_all_fcps().await?
+            crate::rfcbot::get_all_fcps()
+                .await
+                .with_context(|| "Unable to get all fcps from rfcbot.")?
         } else {
             HashMap::new()
         };
@@ -1750,6 +1752,29 @@ impl<'q> IssuesQuery for Query<'q> {
                         bot_tracking_comment_content,
                         initiating_comment_html_url: init_comment.html_url.clone(),
                         initiating_comment_content: quote_reply(&init_comment.body),
+                        disposition: fcp
+                            .fcp
+                            .disposition
+                            .as_deref()
+                            .unwrap_or("<unknown>")
+                            .to_string(),
+                        pending_reviewers: fcp
+                            .reviews
+                            .iter()
+                            .filter_map(|r| (!r.approved).then(|| r.reviewer.clone()))
+                            .collect(),
+                        concerns: fcp
+                            .concerns
+                            .iter()
+                            .map(|c| crate::actions::FCPConcernDetails {
+                                name: c.name.clone(),
+                                reviewer_login: c.reviewer.login.clone(),
+                                concern_url: format!(
+                                    "{}#issuecomment-{}",
+                                    issue.html_url, c.comment.id
+                                ),
+                            })
+                            .collect(),
                     })
                 } else {
                     None