Add approved_at to approval info

Author: Sakib25800

migrations/20250321031005_add_approved_at_to_pr.down.sql

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

migrations/20250321031005_add_approved_at_to_pr.up.sql

@@ -0,0 +1,2 @@
+-- Add up migration script here
+ALTER TABLE pull_request ADD COLUMN approved_at TIMESTAMPTZ;

src/bors/handlers/review.rs

@@ -1,5 +1,7 @@
 use std::sync::Arc;
 
+use chrono::Utc;
+
 use crate::PgDbClient;
 use crate::bors::Comment;
 use crate::bors::RepositoryState;
@@ -38,6 +40,7 @@ pub(super) async fn command_approve(
     let approval_info = ApprovalInfo {
         approver: approver.clone(),
         sha: pr.head.sha.to_string(),
+        approved_at: Utc::now(),
     };
     let pr_model = db
         .get_or_create_pull_request(

src/database/mod.rs

@@ -139,6 +139,8 @@ pub struct ApprovalInfo {
     pub approver: String,
     /// The SHA of the commit that was approved.
     pub sha: String,
+    /// When the pull request was approved.
+    pub approved_at: DateTime<Utc>,
 }
 
 /// Represents the approval status of a pull request.
@@ -150,23 +152,29 @@ pub enum ApprovalStatus {
 
 impl sqlx::Type<sqlx::Postgres> for ApprovalStatus {
     fn type_info() -> sqlx::postgres::PgTypeInfo {
-        <(Option<String>, Option<String>) as sqlx::Type<sqlx::Postgres>>::type_info()
+        <(Option<String>, Option<String>, Option<DateTime<Utc>>) as sqlx::Type<sqlx::Postgres>>::type_info()
     }
 }
 
 impl<'r> sqlx::Decode<'r, sqlx::Postgres> for ApprovalStatus {
     fn decode(value: sqlx::postgres::PgValueRef<'r>) -> Result<Self, BoxDynError> {
-        let (approver, sha) =
-            <(Option<String>, Option<String>) as sqlx::Decode<sqlx::Postgres>>::decode(value)?;
-
-        match (approver, sha) {
-            (Some(approver), Some(sha)) => {
-                Ok(ApprovalStatus::Approved(ApprovalInfo { approver, sha }))
+        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)) => {
+                Ok(ApprovalStatus::Approved(ApprovalInfo {
+                    approver,
+                    sha,
+                    approved_at,
+                }))
             }
-            (None, None) => Ok(ApprovalStatus::NotApproved),
-            (approver, sha) => Err(format!(
-                "Inconsistent approval state: approver={:?}, sha={:?}",
-                approver, sha
+            (None, None, None) => Ok(ApprovalStatus::NotApproved),
+            (approver, sha, approved_at) => Err(format!(
+                "Inconsistent approval state: approver={:?}, sha={:?}, approved_at={:?}",
+                approver, sha, approved_at
             )
             .into()),
         }

src/database/operations.rs

@@ -37,9 +37,10 @@ pub(crate) async fn get_pull_request(
         pr.number as "number!: i64",
         (
             pr.approved_by,
-            pr.approved_sha
+            pr.approved_sha,
+            pr.approved_at
         ) AS "approval_status!: ApprovalStatus",
-        pr.status as "pr_status: PullRequestStatus", 
+        pr.status as "pr_status: PullRequestStatus",
         pr.priority,
         pr.rollup as "rollup: RollupMode",
         pr.delegated,
@@ -135,9 +136,10 @@ pub(crate) async fn upsert_pull_request(
                 pr.number as "number!: i64",
                 (
                     pr.approved_by,
-                    pr.approved_sha
+                    pr.approved_sha,
+                    pr.approved_at
                 ) AS "approval_status!: ApprovalStatus",
-                pr.status as "pr_status: PullRequestStatus", 
+                pr.status as "pr_status: PullRequestStatus",
                 pr.priority,
                 pr.rollup as "rollup: RollupMode",
                 pr.delegated,
@@ -204,6 +206,7 @@ pub(crate) async fn approve_pull_request(
 UPDATE pull_request
 SET approved_by = $1,
     approved_sha = $2,
+    approved_at = NOW(),
     priority = COALESCE($3, priority),
     rollup = COALESCE($4, rollup)
 WHERE id = $5
@@ -227,7 +230,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 WHERE id = $1",
+            "UPDATE pull_request SET approved_by = NULL, approved_sha = NULL, approved_at = NULL WHERE id = $1",
             pr_id
         )
         .execute(executor)
@@ -283,9 +286,10 @@ SELECT
     pr.number as "number!: i64",
     (
         pr.approved_by,
-        pr.approved_sha
+        pr.approved_sha,
+        pr.approved_at
     ) AS "approval_status!: ApprovalStatus",
-    pr.status as "pr_status: PullRequestStatus",  
+    pr.status as "pr_status: PullRequestStatus",
     pr.delegated,
     pr.priority,
     pr.base_branch,