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

Don't return content in response if it's unchanged

Browse source
This commit is contained in:
Andras Schmelczer 2025-01-04 12:32:18 +00:00
parent 3ae0e7b896
commit c41ce7ef68
No known key found for this signature in database
GPG key ID: FC8F2C3D3D1A718C
5 changed files with 113 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

58
backend/sync_server/src/server/create_document.rs
View file

@ -12,10 +12,10 @@ use schemars::JsonSchema;
use serde::Deserialize;
use sync_lib::{base64_to_bytes, merge};
use super::{auth::auth, requests::CreateDocumentVersion};
use super::{auth::auth, requests::CreateDocumentVersion, responses::DocumentUpdateResponse};
use crate::{
app_state::AppState,
database::models::{DocumentVersion, StoredDocumentVersion, VaultId},
database::models::{StoredDocumentVersion, VaultId},
errors::{client_error, server_error, SyncServerError},
};
@ -34,7 +34,7 @@ pub async fn create_document(
Path(PathParams { vault_id }): Path<PathParams>,
State(state): State<AppState>,
Json(request): Json<CreateDocumentVersion>,
) -> Result<Json<DocumentVersion>, SyncServerError> {
) -> Result<Json<DocumentUpdateResponse>, SyncServerError> {
auth(&state, auth_header.token())?;
let mut transaction = state
@ -56,22 +56,26 @@ pub async fn create_document(
.map_err(server_error)?
.and_then(|doc| if doc.is_deleted { None } else { Some(doc) });
let new_version = if let Some(existing_version) = maybe_existing_version {
let content_bytes = base64_to_bytes(&request.content_base64)
.context("Failed to decode base64 content in request")
.map_err(client_error)?;
let content_bytes = base64_to_bytes(&request.content_base64)
.context("Failed to decode base64 content in request")
.map_err(client_error)?;
let response = if let Some(existing_version) = maybe_existing_version {
if content_bytes == existing_version.content {
info!(
"Content of the new version is the same as the existing version. Not creating a \
new version."
);
transaction
.rollback()
.await
.context("Failed to rollback unecceseary transaction")
.context("Failed to roll back unecceseary transaction")
.map_err(server_error)?;
return Ok(Json(existing_version.into()));
return Ok(Json(DocumentUpdateResponse::FastForwardUpdate(
existing_version.into(),
)));
}
let merged_content = merge(
@ -80,7 +84,7 @@ pub async fn create_document(
&content_bytes,
);
StoredDocumentVersion {
let new_version = StoredDocumentVersion {
vault_id,
vault_update_id: last_update_id + 1,
relative_path: request.relative_path,
@ -89,27 +93,35 @@ pub async fn create_document(
created_date: request.created_date,
updated_date: chrono::Utc::now(),
is_deleted: false,
}
};
state
.database
.insert_document_version(&new_version, Some(&mut transaction))
.await
.map_err(server_error)?;
DocumentUpdateResponse::MergingUpdate(new_version.into())
} else {
StoredDocumentVersion {
let new_version = StoredDocumentVersion {
vault_id,
vault_update_id: last_update_id + 1,
document_id: uuid::Uuid::new_v4(),
relative_path: request.relative_path,
content: base64_to_bytes(&request.content_base64)
.context("Cannot convert base64 encoded content to bytes")
.map_err(client_error)?,
content: content_bytes,
created_date: request.created_date,
updated_date: chrono::Utc::now(),
is_deleted: false,
}
};
};
state
.database
.insert_document_version(&new_version, Some(&mut transaction))
.await
.map_err(server_error)?;
state
.database
.insert_document_version(&new_version, Some(&mut transaction))
.await
.map_err(server_error)?;
DocumentUpdateResponse::FastForwardUpdate(new_version.into())
};
transaction
.commit()
@ -117,5 +129,5 @@ pub async fn create_document(
.context("Failed to commit successful transaction")
.map_err(server_error)?;
Ok(Json(new_version.into()))
Ok(Json(response))
}