Change how cleanup trait fn works using a date cutoff

api/common/src/adaptor.rs

@@ -1,30 +0,0 @@
-use std::error::Error;
-
-use async_trait::async_trait;
-
-use crate::{
-    event::{Event, EventDeletion},
-    person::Person,
-    stats::Stats,
-};
-
-/// Data storage adaptor, all methods on an adaptor can return an error if
-/// something goes wrong, or potentially None if the data requested was not found.
-#[async_trait]
-pub trait Adaptor: Send + Sync {
-    type Error: Error;
-
-    async fn get_stats(&self) -> Result<Stats, Self::Error>;
-    async fn increment_stat_event_count(&self) -> Result<i64, Self::Error>;
-    async fn increment_stat_person_count(&self) -> Result<i64, Self::Error>;
-
-    async fn get_people(&self, event_id: String) -> Result<Option<Vec<Person>>, Self::Error>;
-    async fn upsert_person(&self, event_id: String, person: Person) -> Result<Person, Self::Error>;
-
-    /// Get an event and update visited date to current time
-    async fn get_event(&self, id: String) -> Result<Option<Event>, Self::Error>;
-    async fn create_event(&self, event: Event) -> Result<Event, Self::Error>;
-
-    /// Delete an event as well as all related people
-    async fn delete_event(&self, id: String) -> Result<EventDeletion, Self::Error>;
-}

api/common/src/event.rs

@@ -1,19 +0,0 @@
-use chrono::{DateTime, Utc};
-
-#[derive(Clone)]
-pub struct Event {
-    pub id: String,
-    pub name: String,
-    pub created_at: DateTime<Utc>,
-    pub visited_at: DateTime<Utc>,
-    pub times: Vec<String>,
-    pub timezone: String,
-}
-
-#[derive(Clone)]
-/// Info about a deleted event
-pub struct EventDeletion {
-    pub id: String,
-    /// The amount of people that were in this event that were also deleted
-    pub person_count: u64,
-}

api/common/src/lib.rs

@@ -1,4 +1,54 @@
-pub mod adaptor;
-pub mod event;
-pub mod person;
-pub mod stats;
+use std::error::Error;
+
+use async_trait::async_trait;
+use chrono::{DateTime, Utc};
+
+/// Data storage adaptor, all methods on an adaptor can return an error if
+/// something goes wrong, or potentially None if the data requested was not found.
+#[async_trait]
+pub trait Adaptor: Send + Sync {
+    type Error: Error;
+
+    async fn get_stats(&self) -> Result<Stats, Self::Error>;
+    async fn increment_stat_event_count(&self) -> Result<i64, Self::Error>;
+    async fn increment_stat_person_count(&self) -> Result<i64, Self::Error>;
+
+    async fn get_people(&self, event_id: String) -> Result<Option<Vec<Person>>, Self::Error>;
+    async fn upsert_person(
+        &self,
+        event_id: String,
+        person: Person,
+    ) -> Result<Option<Person>, Self::Error>;
+
+    /// Get an event and update visited date to current time
+    async fn get_event(&self, id: String) -> Result<Option<Event>, Self::Error>;
+    async fn create_event(&self, event: Event) -> Result<Event, Self::Error>;
+
+    /// Delete events older than a cutoff date, as well as any associated people
+    /// Returns the amount of events and people deleted
+    async fn delete_events(&self, cutoff: DateTime<Utc>) -> Result<Stats, Self::Error>;
+}
+
+#[derive(Clone)]
+pub struct Stats {
+    pub event_count: i64,
+    pub person_count: i64,
+}
+
+#[derive(Clone)]
+pub struct Event {
+    pub id: String,
+    pub name: String,
+    pub created_at: DateTime<Utc>,
+    pub visited_at: DateTime<Utc>,
+    pub times: Vec<String>,
+    pub timezone: String,
+}
+
+#[derive(Clone)]
+pub struct Person {
+    pub name: String,
+    pub password_hash: Option<String>,
+    pub created_at: DateTime<Utc>,
+    pub availability: Vec<String>,
+}

api/common/src/person.rs

@@ -1,9 +0,0 @@
-use chrono::{DateTime, Utc};
-
-#[derive(Clone)]
-pub struct Person {
-    pub name: String,
-    pub password_hash: Option<String>,
-    pub created_at: DateTime<Utc>,
-    pub availability: Vec<String>,
-}

api/common/src/stats.rs

@@ -1,5 +0,0 @@
-#[derive(Clone)]
-pub struct Stats {
-    pub event_count: i64,
-    pub person_count: i64,
-}