diff --git a/backend/sync_server/src/database.rs b/backend/sync_server/src/database.rs index 3018dfb..2222ce3 100644 --- a/backend/sync_server/src/database.rs +++ b/backend/sync_server/src/database.rs @@ -1,7 +1,7 @@ use std::str::FromStr; use anyhow::{Context, Result}; -use models::{DocumentVersionId, DocumentVersionWithoutContent, StoredDocumentVersion, VaultId}; +use models::{DocumentVersionWithoutContent, StoredDocumentVersion, VaultId, VaultUpdateId}; use sqlx::{sqlite::SqliteConnectOptions, types::chrono::Utc}; pub mod models; use sqlx::{sqlite::SqlitePoolOptions, Pool, Sqlite}; @@ -64,8 +64,8 @@ impl Database { r#" select vault_id, + vault_update_id, relative_path, - version_id, created_date as "created_date: chrono::DateTime", updated_date as "updated_date: chrono::DateTime", is_deleted @@ -83,6 +83,62 @@ impl Database { .context("Cannot fetch latest documents") } + pub async fn get_max_update_id_in_vault( + &self, + vault: &VaultId, + transaction: Option<&mut Transaction<'_>>, + ) -> Result { + let query = sqlx::query!( + r#" + select coalesce(max(vault_update_id), 0) as max_vault_update_id + from documents + where vault_id = ? + "#, + vault + ); + + if let Some(transaction) = transaction { + query.fetch_one(&mut **transaction).await + } else { + query.fetch_one(&self.connection_pool).await + } + .map(|row| row.max_vault_update_id) + .context("Cannot fetch max update id in vault") + } + + pub async fn get_latest_documents_since( + &self, + vault: &VaultId, + vault_update_id: VaultUpdateId, + transaction: Option<&mut Transaction<'_>>, + ) -> Result> { + let query = sqlx::query_as!( + DocumentVersionWithoutContent, + r#" + select + vault_id, + vault_update_id, + relative_path, + created_date as "created_date: chrono::DateTime", + updated_date as "updated_date: chrono::DateTime", + is_deleted + from latest_document_versions + where vault_id = ? and vault_update_id > ? + "#, + vault, + vault_update_id + ); + + if let Some(transaction) = transaction { + query.fetch_all(&mut **transaction).await + } else { + query.fetch_all(&self.connection_pool).await + } + .with_context(|| { + format!("Cannot fetch latest documents since vault_update_id {vault_update_id}") + }) + } + pub async fn get_latest_document( &self, vault: &VaultId, @@ -94,8 +150,8 @@ impl Database { r#" select vault_id, + vault_update_id, relative_path, - version_id, created_date as "created_date: chrono::DateTime", updated_date as "updated_date: chrono::DateTime", content, @@ -118,8 +174,7 @@ impl Database { pub async fn get_document_version( &self, vault: &VaultId, - relative_path: &str, - version: &DocumentVersionId, + vault_update_id: VaultUpdateId, transaction: Option<&mut Transaction<'_>>, ) -> Result> { let query = sqlx::query_as!( @@ -127,17 +182,16 @@ impl Database { r#" select vault_id, + vault_update_id, relative_path, - version_id, created_date as "created_date: chrono::DateTime", updated_date as "updated_date: chrono::DateTime", content, is_deleted from documents - where vault_id = ? and relative_path = ? and version_id = ?"#, + where vault_id = ? and vault_update_id = ?"#, vault, - relative_path, - version + vault_update_id ); if let Some(transaction) = transaction { @@ -157,8 +211,8 @@ impl Database { r#" insert into documents ( vault_id, + vault_update_id, relative_path, - version_id, created_date, updated_date, content, @@ -167,8 +221,8 @@ impl Database { values (?, ?, ?, ?, ?, ?, ?) "#, version.vault_id, + version.vault_update_id, version.relative_path, - version.version_id, version.created_date, version.updated_date, version.content, diff --git a/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql b/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql index dbfb950..f1c7ac8 100644 --- a/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql +++ b/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql @@ -1,25 +1,24 @@ CREATE TABLE IF NOT EXISTS documents ( vault_id TEXT NOT NULL, + vault_update_id INTEGER NOT NULL, relative_path TEXT NOT NULL, - version_id INTEGER NOT NULL, created_date TIMESTAMP NOT NULL, updated_date TIMESTAMP NOT NULL, content BLOB NOT NULL, is_deleted BOOLEAN NOT NULL, - PRIMARY KEY (vault_id, relative_path, version_id) + PRIMARY KEY (vault_id, vault_update_id) ); CREATE VIEW IF NOT EXISTS latest_document_versions AS SELECT d.* FROM documents d INNER JOIN ( - SELECT vault_id, relative_path, MAX(version_id) AS max_version_id + SELECT vault_id, MAX(vault_update_id) AS max_version_id FROM documents GROUP BY vault_id, relative_path ) max_versions ON d.vault_id = max_versions.vault_id -AND d.relative_path = max_versions.relative_path -AND d.version_id = max_versions.max_version_id; +AND d.vault_update_id = max_versions.max_version_id; CREATE INDEX IF NOT EXISTS idx_documents_vault_doc ON documents (vault_id, relative_path); diff --git a/backend/sync_server/src/database/models.rs b/backend/sync_server/src/database/models.rs index 9648ef0..d17cf4b 100644 --- a/backend/sync_server/src/database/models.rs +++ b/backend/sync_server/src/database/models.rs @@ -4,13 +4,13 @@ use serde::Serialize; use sync_lib::bytes_to_base64; pub type VaultId = String; -pub type DocumentVersionId = i64; +pub type VaultUpdateId = i64; #[derive(Debug, Clone)] pub struct StoredDocumentVersion { pub vault_id: VaultId, + pub vault_update_id: VaultUpdateId, pub relative_path: String, - pub version_id: DocumentVersionId, pub created_date: DateTime, pub updated_date: DateTime, pub content: Vec, @@ -21,8 +21,8 @@ pub struct StoredDocumentVersion { #[serde(rename_all = "camelCase")] pub struct DocumentVersionWithoutContent { pub vault_id: VaultId, + pub vault_update_id: VaultUpdateId, pub relative_path: String, - pub version_id: DocumentVersionId, pub created_date: DateTime, pub updated_date: DateTime, pub is_deleted: bool, @@ -32,8 +32,8 @@ impl From for DocumentVersionWithoutContent { fn from(value: StoredDocumentVersion) -> Self { Self { vault_id: value.vault_id, + vault_update_id: value.vault_update_id, relative_path: value.relative_path, - version_id: value.version_id, created_date: value.created_date, updated_date: value.updated_date, is_deleted: value.is_deleted, @@ -41,19 +41,12 @@ impl From for DocumentVersionWithoutContent { } } -#[derive(Debug, Clone, Serialize, JsonSchema)] -#[serde(rename_all = "camelCase")] -pub struct PingResponse { - pub server_version: String, - pub is_authenticated: bool, -} - #[derive(Debug, Clone, Serialize, JsonSchema)] #[serde(rename_all = "camelCase")] pub struct DocumentVersion { pub vault_id: VaultId, + pub vault_update_id: VaultUpdateId, pub relative_path: String, - pub version_id: DocumentVersionId, pub created_date: DateTime, pub updated_date: DateTime, pub content_base64: String, @@ -64,8 +57,8 @@ impl From for DocumentVersion { fn from(value: StoredDocumentVersion) -> Self { Self { vault_id: value.vault_id, + vault_update_id: value.vault_update_id, relative_path: value.relative_path, - version_id: value.version_id, created_date: value.created_date, updated_date: value.updated_date, content_base64: bytes_to_base64(&value.content), diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs index 8c62674..0db07c7 100644 --- a/backend/sync_server/src/server/delete_document.rs +++ b/backend/sync_server/src/server/delete_document.rs @@ -1,4 +1,4 @@ -use anyhow::{anyhow, Context}; +use anyhow::Context; use axum::{ extract::{Path, State}, Json, @@ -14,7 +14,7 @@ use super::{auth::auth, requests::DeleteDocumentVersion}; use crate::{ app_state::AppState, database::models::{StoredDocumentVersion, VaultId}, - errors::{not_found_error, server_error, SyncServerError}, + errors::{server_error, SyncServerError}, }; // This is required for aide to infer the path parameter types and names @@ -42,23 +42,16 @@ pub async fn delete_document( .await .map_err(server_error)?; - let latest_version = state + let last_update_id = state .database - .get_latest_document(&vault_id, &relative_path, Some(&mut transaction)) + .get_max_update_id_in_vault(&vault_id, Some(&mut transaction)) .await - .map_err(server_error)? - .map(Ok) - .unwrap_or_else(|| { - Err(not_found_error(anyhow!( - "Latest document version of document `{}` not found", - relative_path - ))) - })?; + .map_err(server_error)?; let new_version = StoredDocumentVersion { vault_id, + vault_update_id: last_update_id + 1, relative_path, - version_id: latest_version.version_id + 1, content: vec![], created_date: request.created_date, updated_date: chrono::Utc::now(), diff --git a/backend/sync_server/src/server/requests.rs b/backend/sync_server/src/server/requests.rs index 4c3a761..7c0e1e4 100644 --- a/backend/sync_server/src/server/requests.rs +++ b/backend/sync_server/src/server/requests.rs @@ -2,12 +2,12 @@ use chrono::{DateTime, Utc}; use schemars::JsonSchema; use serde::{self, Deserialize}; -use crate::database::models::DocumentVersionId; +use crate::database::models::VaultUpdateId; #[derive(Debug, Deserialize, JsonSchema)] #[serde(rename_all = "camelCase")] pub struct UpdateDocumentVersion { - pub parent_version_id: Option, + pub parent_version_id: Option, pub created_date: DateTime, pub content_base64: String, } diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs index b40774c..1c06c75 100644 --- a/backend/sync_server/src/server/update_document.rs +++ b/backend/sync_server/src/server/update_document.rs @@ -7,6 +7,7 @@ use axum_extra::{ headers::{authorization::Bearer, Authorization}, TypedHeader, }; +use log::info; use schemars::JsonSchema; use serde::Deserialize; use sync_lib::{base64_to_bytes, merge}; @@ -36,10 +37,11 @@ pub async fn update_document( Json(request): Json, ) -> Result, SyncServerError> { auth(&state, auth_header.token())?; + let parent_content = if let Some(parent_version_id) = request.parent_version_id { state .database - .get_document_version(&vault_id, &relative_path, &parent_version_id, None) + .get_document_version(&vault_id, parent_version_id, None) .await .map_err(server_error)? .map(Ok) @@ -55,26 +57,59 @@ pub async fn update_document( Ok(Vec::default()) }?; + let content_bytes = base64_to_bytes(&request.content_base64) + .context("Failed to decode base64 content in request") + .map_err(client_error)?; + let mut transaction = state .database .create_transaction() .await .map_err(server_error)?; + let mut last_update_id = state + .database + .get_max_update_id_in_vault(&vault_id, Some(&mut transaction)) + .await + .map_err(server_error)?; + let latest_version = state .database .get_latest_document(&vault_id, &relative_path, Some(&mut transaction)) .await .map_err(server_error)?; - let content_bytes = base64_to_bytes(&request.content_base64) - .context("Failed to decode base64 content in request") - .map_err(client_error)?; + if let Some(latest) = latest_version.as_ref() { + if content_bytes == latest.content && relative_path == latest.relative_path { + info!("Document content is the same as the latest version, skipping update"); + transaction + .rollback() + .await + .context("Failed to rollback transaction") + .map_err(server_error)?; + + return Ok(Json(latest.clone().into())); + } else if relative_path != latest.relative_path { + let delete_at_previous_path = StoredDocumentVersion { + vault_id: vault_id.clone(), + vault_update_id: last_update_id + 1, + relative_path: latest.relative_path.clone(), + content: vec![], + created_date: request.created_date, + updated_date: chrono::Utc::now(), + is_deleted: true, + }; + + last_update_id += 1; + + state + .database + .insert_document_version(&delete_at_previous_path, Some(&mut transaction)) + .await + .map_err(server_error)?; + } + } - let next_version = latest_version - .as_ref() - .map(|v| v.version_id + 1) - .unwrap_or(0); let latest_version_content = latest_version .map(|v| v.content) .unwrap_or_else(Vec::default); @@ -85,8 +120,8 @@ pub async fn update_document( let new_version = StoredDocumentVersion { vault_id, + vault_update_id: last_update_id + 1, relative_path, - version_id: next_version, content: merged_content, created_date: request.created_date, updated_date: chrono::Utc::now(),