andras/vault-link
1
0
Fork 0
Code Issues Pull requests 18 Projects Releases 55 Packages Wiki Activity Actions 1

Add user and device provenance colums

Browse source
This commit is contained in:
Andras Schmelczer 2025-05-22 21:05:26 +01:00
parent bfb522b2c7
commit 715bbc4d2e
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
6 changed files with 82 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

30
backend/sync_server/src/app_state/database.rs
View file

@ -143,7 +143,9 @@ impl Database {
document_id as "document_id: Hyphenated",
relative_path,
updated_date as "updated_date: chrono::DateTime<Utc>",
is_deleted
is_deleted,
user_id,
device_id
from latest_document_versions
order by vault_update_id
"#,
@ -175,7 +177,9 @@ impl Database {
document_id as "document_id: Hyphenated",
relative_path,
updated_date as "updated_date: chrono::DateTime<Utc>",
is_deleted
is_deleted,
user_id,
device_id
from latest_document_versions
where vault_update_id > ?
order by vault_update_id
@ -233,7 +237,9 @@ impl Database {
relative_path,
updated_date as "updated_date: chrono::DateTime<Utc>",
content,
is_deleted
is_deleted,
user_id,
device_id
from latest_document_versions
where relative_path = ?
order by vault_update_id desc -- `latest_document_versions` only contains a single latest version of each document, however,
@ -270,7 +276,9 @@ impl Database {
relative_path,
updated_date as "updated_date: chrono::DateTime<Utc>",
content,
is_deleted
is_deleted,
user_id,
device_id
from latest_document_versions
where document_id = ?
"#,
@ -302,7 +310,9 @@ impl Database {
relative_path,
updated_date as "updated_date: chrono::DateTime<Utc>",
content,
is_deleted
is_deleted,
user_id,
device_id
from documents
where vault_update_id = ?"#,
vault_update_id
@ -333,16 +343,20 @@ impl Database {
relative_path,
updated_date,
content,
is_deleted
is_deleted,
user_id,
device_id
)
values (?, ?, ?, ?, ?, ?)
values (?, ?, ?, ?, ?, ?, ?, ?)
"#,
version.vault_update_id,
document_id,
version.relative_path,
version.updated_date,
version.content,
version.is_deleted
version.is_deleted,
version.user_id,
version.device_id
);
if let Some(transaction) = transaction {

2
backend/sync_server/src/app_state/database/migrations/20250522192949_add_provenance_columns.sql Normal file
View file

@ -0,0 +1,2 @@
ALTER TABLE documents ADD COLUMN user_id TEXT NOT NULL DEFAULT "";
ALTER TABLE documents ADD COLUMN device_id TEXT NOT NULL DEFAULT "";

11
backend/sync_server/src/app_state/database/models.rs
View file

@ -6,6 +6,7 @@ use sync_lib::bytes_to_base64;
pub type VaultId = String;
pub type VaultUpdateId = i64;
pub type DocumentId = uuid::Uuid;
pub type UserId = String;
pub type DeviceId = String;
#[derive(Debug, Clone)]
@ -16,6 +17,8 @@ pub struct StoredDocumentVersion {
pub updated_date: DateTime<Utc>,
pub content: Vec<u8>,
pub is_deleted: bool,
pub user_id: UserId,
pub device_id: DeviceId,
}
impl PartialEq<Self> for StoredDocumentVersion {
@ -30,6 +33,8 @@ pub struct DocumentVersionWithoutContent {
pub relative_path: String,
pub updated_date: DateTime<Utc>,
pub is_deleted: bool,
pub user_id: UserId,
pub device_id: DeviceId,
}
impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
@ -40,6 +45,8 @@ impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
relative_path: value.relative_path,
updated_date: value.updated_date,
is_deleted: value.is_deleted,
user_id: value.user_id,
device_id: value.device_id,
}
}
}
@ -53,6 +60,8 @@ pub struct DocumentVersion {
pub updated_date: DateTime<Utc>,
pub content_base64: String,
pub is_deleted: bool,
pub user_id: UserId,
pub device_id: DeviceId,
}
impl From<StoredDocumentVersion> for DocumentVersion {
@ -64,6 +73,8 @@ impl From<StoredDocumentVersion> for DocumentVersion {
updated_date: value.updated_date,
content_base64: bytes_to_base64(&value.content),
is_deleted: value.is_deleted,
user_id: value.user_id,
device_id: value.device_id,
}
}
}