return paths

sync-server/src/app_state/database/models.rs

@@ -78,72 +78,6 @@ pub struct DocumentVersion {
     pub device_id: DeviceId,
 }
 
-/// Like [`DocumentVersionWithoutContent`] but without the `relative_path`.
-/// Used only in create/update responses where the client already tracks
-/// the path locally (the server is the source of truth for the
-/// document identity, not its path).
-#[derive(TS, Debug, Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct DocumentUpdateMetadata {
-    #[ts(type = "number")]
-    pub vault_update_id: VaultUpdateId,
-
-    pub document_id: DocumentId,
-    pub updated_date: DateTime<Utc>,
-    pub is_deleted: bool,
-    pub user_id: UserId,
-    pub device_id: DeviceId,
-
-    #[ts(type = "number")]
-    pub content_size: u64,
-}
-
-impl From<StoredDocumentVersion> for DocumentUpdateMetadata {
-    fn from(value: StoredDocumentVersion) -> Self {
-        Self {
-            vault_update_id: value.vault_update_id,
-            document_id: value.document_id,
-            updated_date: value.updated_date,
-            is_deleted: value.is_deleted,
-            user_id: value.user_id,
-            device_id: value.device_id,
-            content_size: value.content.len() as u64,
-        }
-    }
-}
-
-/// Like [`DocumentVersion`] but without the `relative_path`.
-/// Used only in create/update responses when the server had to merge the
-/// client's content with a newer remote version and therefore must echo
-/// the merged content back.
-#[derive(TS, Debug, Clone, Serialize)]
-#[serde(rename_all = "camelCase")]
-pub struct DocumentUpdateMergedContent {
-    #[ts(type = "number")]
-    pub vault_update_id: VaultUpdateId,
-
-    pub document_id: DocumentId,
-    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 DocumentUpdateMergedContent {
-    fn from(value: StoredDocumentVersion) -> Self {
-        Self {
-            vault_update_id: value.vault_update_id,
-            document_id: value.document_id,
-            updated_date: value.updated_date,
-            content_base64: STANDARD.encode(&value.content),
-            is_deleted: value.is_deleted,
-            user_id: value.user_id,
-            device_id: value.device_id,
-        }
-    }
-}
-
 /// Row struct for vault history queries (used by `sqlx::query_as!`)
 #[derive(Debug)]
 pub struct VaultHistoryRow {

sync-server/src/server/responses.rs

@@ -3,8 +3,7 @@ use serde::{self, Serialize};
 use ts_rs::TS;
 
 use crate::app_state::database::models::{
-    DocumentUpdateMergedContent, DocumentUpdateMetadata, DocumentVersionWithoutContent,
-    VaultUpdateId,
+    DocumentVersion, DocumentVersionWithoutContent, VaultUpdateId,
 };
 
 /// Response to a ping request.
@@ -75,9 +74,9 @@ pub enum DocumentUpdateResponse {
     /// Returned when the created/updated document's content is the same as was
     /// sent in the create/update request and thus the response doesn't contain
     /// the content because the client must already have it.
-    FastForwardUpdate(DocumentUpdateMetadata),
+    FastForwardUpdate(DocumentVersionWithoutContent),
 
     /// Returned when the created/updated document's content is different from
     /// what was sent in the create/update request.
-    MergingUpdate(DocumentUpdateMergedContent),
+    MergingUpdate(DocumentVersion),
 }