Clean up events

jamsocket · May 17, 2024 · 80f3cce · 80f3cce
1 parent 68bc278
commit 80f3cce
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 2 deletions.
diff --git a/plane/.sqlx/query-1c13ca4f48aba7ddebb5440620eb0813aff74fa98bd1bdede3bf275374e07ffb.json b/plane/.sqlx/query-1c13ca4f48aba7ddebb5440620eb0813aff74fa98bd1bdede3bf275374e07ffb.json
diff --git a/plane/src/cleanup.rs b/plane/src/cleanup.rs
@@ -1,4 +1,4 @@
-use crate::database::PlaneDatabase;
+use crate::database::{subscribe::EventSubscriptionManager, PlaneDatabase};
 use anyhow::Result;
 
 const CLEANUP_LOOP_INTERVAL_SECONDS: u64 = 60 * 15;
@@ -8,6 +8,7 @@ pub async fn run_cleanup(db: &PlaneDatabase, min_age_days: Option<i32>) -> Resul
 
     if let Some(min_age_days) = min_age_days {
         db.backend().cleanup(min_age_days).await?;
+        EventSubscriptionManager::clean_up_events(&db.pool, min_age_days).await?;
     }
 
     db.clean_up_tokens().await?;

diff --git a/plane/src/database/mod.rs b/plane/src/database/mod.rs
@@ -44,7 +44,7 @@ pub async fn connect(db: &str) -> sqlx::Result<PlaneDatabase> {
 
 #[derive(Clone)]
 pub struct PlaneDatabase {
-    pool: PgPool,
+    pub pool: PgPool,
     subscription_manager: Arc<OnceLock<EventSubscriptionManager>>,
 }
 

diff --git a/plane/src/database/subscribe.rs b/plane/src/database/subscribe.rs
@@ -263,6 +263,24 @@ impl EventSubscriptionManager {
         }
     }
 
+    pub async fn clean_up_events(db: &PgPool, min_age_days: i32) -> Result<(), sqlx::Error> {
+        sqlx::query!(
+            r#"
+            delete from event
+            where id in (
+                select id
+                from event
+                where created_at < now() - make_interval(days => $1)
+            )
+            "#,
+            min_age_days
+        )
+        .execute(db)
+        .await?;
+
+        Ok(())
+    }
+
     pub async fn get_events_since(
         db: &PgPool,
         since: i32,