From 011a5b59c94479bf0411f710c4e23a843f1680f2 Mon Sep 17 00:00:00 2001
From: nathan <nathan@appflowy.io>
Date: Fri, 20 Dec 2024 10:22:08 +0800
Subject: [PATCH] chore: rename data to doc_state

---
 libs/database-entity/src/dto.rs                                | 2 +-
 services/appflowy-collaborate/src/actix_ws/client/rt_client.rs | 2 +-
 services/appflowy-collaborate/src/error.rs                     | 3 +++
 services/appflowy-collaborate/src/group/group_init.rs          | 2 +-
 .../appflowy-collaborate/src/group/plugin/history_plugin.rs    | 2 +-
 services/appflowy-collaborate/src/snapshot/snapshot_control.rs | 2 +-
 src/api/workspace.rs                                           | 2 +-
 7 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/libs/database-entity/src/dto.rs b/libs/database-entity/src/dto.rs
index bd8cdd35..49c25857 100644
--- a/libs/database-entity/src/dto.rs
+++ b/libs/database-entity/src/dto.rs
@@ -217,7 +217,7 @@ pub struct InsertSnapshotParams {
   #[validate(custom(function = "validate_not_empty_str"))]
   pub object_id: String,
   #[validate(custom(function = "validate_not_empty_payload"))]
-  pub data: Bytes,
+  pub doc_state: Bytes,
   #[validate(custom(function = "validate_not_empty_str"))]
   pub workspace_id: String,
   pub collab_type: CollabType,
diff --git a/services/appflowy-collaborate/src/actix_ws/client/rt_client.rs b/services/appflowy-collaborate/src/actix_ws/client/rt_client.rs
index eed5d61c..6d3b1e84 100644
--- a/services/appflowy-collaborate/src/actix_ws/client/rt_client.rs
+++ b/services/appflowy-collaborate/src/actix_ws/client/rt_client.rs
@@ -107,7 +107,7 @@ where
         user: self.user.clone(),
         message,
       })
-      .map_err(|err| RealtimeError::Internal(err.into()))
+      .map_err(|err| RealtimeError::SendWSMessageFailed(err.to_string()))
   }
 }
 
diff --git a/services/appflowy-collaborate/src/error.rs b/services/appflowy-collaborate/src/error.rs
index 0f5b6f27..c3790401 100644
--- a/services/appflowy-collaborate/src/error.rs
+++ b/services/appflowy-collaborate/src/error.rs
@@ -79,6 +79,9 @@ pub enum RealtimeError {
 
   #[error("failed to obtain lease: {0}")]
   Lease(Box<dyn std::error::Error + Send + Sync>),
+
+  #[error("failed to send ws message: {0}")]
+  SendWSMessageFailed(String),
 }
 
 #[derive(Debug)]
diff --git a/services/appflowy-collaborate/src/group/group_init.rs b/services/appflowy-collaborate/src/group/group_init.rs
index f46b5b2a..c2feb857 100644
--- a/services/appflowy-collaborate/src/group/group_init.rs
+++ b/services/appflowy-collaborate/src/group/group_init.rs
@@ -1151,7 +1151,7 @@ impl CollabPersister {
         .observe(doc_state_full.len() as f64);
       let params = InsertSnapshotParams {
         object_id: self.object_id.clone(),
-        data: doc_state_full.into(),
+        doc_state: doc_state_full.into(),
         workspace_id: self.workspace_id.clone(),
         collab_type: self.collab_type.clone(),
       };
diff --git a/services/appflowy-collaborate/src/group/plugin/history_plugin.rs b/services/appflowy-collaborate/src/group/plugin/history_plugin.rs
index 7d108461..eb1ff271 100644
--- a/services/appflowy-collaborate/src/group/plugin/history_plugin.rs
+++ b/services/appflowy-collaborate/src/group/plugin/history_plugin.rs
@@ -64,7 +64,7 @@ where
       let data = encode_collab.doc_state;
       let params = InsertSnapshotParams {
         object_id,
-        data,
+        doc_state: data,
         workspace_id,
         collab_type,
       };
diff --git a/services/appflowy-collaborate/src/snapshot/snapshot_control.rs b/services/appflowy-collaborate/src/snapshot/snapshot_control.rs
index 9f8c71e6..ed7cb09e 100644
--- a/services/appflowy-collaborate/src/snapshot/snapshot_control.rs
+++ b/services/appflowy-collaborate/src/snapshot/snapshot_control.rs
@@ -120,7 +120,7 @@ impl SnapshotControl {
     let timestamp = Utc::now();
     let snapshot_id = timestamp.timestamp_millis();
     let key = collab_snapshot_key(&params.workspace_id, &params.object_id, snapshot_id);
-    let compressed = zstd::encode_all(params.data.as_ref(), ZSTD_COMPRESSION_LEVEL)?;
+    let compressed = zstd::encode_all(params.doc_state.as_ref(), ZSTD_COMPRESSION_LEVEL)?;
     if let Err(err) = self.s3.put_blob(&key, compressed.into(), None).await {
       self.collab_metrics.write_snapshot_failures.inc();
       return Err(err);
diff --git a/src/api/workspace.rs b/src/api/workspace.rs
index 22a38197..2edaa8b6 100644
--- a/src/api/workspace.rs
+++ b/src/api/workspace.rs
@@ -1304,7 +1304,7 @@ async fn create_collab_snapshot_handler(
     .create_snapshot(InsertSnapshotParams {
       object_id,
       workspace_id,
-      data,
+      doc_state: data,
       collab_type,
     })
     .await?;