Render pending concerns on dashboard

Author: Mark-Simulacrum

src/nag.rs

@@ -1,14 +1,17 @@
 use diesel::prelude::*;
 
 use crate::domain::github::{GitHubUser, Issue, IssueComment};
-use crate::domain::rfcbot::{FcpProposal, FcpReviewRequest};
+use crate::domain::rfcbot::{FcpConcern, FcpProposal, FcpReviewRequest};
+use crate::domain::schema::fcp_concern;
 use crate::error::DashResult;
 use crate::DB_POOL;
 
 #[derive(Serialize)]
 pub struct FcpWithInfo {
     pub fcp: FcpProposal,
     pub reviews: Vec<(GitHubUser, bool)>,
+    // (Concern name, comment registering it, and user leaving it)
+    pub concerns: Vec<(String, IssueComment, GitHubUser)>,
     pub issue: Issue,
     pub status_comment: IssueComment,
 }
@@ -31,6 +34,26 @@ pub fn all_fcps() -> DashResult<Vec<FcpWithInfo>> {
             .filter(fcp_review_request::fk_proposal.eq(fcp.id))
             .load::<FcpReviewRequest>(conn)?;
 
+        let raw_concerns = fcp_concern::table
+            .filter(fcp_concern::fk_proposal.eq(fcp.id))
+            .load::<FcpConcern>(conn)?;
+
+        let mut concerns = Vec::new();
+
+        for concern in raw_concerns {
+            // Skip resolved concerns.
+            if concern.fk_resolved_comment.is_some() {
+                continue;
+            }
+            let user = githubuser::table
+                .filter(githubuser::id.eq(concern.fk_initiator))
+                .first(conn)?;
+            let comment = issuecomment::table
+                .filter(issuecomment::id.eq(concern.fk_initiating_comment))
+                .first::<IssueComment>(conn)?;
+            concerns.push((concern.name, comment, user));
+        }
+
         let mut reviews_with_users = Vec::new();
 
         for review in reviews {
@@ -51,6 +74,7 @@ pub fn all_fcps() -> DashResult<Vec<FcpWithInfo>> {
         let fcp_with_info = FcpWithInfo {
             fcp,
             reviews: reviews_with_users,
+            concerns,
             issue,
             status_comment,
         };

src/server.rs

@@ -45,6 +45,7 @@ mod html {
             let nag::FcpWithInfo {
                 fcp,
                 reviews,
+                mut concerns,
                 issue,
                 status_comment,
             } = fcp;
@@ -57,11 +58,14 @@ mod html {
 
             pending_reviewers.sort();
 
+            concerns.sort_by_key(|c| c.0.clone());
+
             let record = json!({
                 "disposition": fcp.disposition,
                 "issue": issue,
                 "statusComment": status_comment,
                 "pendingReviewers": pending_reviewers,
+                "pendingConcerns": concerns,
             });
 
             for label in issue.labels.iter().filter(|l| l.starts_with("T-")).cloned() {

src/templates/fcp.hbs

@@ -14,7 +14,15 @@
         {{#each fcp.pendingReviewers as |r| }}
         <a href="/fcp/{{r}}">{{ r }}</a>&nbsp;
         {{else}}
-        pending concerns
+        no pending checkboxes
+        {{/each}}
+        </li></ul>
+
+        <ul><li>
+        {{#each fcp.pendingConcerns as |r| }}
+        <a href="https://github.com/{{ fcp.issue.repository }}/issues/{{ fcp.issue.number }}#issuecomment-{{ r.[1].id }}">{{ r.[0] }} (by {{ r.[2].login }})</a>&nbsp;
+        {{else}}
+        no pending concerns
         {{/each}}
         </li></ul>
     </li>