Add ApprovalStatus::ApprovalPending variant

Author: Sakib25800

migrations/20250321031245_add_approval_pending_to_pr.down.sql

@@ -0,0 +1,2 @@
+-- Add down migration script here
+ALTER TABLE pull_request DROP COLUMN approval_pending;

migrations/20250321031245_add_approval_pending_to_pr.up.sql

@@ -0,0 +1,2 @@
+-- Add up migration script here
+ALTER TABLE pull_request ADD COLUMN approval_pending BOOLEAN DEFAULT FALSE;

src/database/mod.rs

@@ -147,6 +147,7 @@ pub struct ApprovalInfo {
 #[derive(Debug, Clone, PartialEq)]
 pub enum ApprovalStatus {
     NotApproved,
+    ApprovalPending(ApprovalInfo),
     Approved(ApprovalInfo),
 }
 
@@ -158,23 +159,33 @@ impl sqlx::Type<sqlx::Postgres> for ApprovalStatus {
 
 impl<'r> sqlx::Decode<'r, sqlx::Postgres> for ApprovalStatus {
     fn decode(value: sqlx::postgres::PgValueRef<'r>) -> Result<Self, BoxDynError> {
-        let (approver, sha, approved_at) =
-            <(Option<String>, Option<String>, Option<DateTime<Utc>>) as sqlx::Decode<
-                sqlx::Postgres,
-            >>::decode(value)?;
-
-        match (approver, sha, approved_at) {
-            (Some(approver), Some(sha), Some(approved_at)) => {
+        let (approver, sha, approved_at, is_pending) =
+            <(
+                Option<String>,
+                Option<String>,
+                Option<DateTime<Utc>>,
+                Option<bool>,
+            ) as sqlx::Decode<sqlx::Postgres>>::decode(value)?;
+
+        match (approver, sha, approved_at, is_pending) {
+            (Some(approver), Some(sha), Some(approved_at), Some(true)) => {
+                Ok(ApprovalStatus::ApprovalPending(ApprovalInfo {
+                    approver,
+                    sha,
+                    approved_at,
+                }))
+            }
+            (Some(approver), Some(sha), Some(approved_at), Some(false) | None) => {
                 Ok(ApprovalStatus::Approved(ApprovalInfo {
                     approver,
                     sha,
                     approved_at,
                 }))
             }
-            (None, None, None) => Ok(ApprovalStatus::NotApproved),
-            (approver, sha, approved_at) => Err(format!(
-                "Inconsistent approval state: approver={:?}, sha={:?}, approved_at={:?}",
-                approver, sha, approved_at
+            (None, None, None, _) => Ok(ApprovalStatus::NotApproved),
+            (approver, sha, approved_at, is_pending) => Err(format!(
+                "Inconsistent approval state: approver={:?}, sha={:?}, approved_at={:?}, is_pending={:?}",
+                approver, sha, approved_at, is_pending
             )
             .into()),
         }
@@ -258,16 +269,24 @@ impl PullRequestModel {
         matches!(self.approval_status, ApprovalStatus::Approved(_))
     }
 
+    pub fn is_pending_approval(&self) -> bool {
+        matches!(self.approval_status, ApprovalStatus::ApprovalPending(_))
+    }
+
     pub fn approver(&self) -> Option<&str> {
         match &self.approval_status {
-            ApprovalStatus::Approved(info) => Some(info.approver.as_str()),
+            ApprovalStatus::Approved(info) | ApprovalStatus::ApprovalPending(info) => {
+                Some(info.approver.as_str())
+            }
             ApprovalStatus::NotApproved => None,
         }
     }
 
     pub fn approved_sha(&self) -> Option<&str> {
         match &self.approval_status {
-            ApprovalStatus::Approved(info) => Some(info.sha.as_str()),
+            ApprovalStatus::Approved(info) | ApprovalStatus::ApprovalPending(info) => {
+                Some(info.sha.as_str())
+            }
             ApprovalStatus::NotApproved => None,
         }
     }

src/database/operations.rs

@@ -38,7 +38,8 @@ pub(crate) async fn get_pull_request(
         (
             pr.approved_by,
             pr.approved_sha,
-            pr.approved_at
+            pr.approved_at,
+            pr.approval_pending
         ) AS "approval_status!: ApprovalStatus",
         pr.status as "pr_status: PullRequestStatus",
         pr.priority,
@@ -137,7 +138,8 @@ pub(crate) async fn upsert_pull_request(
                 (
                     pr.approved_by,
                     pr.approved_sha,
-                    pr.approved_at
+                    pr.approved_at,
+                    pr.approval_pending
                 ) AS "approval_status!: ApprovalStatus",
                 pr.status as "pr_status: PullRequestStatus",
                 pr.priority,
@@ -207,6 +209,7 @@ UPDATE pull_request
 SET approved_by = $1,
     approved_sha = $2,
     approved_at = NOW(),
+    approval_pending = false,
     priority = COALESCE($3, priority),
     rollup = COALESCE($4, rollup)
 WHERE id = $5
@@ -230,7 +233,7 @@ pub(crate) async fn unapprove_pull_request(
 ) -> anyhow::Result<()> {
     measure_db_query("unapprove_pull_request", || async {
         sqlx::query!(
-            "UPDATE pull_request SET approved_by = NULL, approved_sha = NULL, approved_at = NULL WHERE id = $1",
+            "UPDATE pull_request SET approved_by = NULL, approved_sha = NULL, approved_at = NULL, approval_pending = false  WHERE id = $1",
             pr_id
         )
         .execute(executor)
@@ -287,7 +290,8 @@ SELECT
     (
         pr.approved_by,
         pr.approved_sha,
-        pr.approved_at
+        pr.approved_at,
+        pr.approval_pending
     ) AS "approval_status!: ApprovalStatus",
     pr.status as "pr_status: PullRequestStatus",
     pr.delegated,