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

Refactor: Rename uid to object_id

Browse Source
This commit is contained in:
Lennart
2024-10-14 10:13:32 +02:00
parent d32f50f472
commit d87b7dcb8d
24 changed files with 153 additions and 287 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
crates/store/migrations/1_init.sql
View File

@@ -13,25 +13,25 @@ CREATE TABLE calendars (
CREATE TABLE calendarobjects (
principal TEXT NOT NULL,
cid TEXT NOT NULL,
uid TEXT NOT NULL,
cal_id TEXT NOT NULL,
id TEXT NOT NULL,
ics TEXT NOT NULL,
updated_at DATETIME DEFAULT CURRENT_TIMESTAMP,
deleted_at DATETIME,
PRIMARY KEY (principal, cid, uid),
FOREIGN KEY (principal, cid)
PRIMARY KEY (principal, cal_id, id),
FOREIGN KEY (principal, cal_id)
REFERENCES calendars (principal, id) ON DELETE CASCADE
);
CREATE TABLE calendarobjectchangelog (
-- The actual sync token is the SQLite field 'ROWID'
principal TEXT NOT NULL,
cid TEXT NOT NULL,
uid TEXT NOT NULL,
cal_id TEXT NOT NULL,
object_id TEXT NOT NULL,
operation INTEGER NOT NULL,
synctoken INTEGER DEFAULT 0 NOT NULL,
created_at DATETIME DEFAULT CURRENT_TIMESTAMP,
PRIMARY KEY (principal, cid, created_at),
FOREIGN KEY (principal, cid)
PRIMARY KEY (principal, cal_id, created_at),
FOREIGN KEY (principal, cal_id)
REFERENCES calendars (principal, id) ON DELETE CASCADE
);

25
crates/store/src/calendar_store.rs
View File

@@ -28,29 +28,38 @@ pub trait CalendarStore: Send + Sync + 'static {
async fn sync_changes(
&self,
principal: &str,
cid: &str,
cal_id: &str,
synctoken: i64,
) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error>;
async fn get_objects(&self, principal: &str, cid: &str) -> Result<Vec<CalendarObject>, Error>;
async fn get_objects(
&self,
principal: &str,
cal_id: &str,
) -> Result<Vec<CalendarObject>, Error>;
async fn get_object(
&self,
principal: &str,
cid: &str,
uid: &str,
cal_id: &str,
object_id: &str,
) -> Result<CalendarObject, Error>;
async fn put_object(
&mut self,
principal: String,
cid: String,
cal_id: String,
object: CalendarObject,
) -> Result<(), Error>;
async fn delete_object(
&mut self,
principal: &str,
cid: &str,
uid: &str,
cal_id: &str,
object_id: &str,
use_trashbin: bool,
) -> Result<(), Error>;
async fn restore_object(&mut self, principal: &str, cid: &str, uid: &str) -> Result<(), Error>;
async fn restore_object(
&mut self,
principal: &str,
cal_id: &str,
object_id: &str,
) -> Result<(), Error>;
}

24
crates/store/src/model/object.rs
View File

