andras/reconcile
1
0
Fork 0
Code Issues Pull requests 5 Projects Releases Packages Wiki Activity Actions

Include content size in response

Browse source
This commit is contained in:
Andras Schmelczer 2025-05-24 11:17:25 +01:00
parent 08914a8f16
commit ffeec19ca7
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
3 changed files with 44 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -135,8 +135,7 @@ impl Database {
vault: &VaultId,
transaction: Option<&mut Transaction<'_>>,
) -> Result<Vec<DocumentVersionWithoutContent>> {
let query = sqlx::query_as!(
DocumentVersionWithoutContent,
let query = sqlx::query!(
r#"
select
vault_update_id,
@ -145,7 +144,8 @@ impl Database {
updated_date as "updated_date: chrono::DateTime<Utc>",
is_deleted,
user_id,
device_id
device_id,
length(content) as "content_size: u64"
from latest_document_versions
order by vault_update_id
"#,
@ -159,6 +159,22 @@ impl Database {
.await
}
.context("Cannot fetch latest documents")
.map(|rows| {
rows.into_iter()
.map(|row| DocumentVersionWithoutContent {
vault_update_id: row.vault_update_id,
document_id: row.document_id.into(),
relative_path: row.relative_path,
updated_date: row.updated_date,
is_deleted: row.is_deleted,
user_id: row.user_id,
device_id: row.device_id,
content_size: row
.content_size
.expect("Content size can't be null but sqlx can't infer it"),
})
.collect()
})
}
/// Return the latest state of all documents (including deleted) in the
@ -169,8 +185,7 @@ impl Database {
vault_update_id: VaultUpdateId,
transaction: Option<&mut Transaction<'_>>,
) -> Result<Vec<DocumentVersionWithoutContent>> {
let query = sqlx::query_as!(
DocumentVersionWithoutContent,
let query = sqlx::query!(
r#"
select
vault_update_id,
@ -179,7 +194,8 @@ impl Database {
updated_date as "updated_date: chrono::DateTime<Utc>",
is_deleted,
user_id,
device_id
device_id,
length(content) as "content_size: u64"
from latest_document_versions
where vault_update_id > ?
order by vault_update_id
@ -197,6 +213,22 @@ impl Database {
.with_context(|| {
format!("Cannot fetch latest documents since vault_update_id {vault_update_id}")
})
.map(|rows| {
rows.into_iter()
.map(|row| DocumentVersionWithoutContent {
vault_update_id: row.vault_update_id,
document_id: row.document_id.into(),
relative_path: row.relative_path,
updated_date: row.updated_date,
is_deleted: row.is_deleted,
user_id: row.user_id,
device_id: row.device_id,
content_size: row
.content_size
.expect("Content size can't be null but sqlx can't infer it"),
})
.collect()
})
}
pub async fn get_max_update_id_in_vault(

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

@ -35,6 +35,7 @@ pub struct DocumentVersionWithoutContent {
pub is_deleted: bool,
pub user_id: UserId,
pub device_id: DeviceId,
pub content_size: u64,
}
impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
@ -47,6 +48,7 @@ impl From<StoredDocumentVersion> for DocumentVersionWithoutContent {
is_deleted: value.is_deleted,
user_id: value.user_id,
device_id: value.device_id,
content_size: value.content.len() as u64,
}
}
}

4
frontend/sync-client/src/services/types.ts
View file

@ -516,6 +516,8 @@ export interface components {
/** @description Response to an update document request. */
DocumentUpdateResponse:
| {
/** Format: uint64 */
contentSize: number;
deviceId: string;
/** Format: uuid */
documentId: string;
@ -558,6 +560,8 @@ export interface components {
vaultUpdateId: number;
};
DocumentVersionWithoutContent: {
/** Format: uint64 */
contentSize: number;
deviceId: string;
/** Format: uuid */
documentId: string;