diff --git a/backend/sync_server/src/database.rs b/backend/sync_server/src/database.rs index 52305629..89fa8229 100644 --- a/backend/sync_server/src/database.rs +++ b/backend/sync_server/src/database.rs @@ -84,7 +84,6 @@ impl Database { vault_update_id, document_id as "document_id: uuid::Uuid", relative_path, - created_date as "created_date: chrono::DateTime", updated_date as "updated_date: chrono::DateTime", is_deleted from latest_document_versions @@ -118,7 +117,6 @@ impl Database { vault_update_id, document_id as "document_id: uuid::Uuid", relative_path, - created_date as "created_date: chrono::DateTime", updated_date as "updated_date: chrono::DateTime", is_deleted from latest_document_versions @@ -176,7 +174,6 @@ impl Database { vault_update_id, document_id as "document_id: uuid::Uuid", relative_path, - created_date as "created_date: chrono::DateTime", updated_date as "updated_date: chrono::DateTime", content, is_deleted @@ -213,7 +210,6 @@ impl Database { vault_update_id, document_id as "document_id: uuid::Uuid", relative_path, - created_date as "created_date: chrono::DateTime", updated_date as "updated_date: chrono::DateTime", content, is_deleted @@ -246,7 +242,6 @@ impl Database { vault_update_id, document_id as "document_id: uuid::Uuid", relative_path, - created_date as "created_date: chrono::DateTime", updated_date as "updated_date: chrono::DateTime", content, is_deleted @@ -276,18 +271,16 @@ impl Database { vault_update_id, document_id, relative_path, - created_date, updated_date, content, is_deleted ) - values (?, ?, ?, ?, ?, ?, ?, ?) + values (?, ?, ?, ?, ?, ?, ?) "#, version.vault_id, version.vault_update_id, version.document_id, version.relative_path, - version.created_date, version.updated_date, version.content, version.is_deleted diff --git a/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql b/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql index 360b34d2..62002b58 100644 --- a/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql +++ b/backend/sync_server/src/database/migrations/20241207143519_bootstrap.sql @@ -3,7 +3,6 @@ CREATE TABLE IF NOT EXISTS documents ( vault_update_id INTEGER NOT NULL, document_id TEXT NOT NULL, relative_path TEXT NOT NULL, - created_date TIMESTAMP NOT NULL, updated_date TIMESTAMP NOT NULL, content BLOB NOT NULL, is_deleted BOOLEAN NOT NULL, diff --git a/backend/sync_server/src/database/models.rs b/backend/sync_server/src/database/models.rs index d8f743a9..9ba1832b 100644 --- a/backend/sync_server/src/database/models.rs +++ b/backend/sync_server/src/database/models.rs @@ -13,7 +13,6 @@ pub struct StoredDocumentVersion { pub vault_update_id: VaultUpdateId, pub document_id: DocumentId, pub relative_path: String, - pub created_date: DateTime, pub updated_date: DateTime, pub content: Vec, pub is_deleted: bool, @@ -32,7 +31,6 @@ pub struct DocumentVersionWithoutContent { pub vault_update_id: VaultUpdateId, pub document_id: DocumentId, pub relative_path: String, - pub created_date: DateTime, pub updated_date: DateTime, pub is_deleted: bool, } @@ -44,7 +42,6 @@ impl From for DocumentVersionWithoutContent { vault_update_id: value.vault_update_id, document_id: value.document_id, relative_path: value.relative_path, - created_date: value.created_date, updated_date: value.updated_date, is_deleted: value.is_deleted, } @@ -58,7 +55,6 @@ pub struct DocumentVersion { pub vault_update_id: VaultUpdateId, pub document_id: DocumentId, pub relative_path: String, - pub created_date: DateTime, pub updated_date: DateTime, pub content_base64: String, pub is_deleted: bool, @@ -71,7 +67,6 @@ impl From for DocumentVersion { vault_update_id: value.vault_update_id, document_id: value.document_id, relative_path: value.relative_path, - created_date: value.created_date, updated_date: value.updated_date, content_base64: bytes_to_base64(&value.content), is_deleted: value.is_deleted, diff --git a/backend/sync_server/src/server/create_document.rs b/backend/sync_server/src/server/create_document.rs index a2567939..e432cb5a 100644 --- a/backend/sync_server/src/server/create_document.rs +++ b/backend/sync_server/src/server/create_document.rs @@ -6,7 +6,6 @@ use axum_extra::{ headers::{Authorization, authorization::Bearer}, }; use axum_jsonschema::Json; -use chrono::{DateTime, Utc}; use schemars::JsonSchema; use serde::Deserialize; use sync_lib::base64_to_bytes; @@ -45,7 +44,6 @@ pub async fn create_document_multipart( state, vault_id, request.relative_path, - request.created_date, request.content.contents.to_vec(), ) .await @@ -70,7 +68,6 @@ pub async fn create_document_json( state, vault_id, request.relative_path, - request.created_date, content_bytes, ) .await @@ -81,7 +78,6 @@ async fn internal_create_document( state: AppState, vault_id: VaultId, relative_path: String, - created_date: DateTime, content: Vec, ) -> Result, SyncServerError> { auth(&state, auth_header.token())?; @@ -106,7 +102,6 @@ async fn internal_create_document( document_id: uuid::Uuid::new_v4(), relative_path: sanitized_relative_path, content, - created_date, updated_date: chrono::Utc::now(), is_deleted: false, }; diff --git a/backend/sync_server/src/server/delete_document.rs b/backend/sync_server/src/server/delete_document.rs index afef37a7..25901e84 100644 --- a/backend/sync_server/src/server/delete_document.rs +++ b/backend/sync_server/src/server/delete_document.rs @@ -52,7 +52,6 @@ pub async fn delete_document( document_id, relative_path: sanitize_path(&request.relative_path), content: vec![], - created_date: request.created_date, updated_date: chrono::Utc::now(), is_deleted: true, }; diff --git a/backend/sync_server/src/server/requests.rs b/backend/sync_server/src/server/requests.rs index 1720f96f..b55d1c47 100644 --- a/backend/sync_server/src/server/requests.rs +++ b/backend/sync_server/src/server/requests.rs @@ -1,7 +1,6 @@ use aide_axum_typed_multipart::FieldData; use axum::body::Bytes; use axum_typed_multipart::TryFromMultipart; -use chrono::{DateTime, Utc}; use schemars::JsonSchema; use serde::{self, Deserialize}; @@ -11,14 +10,12 @@ use crate::database::models::VaultUpdateId; #[serde(rename_all = "camelCase")] pub struct CreateDocumentVersion { pub relative_path: String, - pub created_date: DateTime, pub content_base64: String, } #[derive(Debug, TryFromMultipart, JsonSchema)] pub struct CreateDocumentVersionMultipart { pub relative_path: String, - pub created_date: DateTime, #[form_data(limit = "unlimited")] pub content: FieldData, } @@ -28,7 +25,6 @@ pub struct CreateDocumentVersionMultipart { pub struct UpdateDocumentVersion { pub parent_version_id: VaultUpdateId, pub relative_path: String, - pub created_date: DateTime, pub content_base64: String, } @@ -37,7 +33,6 @@ pub struct UpdateDocumentVersion { pub struct UpdateDocumentVersionMultipart { pub parent_version_id: VaultUpdateId, pub relative_path: String, - pub created_date: DateTime, #[form_data(limit = "unlimited")] pub content: FieldData, } @@ -46,5 +41,4 @@ pub struct UpdateDocumentVersionMultipart { #[serde(rename_all = "camelCase")] pub struct DeleteDocumentVersion { pub relative_path: String, - pub created_date: DateTime, } diff --git a/backend/sync_server/src/server/update_document.rs b/backend/sync_server/src/server/update_document.rs index 17a647ae..316b06f4 100644 --- a/backend/sync_server/src/server/update_document.rs +++ b/backend/sync_server/src/server/update_document.rs @@ -6,7 +6,6 @@ use axum_extra::{ headers::{Authorization, authorization::Bearer}, }; use axum_jsonschema::Json; -use chrono::{DateTime, Utc}; use log::info; use schemars::JsonSchema; use serde::Deserialize; @@ -50,7 +49,6 @@ pub async fn update_document_multipart( document_id, request.parent_version_id, request.relative_path, - request.created_date, request.content.contents.to_vec(), ) .await @@ -77,7 +75,6 @@ pub async fn update_document_json( document_id, request.parent_version_id, request.relative_path, - request.created_date, content_bytes, ) .await @@ -91,7 +88,6 @@ async fn internal_update_document( document_id: DocumentId, parent_version_id: VaultUpdateId, relative_path: String, - created_date: DateTime, content: Vec, ) -> Result, SyncServerError> { auth(&state, auth_header.token())?; @@ -205,7 +201,6 @@ async fn internal_update_document( vault_update_id: last_update_id + 1, relative_path: new_relative_path, content: merged_content, - created_date, updated_date: chrono::Utc::now(), is_deleted: false, };