Refactor PR DB update methods to use PullRequestModel as parameter

Author: Sakib25800

src/bors/handlers/pr_events.rs

@@ -18,17 +18,15 @@ pub(super) async fn handle_pull_request_edited(
         return Ok(());
     };
 
-    db.update_pr_base_branch(repo_state.repository(), pr_number, &pr.base.name)
-        .await?;
     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(());
     }
 
-    db.unapprove(repo_state.repository(), pr_number, &pr.base.name)
-        .await?;
+    db.unapprove(&pr_model).await?;
     handle_label_trigger(&repo_state, pr_number, LabelTrigger::Unapproved).await?;
     notify_of_edited_pr(&repo_state, pr_number, &payload.pull_request.base.name).await
 }
@@ -48,8 +46,7 @@ pub(super) async fn handle_push_to_pull_request(
     }
 
     let pr_number = pr_model.number;
-    db.unapprove(repo_state.repository(), pr_number, &pr.base.name)
-        .await?;
+    db.unapprove(&pr_model).await?;
     handle_label_trigger(&repo_state, pr_number, LabelTrigger::Unapproved).await?;
     notify_of_pushed_pr(&repo_state, pr_number, pr.head.sha.clone()).await
 }

src/bors/handlers/review.rs

@@ -39,15 +39,12 @@ pub(super) async fn command_approve(
         approver: approver.clone(),
         sha: pr.head.sha.to_string(),
     };
-    db.approve(
-        repo_state.repository(),
-        pr.number,
-        approval_info,
-        priority,
-        &pr.base.name,
-        rollup,
-    )
-    .await?;
+    let pr_model = db
+        .get_or_create_pull_request(repo_state.repository(), pr.number, &pr.base.name)
+        .await?;
+
+    db.approve(&pr_model, approval_info, priority, rollup)
+        .await?;
     handle_label_trigger(&repo_state, pr.number, LabelTrigger::Approved).await?;
     notify_of_approval(&repo_state, pr, approver.as_str()).await
 }
@@ -65,8 +62,11 @@ pub(super) async fn command_unapprove(
         deny_request(&repo_state, pr, author, PermissionType::Review).await?;
         return Ok(());
     };
-    db.unapprove(repo_state.repository(), pr.number, &pr.base.name)
+    let pr_model = db
+        .get_or_create_pull_request(repo_state.repository(), pr.number, &pr.base.name)
         .await?;
+
+    db.unapprove(&pr_model).await?;
     handle_label_trigger(&repo_state, pr.number, LabelTrigger::Unapproved).await?;
     notify_of_unapproval(&repo_state, pr).await
 }
@@ -84,8 +84,11 @@ pub(super) async fn command_set_priority(
         deny_request(&repo_state, pr, author, PermissionType::Review).await?;
         return Ok(());
     };
-    db.set_priority(repo_state.repository(), pr.number, &pr.base.name, priority)
-        .await
+    let pr_model = db
+        .get_or_create_pull_request(repo_state.repository(), pr.number, &pr.base.name)
+        .await?;
+
+    db.set_priority(&pr_model, priority).await
 }
 
 /// Delegate approval authority of a pull request to its author.
@@ -101,10 +104,12 @@ pub(super) async fn command_delegate(
         return Ok(());
     }
 
-    let delegatee = pr.author.username.clone();
-    db.delegate(repo_state.repository(), pr.number, &pr.base.name)
+    let pr_model = db
+        .get_or_create_pull_request(repo_state.repository(), pr.number, &pr.base.name)
         .await?;
-    notify_of_delegation(&repo_state, pr, &delegatee).await
+
+    db.delegate(&pr_model).await?;
+    notify_of_delegation(&repo_state, pr, &pr.author.username).await
 }
 
 /// Revoke any previously granted delegation.
@@ -119,8 +124,11 @@ pub(super) async fn command_undelegate(
         deny_request(&repo_state, pr, author, PermissionType::Review).await?;
         return Ok(());
     }
-    db.undelegate(repo_state.repository(), pr.number, &pr.base.name)
-        .await
+    let pr_model = db
+        .get_or_create_pull_request(repo_state.repository(), pr.number, &pr.base.name)
+        .await?;
+
+    db.undelegate(&pr_model).await
 }
 
 /// Set the rollup of a pull request.
@@ -136,8 +144,11 @@ pub(super) async fn command_set_rollup(
         deny_request(&repo_state, pr, author, PermissionType::Review).await?;
         return Ok(());
     }
