store: Add get_deleted_(addressbooks/calendars)

crates/store/src/addressbook/addressbook.rs

@@ -1,7 +1,8 @@
 use crate::synctoken::format_synctoken;
 use chrono::NaiveDateTime;
+use serde::Serialize;
 
-#[derive(Debug, Clone)]
+#[derive(Debug, Clone, Serialize)]
 pub struct Addressbook {
     pub id: String,
     pub principal: String,

crates/store/src/addressbook_store.rs

@@ -8,6 +8,7 @@ use async_trait::async_trait;
 pub trait AddressbookStore: Send + Sync + 'static {
     async fn get_addressbook(&self, principal: &str, id: &str) -> Result<Addressbook, Error>;
     async fn get_addressbooks(&self, principal: &str) -> Result<Vec<Addressbook>, Error>;
+    async fn get_deleted_addressbooks(&self, principal: &str) -> Result<Vec<Addressbook>, Error>;
 
     async fn update_addressbook(
         &self,

crates/store/src/calendar/calendar.rs

@@ -1,8 +1,8 @@
 use crate::synctoken::format_synctoken;
 use chrono::NaiveDateTime;
-use serde::{Deserialize, Serialize};
+use serde::Serialize;
 
-#[derive(Debug, Default, Clone, Deserialize, Serialize)]
+#[derive(Debug, Default, Clone, Serialize)]
 pub struct Calendar {
     pub principal: String,
     pub id: String,

crates/store/src/calendar_store.rs

@@ -6,6 +6,7 @@ use async_trait::async_trait;
 pub trait CalendarStore: Send + Sync + 'static {
     async fn get_calendar(&self, principal: &str, id: &str) -> Result<Calendar, Error>;
     async fn get_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error>;
+    async fn get_deleted_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error>;
 
     async fn update_calendar(
         &self,

crates/store_sqlite/src/addressbook_store.rs

@@ -93,6 +93,24 @@ impl AddressbookStore for SqliteStore {
         Ok(addressbooks)
     }
 
+    #[instrument]
+    async fn get_deleted_addressbooks(
+        &self,
+        principal: &str,
+    ) -> Result<Vec<Addressbook>, rustical_store::Error> {
+        let addressbooks = sqlx::query_as!(
+            Addressbook,
+            r#"SELECT principal, id, synctoken, displayname, description, deleted_at
+                FROM addressbooks
+                WHERE principal = ? AND deleted_at IS NOT NULL"#,
+            principal
+        )
+        .fetch_all(&self.db)
+        .await
+        .map_err(crate::Error::from)?;
+        Ok(addressbooks)
+    }
+
     #[instrument]
     async fn update_addressbook(
         &self,

crates/store_sqlite/src/calendar_store.rs

@@ -87,6 +87,20 @@ impl CalendarStore for SqliteStore {
         Ok(cals)
     }
 
+    #[instrument]
+    async fn get_deleted_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error> {
+        let cals = sqlx::query_as!(
+            Calendar,
+            r#"SELECT principal, id, synctoken, displayname, "order", description, color, timezone, deleted_at
+                FROM calendars
+                WHERE principal = ? AND deleted_at IS NOT NULL"#,
+            principal
+        )
+        .fetch_all(&self.db)
+        .await.map_err(crate::Error::from)?;
+        Ok(cals)
+    }
+
     #[instrument]
     async fn insert_calendar(&self, calendar: Calendar) -> Result<(), Error> {
         sqlx::query!(