Add queue page

- Add queue table
- Add queue statistics
- Redirect homepage to queue page
- Replace original homepage with /help page

Author: Sakib25800

.sqlx/query-4e0aaa8eea9ccadab0fc5514558a7a72f05ef3ba1644f43ae5e5d54bd64ca533.json

@@ -12,11 +12,11 @@ use super::operations::{
     approve_pull_request, create_build, create_pull_request, create_workflow,
     delegate_pull_request, find_build, find_pr_by_build, get_nonclosed_pull_requests,
     get_nonclosed_pull_requests_by_base_branch, get_prs_with_unknown_mergeable_state,
-    get_pull_request, get_repository, get_running_builds, get_workflow_urls_for_build,
-    get_workflows_for_build, insert_repo_if_not_exists, set_pr_priority, set_pr_rollup,
-    set_pr_status, unapprove_pull_request, undelegate_pull_request, update_build_status,
-    update_mergeable_states_by_base_branch, update_pr_build_id, update_pr_mergeable_state,
-    update_workflow_status, upsert_pull_request, upsert_repository,
+    get_pull_request, get_repository, get_repository_by_name, get_running_builds,
+    get_workflow_urls_for_build, get_workflows_for_build, insert_repo_if_not_exists,
+    set_pr_priority, set_pr_rollup, set_pr_status, unapprove_pull_request, undelegate_pull_request,
+    update_build_status, update_mergeable_states_by_base_branch, update_pr_build_id,
+    update_pr_mergeable_state, update_workflow_status, upsert_pull_request, upsert_repository,
 };
 use super::{ApprovalInfo, DelegatedPermission, MergeableState, RunId};
 
@@ -272,6 +272,10 @@ impl PgDbClient {
         insert_repo_if_not_exists(&self.pool, repo, tree_state).await
     }
 
+    pub async fn repo_by_name(&self, repo_name: &str) -> anyhow::Result<Option<RepoModel>> {
+        get_repository_by_name(&self.pool, repo_name).await
+    }
+
     pub async fn upsert_repository(
         &self,
         repo: &GithubRepoName,

src/database/client.rs

@@ -251,6 +251,18 @@ pub enum BuildStatus {
     Timeouted,
 }
 
+impl Display for BuildStatus {
+    fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+        match self {
+            BuildStatus::Pending => write!(f, "pending"),
+            BuildStatus::Success => write!(f, "success"),
+            BuildStatus::Failure => write!(f, "failure"),
+            BuildStatus::Cancelled => write!(f, "cancelled"),
+            BuildStatus::Timeouted => write!(f, "timeouted"),
+        }
+    }
+}
+
 /// Represents a single (merged) commit.
 #[derive(Debug, sqlx::Type)]
 #[sqlx(type_name = "build")]
