nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 01:12:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

caldav: Implement Dav Push topic

Browse Source
This commit is contained in:
Lennart
2025-01-12 18:45:35 +01:00
parent 8b332ade3d
commit 185eb8bddd
26 changed files with 121 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
crates/store_sqlite/migrations/1_calendar.sql
View File

@@ -10,6 +10,7 @@ CREATE TABLE calendars (
timezone_id TEXT,
deleted_at DATETIME,
subscription_url TEXT,
push_topic TEXT UNIQUE NOT NULL,
PRIMARY KEY (principal, id)
);

1
crates/store_sqlite/migrations/2_addressbook.sql
View File

@@ -5,6 +5,7 @@ CREATE TABLE addressbooks (
displayname TEXT,
description TEXT,
deleted_at DATETIME,
push_topic TEXT UNIQUE NOT NULL,
PRIMARY KEY (principal, id)
);

14
crates/store_sqlite/src/addressbook_store.rs
View File

@@ -63,7 +63,7 @@ impl AddressbookStore for SqliteStore {
) -> Result<Addressbook, rustical_store::Error> {
let addressbook = sqlx::query_as!(
Addressbook,
r#"SELECT principal, id, synctoken, displayname, description, deleted_at
r#"SELECT principal, id, synctoken, displayname, description, deleted_at, push_topic
FROM addressbooks
WHERE (principal, id) = (?, ?)"#,
principal,
@@ -82,7 +82,7 @@ impl AddressbookStore for SqliteStore {
) -> Result<Vec<Addressbook>, rustical_store::Error> {
let addressbooks = sqlx::query_as!(
Addressbook,
r#"SELECT principal, id, synctoken, displayname, description, deleted_at
r#"SELECT principal, id, synctoken, displayname, description, deleted_at, push_topic
FROM addressbooks
WHERE principal = ? AND deleted_at IS NULL"#,
principal
@@ -100,7 +100,7 @@ impl AddressbookStore for SqliteStore {
) -> Result<Vec<Addressbook>, rustical_store::Error> {
let addressbooks = sqlx::query_as!(
Addressbook,
r#"SELECT principal, id, synctoken, displayname, description, deleted_at
r#"SELECT principal, id, synctoken, displayname, description, deleted_at, push_topic
FROM addressbooks
WHERE principal = ? AND deleted_at IS NOT NULL"#,
principal
@@ -119,12 +119,13 @@ impl AddressbookStore for SqliteStore {
addressbook: Addressbook,
) -> Result<(), rustical_store::Error> {
let result = sqlx::query!(
r#"UPDATE addressbooks SET principal = ?, id = ?, displayname = ?, description = ?
r#"UPDATE addressbooks SET principal = ?, id = ?, displayname = ?, description = ?, push_topic = ?
WHERE (principal, id) = (?, ?)"#,
addressbook.principal,
addressbook.id,
addressbook.displayname,
addressbook.description,
addressbook.push_topic,
principal,
id
)
@@ -143,12 +144,13 @@ impl AddressbookStore for SqliteStore {
addressbook: Addressbook,
) -> Result<(), rustical_store::Error> {
sqlx::query!(
r#"INSERT INTO addressbooks (principal, id, displayname, description)
VALUES (?, ?, ?, ?)"#,
r#"INSERT INTO addressbooks (principal, id, displayname, description, push_topic)
VALUES (?, ?, ?, ?, ?)"#,
addressbook.principal,
addressbook.id,
addressbook.displayname,
addressbook.description,
addressbook.push_topic,
)
.execute(&self.db)
.await

16
crates/store_sqlite/src/calendar_store.rs
View File

@@ -62,7 +62,7 @@ impl CalendarStore for SqliteStore {
async fn get_calendar(&self, principal: &str, id: &str) -> Result<Calendar, Error> {
let cal = sqlx::query_as!(
Calendar,
r#"SELECT principal, id, synctoken, "order", displayname, description, color, timezone, timezone_id, deleted_at, subscription_url
r#"SELECT principal, id, synctoken, "order", displayname, description, color, timezone, timezone_id, deleted_at, subscription_url, push_topic
FROM calendars
WHERE (principal, id) = (?, ?)"#,
principal,
@@ -77,7 +77,7 @@ impl CalendarStore for SqliteStore {
async fn get_calendars(&self, principal: &str) -> Result<Vec<Calendar>, Error> {
let cals = sqlx::query_as!(
Calendar,
r#"SELECT principal, id, synctoken, displayname, "order", description, color, timezone, timezone_id, deleted_at, subscription_url
r#"SELECT principal, id, synctoken, displayname, "order", description, color, timezone, timezone_id, deleted_at, subscription_url, push_topic
FROM calendars
WHERE principal = ? AND deleted_at IS NULL"#,
principal
@@ -91,7 +91,7 @@ impl CalendarStore for SqliteStore {
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, timezone_id, deleted_at, subscription_url
r#"SELECT principal, id, synctoken, displayname, "order", description, color, timezone, timezone_id, deleted_at, subscription_url, push_topic
FROM calendars
WHERE principal = ? AND deleted_at IS NOT NULL"#,
principal
@@ -104,8 +104,8 @@ impl CalendarStore for SqliteStore {
#[instrument]
async fn insert_calendar(&self, calendar: Calendar) -> Result<(), Error> {
sqlx::query!(
r#"INSERT INTO calendars (principal, id, displayname, description, "order", color, timezone, timezone_id)
VALUES (?, ?, ?, ?, ?, ?, ?, ?)"#,
r#"INSERT INTO calendars (principal, id, displayname, description, "order", color, timezone, timezone_id, push_topic)
VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?)"#,
calendar.principal,
calendar.id,
calendar.displayname,
@@ -113,7 +113,8 @@ impl CalendarStore for SqliteStore {
calendar.order,
calendar.color,
calendar.timezone,
calendar.timezone_id
calendar.timezone_id,
calendar.push_topic,
)
.execute(&self.db)
.await.map_err(crate::Error::from)?;
@@ -128,7 +129,7 @@ impl CalendarStore for SqliteStore {
calendar: Calendar,
) -> Result<(), Error> {
let result = sqlx::query!(
r#"UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, "order" = ?, color = ?, timezone = ?, timezone_id = ?
r#"UPDATE calendars SET principal = ?, id = ?, displayname = ?, description = ?, "order" = ?, color = ?, timezone = ?, timezone_id = ?, push_topic = ?
WHERE (principal, id) = (?, ?)"#,
calendar.principal,
calendar.id,
@@ -138,6 +139,7 @@ impl CalendarStore for SqliteStore {
calendar.color,
calendar.timezone,
calendar.timezone_id,
calendar.push_topic,
principal,
id
).execute(&self.db).await.map_err(crate::Error::from)?;