@@ -22,7 +22,7 @@ pub enum CalendarObjectComponent {
#[derive(Debug, Clone)]
pub struct CalendarObject {
uid: String,
id: String,
ics: String,
data: CalendarObjectComponent,
}
@@ -35,11 +35,11 @@ impl<'de> Deserialize<'de> for CalendarObject {
{
#[derive(Deserialize)]
struct Inner {
uid: String,
id: String,
ics: String,
}
let Inner { uid, ics } = Inner::deserialize(deserializer)?;
Self::from_ics(uid, ics).map_err(serde::de::Error::custom)
let Inner { id, ics } = Inner::deserialize(deserializer)?;
Self::from_ics(id, ics).map_err(serde::de::Error::custom)
}
}
@@ -50,12 +50,12 @@ impl Serialize for CalendarObject {
{
#[derive(Serialize)]
struct Inner {
uid: String,
id: String,
ics: String,
}
Inner::serialize(
&Inner {
uid: self.get_uid().to_string(),
id: self.get_id().to_string(),
ics: self.get_ics().to_string(),
},
serializer,
@@ -64,7 +64,7 @@ impl Serialize for CalendarObject {
}
impl CalendarObject {
pub fn from_ics(uid: String, ics: String) -> Result<Self, Error> {
pub fn from_ics(object_id: String, ics: String) -> Result<Self, Error> {
let mut parser = ical::IcalParser::new(BufReader::new(ics.as_bytes()));
let cal = parser.next().ok_or(Error::NotFound)??;
if parser.next().is_some() {
@@ -98,7 +98,7 @@ impl CalendarObject {
if let Some(event) = cal.events.first() {
return Ok(CalendarObject {
uid,
id: object_id,
ics,
data: CalendarObjectComponent::Event(EventObject {
event: event.clone(),
@@ -108,7 +108,7 @@ impl CalendarObject {
}
if let Some(todo) = cal.todos.first() {
return Ok(CalendarObject {
uid,
id: object_id,
ics,
data: CalendarObjectComponent::Todo(TodoObject { todo: todo.clone() }),
});
@@ -119,12 +119,12 @@ impl CalendarObject {
))
}
pub fn get_uid(&self) -> &str {
&self.uid
pub fn get_id(&self) -> &str {
&self.id
}
pub fn get_etag(&self) -> String {
let mut hasher = Sha256::new();
hasher.update(&self.uid);
hasher.update(&self.id);
hasher.update(self.get_ics());
format!("{:x}", hasher.finalize())
}

104
crates/store/src/sqlite_store.rs
View File

@@ -21,7 +21,7 @@ impl SqliteCalendarStore {
#[derive(Debug, Clone)]
struct CalendarObjectRow {
uid: String,
id: String,
ics: String,
}
@@ -29,7 +29,7 @@ impl TryFrom<CalendarObjectRow> for CalendarObject {
type Error = Error;
fn try_from(value: CalendarObjectRow) -> Result<Self, Error> {
CalendarObject::from_ics(value.uid, value.ics)
CalendarObject::from_ics(value.id, value.ics)
}
}
@@ -45,8 +45,8 @@ enum CalendarChangeOperation {
async fn log_object_operation(
tx: &mut Transaction<'_, Sqlite>,
principal: &str,
cid: &str,
uid: &str,
cal_id: &str,
object_id: &str,
operation: CalendarChangeOperation,
) -> Result<(), Error> {
sqlx::query!(
@@ -55,20 +55,20 @@ async fn log_object_operation(
SET synctoken = synctoken + 1
WHERE (principal, id) = (?1, ?2)"#,
principal,
cid
cal_id
)
.execute(&mut **tx)
.await?;
sqlx::query!(
r#"
INSERT INTO calendarobjectchangelog (principal, cid, uid, operation, synctoken)
INSERT INTO calendarobjectchangelog (principal, cal_id, object_id, operation, synctoken)
VALUES (?1, ?2, ?3, ?4, (
SELECT synctoken FROM calendars WHERE (principal, id) = (?1, ?2)
))"#,
principal,
cid,
uid,
cal_id,
object_id,
operation
)
.execute(&mut **tx)
@@ -194,12 +194,16 @@ impl CalendarStore for SqliteCalendarStore {
}
#[instrument]
async fn get_objects(&self, principal: &str, cid: &str) -> Result<Vec<CalendarObject>, Error> {
async fn get_objects(
&self,
principal: &str,
cal_id: &str,
) -> Result<Vec<CalendarObject>, Error> {
sqlx::query_as!(
CalendarObjectRow,
"SELECT uid, ics FROM calendarobjects WHERE principal = ? AND cid = ? AND deleted_at IS NULL",
"SELECT id, ics FROM calendarobjects WHERE principal = ? AND cal_id = ? AND deleted_at IS NULL",
principal,
cid
cal_id
)
.fetch_all(&self.db)
.await?
@@ -212,15 +216,15 @@ impl CalendarStore for SqliteCalendarStore {
async fn get_object(
&self,
principal: &str,
cid: &str,
uid: &str,
cal_id: &str,
object_id: &str,
) -> Result<CalendarObject, Error> {
Ok(sqlx::query_as!(
CalendarObjectRow,
"SELECT uid, ics FROM calendarobjects WHERE (principal, cid, uid) = (?, ?, ?)",
"SELECT id, ics FROM calendarobjects WHERE (principal, cal_id, id) = (?, ?, ?)",
principal,
cid,
uid
cal_id,
object_id
)
.fetch_one(&self.db)
.await?
@@ -231,24 +235,31 @@ impl CalendarStore for SqliteCalendarStore {
async fn put_object(
&mut self,
principal: String,
cid: String,
cal_id: String,
object: CalendarObject,
) -> Result<(), Error> {
let mut tx = self.db.begin().await?;
let (uid, ics) = (object.get_uid(), object.get_ics());
let (object_id, ics) = (object.get_id(), object.get_ics());
sqlx::query!(
"REPLACE INTO calendarobjects (principal, cid, uid, ics) VALUES (?, ?, ?, ?)",
"REPLACE INTO calendarobjects (principal, cal_id, id, ics) VALUES (?, ?, ?, ?)",
principal,
cid,
uid,
cal_id,
object_id,
ics
)
.execute(&mut *tx)
.await?;
log_object_operation(&mut tx, &principal, &cid, uid, CalendarChangeOperation::Add).await?;
log_object_operation(
&mut tx,
&principal,
&cal_id,
object_id,
CalendarChangeOperation::Add,
)
.await?;
tx.commit().await?;
Ok(())
@@ -258,8 +269,8 @@ impl CalendarStore for SqliteCalendarStore {
async fn delete_object(
&mut self,
principal: &str,
cid: &str,
uid: &str,
cal_id: &str,
id: &str,
use_trashbin: bool,
) -> Result<(), Error> {
let mut tx = self.db.begin().await?;
@@ -267,19 +278,19 @@ impl CalendarStore for SqliteCalendarStore {
match use_trashbin {
true => {
sqlx::query!(
"UPDATE calendarobjects SET deleted_at = datetime(), updated_at = datetime() WHERE (principal, cid, uid) = (?, ?, ?)",
"UPDATE calendarobjects SET deleted_at = datetime(), updated_at = datetime() WHERE (principal, cal_id, id) = (?, ?, ?)",
principal,
cid,
uid
cal_id,
id
)
.execute(&mut *tx)
.await?;
}
false => {
sqlx::query!(
"DELETE FROM calendarobjects WHERE cid = ? AND uid = ?",
cid,
uid
"DELETE FROM calendarobjects WHERE cal_id = ? AND id = ?",
cal_id,
id
)
.execute(&mut *tx)
.await?;
@@ -288,8 +299,8 @@ impl CalendarStore for SqliteCalendarStore {
log_object_operation(
&mut tx,
principal,
cid,
uid,
cal_id,
id,
CalendarChangeOperation::Delete,
)
.await?;
@@ -298,14 +309,19 @@ impl CalendarStore for SqliteCalendarStore {
}
#[instrument]
async fn restore_object(&mut self, principal: &str, cid: &str, uid: &str) -> Result<(), Error> {
async fn restore_object(
&mut self,
principal: &str,
cal_id: &str,
object_id: &str,
) -> Result<(), Error> {
let mut tx = self.db.begin().await?;
sqlx::query!(
r#"UPDATE calendarobjects SET deleted_at = NULL, updated_at = datetime() WHERE (principal, cid, uid) = (?, ?, ?)"#,
r#"UPDATE calendarobjects SET deleted_at = NULL, updated_at = datetime() WHERE (principal, cal_id, id) = (?, ?, ?)"#,
principal,
cid,
uid
cal_id,
object_id
)
.execute(&mut *tx)
.await?;
@@ -313,8 +329,8 @@ impl CalendarStore for SqliteCalendarStore {
log_object_operation(
&mut tx,
principal,
cid,
uid,
cal_id,
object_id,
CalendarChangeOperation::Delete,
)
.await?;
@@ -326,17 +342,17 @@ impl CalendarStore for SqliteCalendarStore {
async fn sync_changes(
&self,
principal: &str,
cid: &str,
cal_id: &str,
synctoken: i64,
) -> Result<(Vec<CalendarObject>, Vec<String>, i64), Error> {
struct Row {
uid: String,
object_id: String,
synctoken: i64,
}
let changes = sqlx::query_as!(
Row,
r#"
SELECT DISTINCT uid, max(0, synctoken) as "synctoken!: i64" from calendarobjectchangelog
SELECT DISTINCT object_id, max(0, synctoken) as "synctoken!: i64" from calendarobjectchangelog
WHERE synctoken > ?
ORDER BY synctoken ASC
"#,
@@ -353,10 +369,10 @@ impl CalendarStore for SqliteCalendarStore {
.map(|&Row { synctoken, .. }| synctoken)
.unwrap_or(0);
for Row { uid, .. } in changes {
match self.get_object(principal, cid, &uid).await {
for Row { object_id, .. } in changes {
match self.get_object(principal, cal_id, &object_id).await {
Ok(object) => objects.push(object),
Err(Error::NotFound) => deleted_objects.push(uid),
Err(Error::NotFound) => deleted_objects.push(object_id),
Err(err) => return Err(err),
}
}

2
crates/store/tests/test_calendar.rs
View File

@@ -44,5 +44,5 @@ async fn test_create_event<CS: CalendarStore>(mut store: CS) {
let event = store.get_object("testuser", "test", "asd").await.unwrap();
assert_eq!(event.get_ics(), EVENT);
assert_eq!(event.get_uid(), "asd");
assert_eq!(event.get_id(), "asd");
}