-    db.set_rollup(repo_state.repository(), pr.number, &pr.base.name, rollup)
-        .await
+    let pr_model = db
+        .get_or_create_pull_request(repo_state.repository(), pr.number, &pr.base.name)
+        .await?;
+
+    db.set_rollup(&pr_model, rollup).await
 }
 
 pub(super) async fn command_close_tree(

src/database/client.rs

@@ -30,78 +30,43 @@ impl PgDbClient {
 
     pub async fn approve(
         &self,
-        repo: &GithubRepoName,
-        pr_number: PullRequestNumber,
+        pr: &PullRequestModel,
         approval_info: ApprovalInfo,
         priority: Option<u32>,
-        base_branch: &str,
         rollup: Option<RollupMode>,
     ) -> anyhow::Result<()> {
-        let pr = self
-            .get_or_create_pull_request(repo, pr_number, base_branch)
-            .await?;
         approve_pull_request(&self.pool, pr.id, approval_info, priority, rollup).await
     }
 
-    pub async fn unapprove(
-        &self,
-        repo: &GithubRepoName,
-        pr_number: PullRequestNumber,
-        base_branch: &str,
-    ) -> anyhow::Result<()> {
-        let pr = self
-            .get_or_create_pull_request(repo, pr_number, base_branch)
-            .await?;
+    pub async fn unapprove(&self, pr: &PullRequestModel) -> anyhow::Result<()> {
         unapprove_pull_request(&self.pool, pr.id).await
     }
 
-    pub async fn set_priority(
-        &self,
-        repo: &GithubRepoName,
-        pr_number: PullRequestNumber,
-        base_branch: &str,
-        priority: u32,
-    ) -> anyhow::Result<()> {
-        let pr = self
-            .get_or_create_pull_request(repo, pr_number, base_branch)
-            .await?;
+    pub async fn set_priority(&self, pr: &PullRequestModel, priority: u32) -> anyhow::Result<()> {
         set_pr_priority(&self.pool, pr.id, priority).await
     }
 
-    pub async fn delegate(
-        &self,
-        repo: &GithubRepoName,
-        pr_number: PullRequestNumber,
-        base_branch: &str,
-    ) -> anyhow::Result<()> {
-        let pr = self
-            .get_or_create_pull_request(repo, pr_number, base_branch)
-            .await?;
+    pub async fn delegate(&self, pr: &PullRequestModel) -> anyhow::Result<()> {
         delegate_pull_request(&self.pool, pr.id).await
     }
 
-    pub async fn undelegate(
+    pub async fn undelegate(&self, pr: &PullRequestModel) -> anyhow::Result<()> {
+        undelegate_pull_request(&self.pool, pr.id).await
+    }
+
+    pub async fn update_pr_base_branch(
         &self,
-        repo: &GithubRepoName,
-        pr_number: PullRequestNumber,
+        pr: &PullRequestModel,
         base_branch: &str,
     ) -> anyhow::Result<()> {
-        let pr = self
-            .get_or_create_pull_request(repo, pr_number, base_branch)
-            .await?;
-        undelegate_pull_request(&self.pool, pr.id).await
+        update_pr_base_branch(&self.pool, &pr.repository, pr.id, base_branch).await
     }
 
     pub async fn set_rollup(
         &self,
-        repo: &GithubRepoName,
-        pr_number: PullRequestNumber,
-        base_branch: &str,
+        pr: &PullRequestModel,
         rollup: RollupMode,
     ) -> anyhow::Result<()> {
-        let pr = self
-            .get_or_create_pull_request(repo, pr_number, base_branch)
-            .await?;
         set_pr_rollup(&self.pool, pr.id, rollup).await
     }
 
@@ -131,18 +96,6 @@ impl PgDbClient {
         create_pull_request(&self.pool, repo, pr_number, base_branch).await
     }
 
-    pub async fn update_pr_base_branch(
-        &self,
-        repo: &GithubRepoName,
-        pr_number: PullRequestNumber,
-        base_branch: &str,
-    ) -> anyhow::Result<()> {
-        let pr = self
-            .get_or_create_pull_request(repo, pr_number, base_branch)
-            .await?;
-        update_pr_base_branch(&self.pool, repo, pr.id, base_branch).await
-    }
-
     pub async fn find_pr_by_build(
         &self,
         build: &BuildModel,