Add to mergeable queue on PR edit base change

Author: Sakib25800

src/bors/handlers/mod.rs

@@ -132,7 +132,7 @@ pub async fn handle_bors_repository_event(
             let span =
                 tracing::info_span!("Pull request edited", repo = payload.repository.to_string());
 
-            handle_pull_request_edited(repo, db, payload)
+            handle_pull_request_edited(repo, db, mergeable_queue, payload)
                 .instrument(span.clone())
                 .await?;
         }

src/bors/handlers/pr_events.rs

@@ -14,6 +14,7 @@ use std::sync::Arc;
 pub(super) async fn handle_pull_request_edited(
     repo_state: Arc<RepositoryState>,
     db: Arc<PgDbClient>,
+    mergeable_queue: Arc<MergeableQueue>,
     payload: PullRequestEdited,
 ) -> anyhow::Result<()> {
     let pr = &payload.pull_request;
@@ -33,6 +34,10 @@ pub(super) async fn handle_pull_request_edited(
         return Ok(());
     };
 
+    mergeable_queue
+        .enqueue(repo_state.repository().clone(), pr_number)
+        .await;
+
     if !pr_model.is_approved() {
         return Ok(());
     }
@@ -214,6 +219,7 @@ mod tests {
         database::MergeableState,
         tests::mocks::{User, default_branch_name, default_repo_name, run_test},
     };
+    use octocrab::models::pulls::MergeableState as OctocrabMergeableState;
 
     #[sqlx::test]
     async fn unapprove_on_base_edited(pool: sqlx::PgPool) {
@@ -348,7 +354,7 @@ mod tests {
         run_test(pool.clone(), |mut tester| async {
             tester
                 .edit_pr(default_repo_name(), default_pr_number(), |pr| {
-                    pr.mergeable_state = octocrab::models::pulls::MergeableState::Dirty;
+                    pr.mergeable_state = OctocrabMergeableState::Dirty;
                 })
                 .await?;
             tester
@@ -448,4 +454,33 @@ mod tests {
         })
         .await;
     }
+
+    #[sqlx::test]
+    async fn mergeable_queue_processes_pr_base_change(pool: sqlx::PgPool) {
+        run_test(pool, |mut tester| async {
+            tester
+                .edit_pr(default_repo_name(), default_pr_number(), |pr| {
+                    pr.mergeable_state = OctocrabMergeableState::Clean;
+                })
+                .await?;
+            tester
+                .wait_for_default_pr(|pr| pr.mergeable_state == MergeableState::Mergeable)
+                .await?;
+
+            let branch = tester.create_branch("beta").clone();
+            tester
+                .edit_pr(default_repo_name(), default_pr_number(), |pr| {
+                    pr.base_branch = branch;
+                    pr.mergeable_state = OctocrabMergeableState::Unknown;
+                })
+                .await?;
+            tester
+                .wait_for_default_pr(|pr| {
+                    pr.base_branch == "beta" && pr.mergeable_state == MergeableState::Unknown
+                })
+                .await?;
+            Ok(tester)
+        })
+        .await;
+    }
 }

src/bors/mergeable_queue.rs

@@ -21,7 +21,7 @@ impl MergeableQueue {
         Self { tx: Some(tx) }
     }
 
-    pub async fn push(&self, repository: GithubRepoName, pr_number: PullRequestNumber) {
+    pub async fn enqueue(&self, repository: GithubRepoName, pr_number: PullRequestNumber) {
         if let Some(tx) = &self.tx {
             let item = MergeableQueueItem {
                 repository,