@@ -354,6 +366,20 @@ impl TreeState {
     pub fn is_closed(&self) -> bool {
         matches!(self, TreeState::Closed { .. })
     }
+
+    pub fn priority(&self) -> Option<u32> {
+        match self {
+            TreeState::Closed { priority, .. } => Some(*priority),
+            TreeState::Open => None,
+        }
+    }
+
+    pub fn comment_source(&self) -> Option<&str> {
+        match self {
+            TreeState::Closed { source, .. } => Some(source),
+            TreeState::Open => None,
+        }
+    }
 }
 
 impl sqlx::Type<sqlx::Postgres> for TreeState {

src/database/mod.rs

@@ -817,6 +817,38 @@ pub(crate) async fn insert_repo_if_not_exists(
     .await
 }
 
+/// Returns the first match found for a repository by name without owner (via `/{repo_name}`).
+pub(crate) async fn get_repository_by_name(
+    executor: impl PgExecutor<'_>,
+    repo_name: &str,
+) -> anyhow::Result<Option<RepoModel>> {
+    measure_db_query("get_repository_by_name", || async {
+        let search_pattern = format!("%/{repo_name}");
+        let repo = sqlx::query_as!(
+            RepoModel,
+            r#"
+        SELECT
+            id,
+            name as "name: GithubRepoName",
+            (
+                tree_state,
+                treeclosed_src
+            ) AS "tree_state!: TreeState",
+            created_at
+        FROM repository
+        WHERE name LIKE $1
+        LIMIT 1
+        "#,
+            search_pattern
+        )
+        .fetch_optional(executor)
+        .await?;
+
+        Ok(repo)
+    })
+    .await
+}
+
 /// Updates the tree state of a repository.
 pub(crate) async fn upsert_repository(
     executor: impl PgExecutor<'_>,

src/database/operations.rs

@@ -0,0 +1,22 @@
+use anyhow::Error as AnyhowError;
+use axum::http::StatusCode;
+use axum::response::{IntoResponse, Response};
+
+pub struct AppError(pub AnyhowError);
+
+impl IntoResponse for AppError {
+    fn into_response(self) -> Response {
+        let msg = format!("Something went wrong: {}", self.0);
+        tracing::error!("{msg}");
+        (StatusCode::INTERNAL_SERVER_ERROR, msg).into_response()
+    }
+}
+
+impl<E> From<E> for AppError
+where
+    E: Into<AnyhowError>,
+{
+    fn from(err: E) -> Self {
+        Self(err.into())
+    }
+}

src/github/error.rs

@@ -7,11 +7,13 @@ use std::str::FromStr;
 use url::Url;
 
 pub mod api;
+mod error;
 mod labels;
 pub mod server;
 mod webhook;
 
 pub use api::operations::MergeError;
+pub use error::AppError;
 pub use labels::{LabelModification, LabelTrigger};
 pub use webhook::WebhookSecret;
 

src/github/mod.rs

@@ -4,18 +4,22 @@ use crate::bors::mergeable_queue::{
     handle_mergeable_queue_item,
 };
 use crate::bors::{
-    BorsContext, RepositoryState, handle_bors_global_event, handle_bors_repository_event,
+    BorsContext, RepositoryState, RollupMode, handle_bors_global_event,
+    handle_bors_repository_event,
 };
 use crate::github::webhook::GitHubWebhook;
 use crate::github::webhook::WebhookSecret;
-use crate::templates::{HtmlTemplate, IndexTemplate, NotFoundTemplate, RepositoryView};
+use crate::templates::{
+    HelpTemplate, HtmlTemplate, NotFoundTemplate, PullRequestStats, QueueTemplate, RepositoryView,
+};
 use crate::{BorsGlobalEvent, BorsRepositoryEvent, PgDbClient, TeamApiClient};
 
+use super::AppError;
 use anyhow::Error;
 use axum::Router;
-use axum::extract::State;
+use axum::extract::{Path, State};
 use axum::http::StatusCode;
-use axum::response::{IntoResponse, Response};
+use axum::response::{IntoResponse, Redirect, Response};
 use axum::routing::{get, post};
 use octocrab::Octocrab;
 use std::any::Any;
@@ -66,6 +70,8 @@ pub type ServerStateRef = Arc<ServerState>;
 pub fn create_app(state: ServerState) -> Router {
     Router::new()
         .route("/", get(index_handler))
+        .route("/help", get(help_handler))
+        .route("/queue/{repo_name}", get(queue_handler))
         .route("/github", post(github_webhook_handler))
         .route("/health", get(health_handler))
         .layer(ConcurrencyLimitLayer::new(100))
@@ -87,7 +93,11 @@ async fn health_handler() -> impl IntoResponse {
     (StatusCode::OK, "")
 }
 
-async fn index_handler(State(state): State<ServerStateRef>) -> impl IntoResponse {
+async fn index_handler() -> impl IntoResponse {
+    Redirect::permanent("/queue/rust")
+}
+
+async fn help_handler(State(state): State<ServerStateRef>) -> impl IntoResponse {
     let mut repos = Vec::with_capacity(state.repositories.len());
     for repo in state.repositories.keys() {
         let treeclosed = state
@@ -103,7 +113,49 @@ async fn index_handler(State(state): State<ServerStateRef>) -> impl IntoResponse
         });
     }
 
-    HtmlTemplate(IndexTemplate { repos })
+    HtmlTemplate(HelpTemplate { repos })
+}
+
+async fn queue_handler(
+    Path(repo_name): Path<String>,
+    State(state): State<ServerStateRef>,
+) -> Result<impl IntoResponse, AppError> {
+    let repo = match state.db.repo_by_name(&repo_name).await? {
+        Some(repo) => repo,
+        None => {
+            return Ok((
+                StatusCode::NOT_FOUND,
+                format!("Repository {repo_name} not found"),
+            )
+                .into_response());
+        }
+    };
+
+    let prs = state.db.get_nonclosed_pull_requests(&repo.name).await?;
+
+    // TODO: add failed count
+    let (approved_count, rolled_up_count) = prs.iter().fold((0, 0), |(approved, rolled_up), pr| {
+        let is_approved = if pr.is_approved() { 1 } else { 0 };
+        let is_rolled_up = if matches!(pr.rollup, Some(RollupMode::Always)) {
+            1
+        } else {
+            0
+        };
+        (approved + is_approved, rolled_up + is_rolled_up)
+    });
+
+    Ok(HtmlTemplate(QueueTemplate {
+        repo_name: repo.name.name().to_string(),
+        repo_url: format!("https://github.com/{}", repo.name),
+        tree_state: repo.tree_state,
+        stats: PullRequestStats {
+            total_count: prs.len(),
+            approved_count,
+            rolled_up_count,
+        },
+        prs,
+    })
+    .into_response())
 }
 
 /// Axum handler that receives a webhook and sends it to a webhook channel.

src/github/server.rs

@@ -12,7 +12,7 @@ mod utils;
 pub use bors::{BorsContext, CommandParser, event::BorsGlobalEvent, event::BorsRepositoryEvent};
 pub use database::{PgDbClient, TreeState};
 pub use github::{
-    WebhookSecret,
+    AppError, WebhookSecret,
     api::create_github_client,
     api::load_repositories,
     server::{BorsProcess, ServerState, create_app, create_bors_process},

src/lib.rs

@@ -1,3 +1,4 @@
+use crate::database::{MergeableState::*, PullRequestModel, TreeState};
 use askama::Template;
 use axum::response::{Html, IntoResponse, Response};
 use http::StatusCode;
@@ -21,8 +22,8 @@ where
 }
 
 #[derive(Template)]
-#[template(path = "index.html")]
-pub struct IndexTemplate {
+#[template(path = "help.html")]
+pub struct HelpTemplate {
     pub repos: Vec<RepositoryView>,
 }
 
@@ -31,6 +32,22 @@ pub struct RepositoryView {
     pub treeclosed: bool,
 }
 
+pub struct PullRequestStats {
+    pub total_count: usize,
+    pub approved_count: usize,
+    pub rolled_up_count: usize,
+}
+
+#[derive(Template)]
+#[template(path = "queue.html")]
+pub struct QueueTemplate {
+    pub repo_name: String,
+    pub repo_url: String,
+    pub stats: PullRequestStats,
+    pub prs: Vec<PullRequestModel>,
+    pub tree_state: TreeState,
+}
+
 #[derive(Template)]
 #[template(path = "not_found.html")]
 pub struct NotFoundTemplate {}

src/templates.rs

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>{% block title %}{% endblock %}</title>
+    {% block head %}{% endblock %}
+  </head>
+  <body>
+    {% block body %}{% endblock %}
+  </body>
+</html>