Update merge_state on PR edit

Author: Sakib25800

.DS_Store

@@ -12,15 +12,17 @@ pub(super) async fn handle_pull_request_edited(
 ) -> anyhow::Result<()> {
     let pr = &payload.pull_request;
     let pr_number = pr.number;
+    let pr_model = db
+        .get_or_create_pull_request(repo_state.repository(), pr_number, &pr.base.name)
+        .await?;
+    db.update_pr_merge_state(&pr_model, pr.mergeable_state.clone().into())
+        .await?;
 
     // If the base branch has changed, unapprove the PR
     let Some(_) = payload.from_base_sha else {
         return Ok(());
     };
 
-    let pr_model = db
-        .get_or_create_pull_request(repo_state.repository(), pr_number, &pr.base.name)
-        .await?;
     db.update_pr_base_branch(&pr_model, &pr.base.name).await?;
     if !pr_model.is_approved() {
         return Ok(());
@@ -99,10 +101,13 @@ PR will need to be re-approved."#,
 
 #[cfg(test)]
 mod tests {
-    use crate::tests::mocks::{
-        assert_pr_approved_by, assert_pr_unapproved, create_world_with_approve_config,
-        default_branch_name, default_branch_sha, default_pr_number, run_test, BorsBuilder,
-        GitHubPullRequest, PullRequestChangeEvent, User,
+    use crate::{
+        database::MergeState,
+        tests::mocks::{
+            assert_pr_approved_by, assert_pr_unapproved, create_world_with_approve_config,
+            default_branch_name, default_branch_sha, default_pr_number, run_test, BorsBuilder,
+            GitHubPullRequest, PullRequestChangeEvent, User,
+        },
     };
 
     #[sqlx::test]
@@ -299,4 +304,29 @@ PR will need to be re-approved."#,
         })
         .await;
     }
+
+    #[sqlx::test]
+    async fn update_mergeable_state_on_pr_edited(pool: sqlx::PgPool) {
+        run_test(pool, |mut tester| async {
+            tester
+                .edit_pull_request_with_pr(
+                    default_pr_number(),
+                    PullRequestChangeEvent {
+                        from_base_sha: None,
+                        from_base_ref: None,
+                    },
+                    GitHubPullRequest::new(default_pr_number())
+                        .with_mergeable_state(octocrab::models::pulls::MergeableState::HasHooks),
+                )
+                .await?;
+            tester
+                .wait_for(|| async {
+                    let pr = tester.get_default_pr().await?;
+                    Ok(pr.merge_state == MergeState::Mergeable)
+                })
+                .await?;
+            Ok(tester)
+        })
+        .await;
+    }
 }

.sqlx/query-b8f88dd4e3e11019323d87b504e9dce620c26450ef53642339a86b1adf70d0c3.json

@@ -13,9 +13,10 @@ use super::operations::{
     delegate_pull_request, find_build, find_pr_by_build, get_pull_request, get_repository,
     get_running_builds, get_workflow_urls_for_build, get_workflows_for_build, set_pr_priority,
     set_pr_rollup, unapprove_pull_request, undelegate_pull_request, update_build_status,
-    update_pr_base_branch, update_pr_build_id, update_workflow_status, upsert_repository,
+    update_pr_base_branch, update_pr_build_id, update_pr_merge_state, update_workflow_status,
+    upsert_repository,
 };
-use super::{ApprovalInfo, RunId};
+use super::{ApprovalInfo, MergeState, RunId};
 
 /// Provides access to a database using sqlx operations.
 #[derive(Clone)]
@@ -54,6 +55,14 @@ impl PgDbClient {
         undelegate_pull_request(&self.pool, pr.id).await
     }
 
+    pub async fn update_pr_merge_state(
+        &self,
+        pr: &PullRequestModel,
+        merge_state: MergeState,
+    ) -> anyhow::Result<()> {
+        update_pr_merge_state(&self.pool, &pr.repository, pr.id, merge_state).await
+    }
+
     pub async fn update_pr_base_branch(
         &self,
         pr: &PullRequestModel,

src/.DS_Store

@@ -87,7 +87,24 @@ pub(crate) async fn update_pr_base_branch(
         "UPDATE pull_request SET base_branch = $1 WHERE id = $2 AND repository = $3",
         base_branch,
         pr_id,
-        repo.to_string()
+        repo as &GithubRepoName
+    )
+    .execute(executor)
+    .await?;
+    Ok(())
+}
+
+pub(crate) async fn update_pr_merge_state(
+    executor: impl PgExecutor<'_>,
+    repo: &GithubRepoName,
+    pr_id: i32,
+    merge_state: MergeState,
+) -> anyhow::Result<()> {
+    sqlx::query!(
+        "UPDATE pull_request SET merge_state = $1 WHERE id = $2 AND repository = $3",
+        merge_state as _,
+        pr_id,
+        repo as &GithubRepoName
     )
     .execute(executor)
     .await?;

src/bors/.DS_Store

@@ -514,7 +514,7 @@ mod tests {
     async fn pull_request_edited() {
         insta::assert_debug_snapshot!(
             check_webhook("webhook/pull-request-edited.json", "pull_request").await,
-            @r###"
+            @r#"
         Ok(
             GitHubWebhook(
                 Repository(
@@ -542,6 +542,7 @@ mod tests {
                                     ),
                                 },
                                 title: "Create test.txt",
+                                mergeable_state: Unknown,
                                 message: "",
                                 author: GithubUser {
                                     id: UserId(
@@ -575,15 +576,15 @@ mod tests {
                 ),
             ),
         )
-        "###
+        "#
         );
     }
 
     #[tokio::test]
     async fn pull_request_synchronized() {
         insta::assert_debug_snapshot!(
             check_webhook("webhook/pull-request-synchronize.json", "pull_request").await,
-            @r###"
+            @r#"
         Ok(
             GitHubWebhook(
                 Repository(
@@ -611,6 +612,7 @@ mod tests {
                                     ),
                                 },
                                 title: "Create test.txt",
+                                mergeable_state: Unknown,
                                 message: "",
                                 author: GithubUser {
                                     id: UserId(
@@ -639,7 +641,7 @@ mod tests {
                 ),
             ),
         )
-        "###
+        "#
         );
     }
 
@@ -724,6 +726,7 @@ mod tests {
                                     ),
                                 },
                                 title: "New added branch",
+                                mergeable_state: Unknown,
                                 message: "This is a newly added branch from a just-opened PR. ",
                                 author: GithubUser {
                                     id: UserId(

src/bors/handlers/pr_events.rs

@@ -1,5 +1,5 @@
 use crate::github::GithubRepoName;
-use octocrab::models::LabelId;
+use octocrab::models::{pulls::MergeableState, LabelId};
 use parking_lot::Mutex;
 use serde::{Deserialize, Serialize};
 use std::sync::Arc;
@@ -159,6 +159,7 @@ pub struct GitHubPullRequest {
     id: u64,
     title: String,
     body: String,
+    mergeable_state: MergeableState,
 
     /// The pull request number.  Note that GitHub's REST API
     /// considers every pull-request an issue with the same number.
@@ -178,6 +179,7 @@ impl GitHubPullRequest {
             id: number + 1000,
             title: format!("PR #{number}"),
             body: format!("Description of PR #{number}"),
+            mergeable_state: MergeableState::Unknown,
             number,
             head: Box::new(GitHubHead {
                 label: format!("pr-{number}"),
@@ -195,6 +197,11 @@ impl GitHubPullRequest {
         self.base = Box::new(GitHubBase { ref_field, sha });
         self
     }
+
+    pub fn with_mergeable_state(mut self, state: MergeableState) -> Self {
+        self.mergeable_state = state;
+        self
+    }
 }
 
 impl Default for GitHubPullRequest {