From 128590652ebe8591ccc97276d8d26ed4d9313352 Mon Sep 17 00:00:00 2001
From: "Nathan.fooo" <86001920+appflowy@users.noreply.github.com>
Date: Tue, 10 Oct 2023 08:45:29 +0800
Subject: [PATCH] refactor: collab storage dir (#108)

---
 .../database/src/{ => collab}/collab_db_ops.rs |  0
 .../{collab.rs => collab/collab_storage.rs}    |  2 +-
 libs/database/src/collab/mod.rs                |  5 +++++
 libs/database/src/lib.rs                       |  1 -
 src/biz/collab.rs                              | 18 ++++++------------
 5 files changed, 12 insertions(+), 14 deletions(-)
 rename libs/database/src/{ => collab}/collab_db_ops.rs (100%)
 rename libs/database/src/{collab.rs => collab/collab_storage.rs} (99%)
 create mode 100644 libs/database/src/collab/mod.rs

diff --git a/libs/database/src/collab_db_ops.rs b/libs/database/src/collab/collab_db_ops.rs
similarity index 100%
rename from libs/database/src/collab_db_ops.rs
rename to libs/database/src/collab/collab_db_ops.rs
diff --git a/libs/database/src/collab.rs b/libs/database/src/collab/collab_storage.rs
similarity index 99%
rename from libs/database/src/collab.rs
rename to libs/database/src/collab/collab_storage.rs
index 8ed8c005..62cfed8b 100644
--- a/libs/database/src/collab.rs
+++ b/libs/database/src/collab/collab_storage.rs
@@ -1,4 +1,3 @@
-use crate::collab_db_ops;
 use anyhow::Context;
 use async_trait::async_trait;
 use collab::core::collab::MutexCollab;
@@ -13,6 +12,7 @@ use sqlx::PgPool;
 use std::collections::HashMap;
 use std::sync::Weak;
 
+use crate::collab::collab_db_ops;
 use validator::Validate;
 
 pub type Result<T, E = DatabaseError> = core::result::Result<T, E>;
diff --git a/libs/database/src/collab/mod.rs b/libs/database/src/collab/mod.rs
new file mode 100644
index 00000000..046a7444
--- /dev/null
+++ b/libs/database/src/collab/mod.rs
@@ -0,0 +1,5 @@
+mod collab_db_ops;
+mod collab_storage;
+
+pub use collab_db_ops::*;
+pub use collab_storage::*;
diff --git a/libs/database/src/lib.rs b/libs/database/src/lib.rs
index ce8717b7..ca1faa2a 100644
--- a/libs/database/src/lib.rs
+++ b/libs/database/src/lib.rs
@@ -1,5 +1,4 @@
 pub mod collab;
-pub mod collab_db_ops;
 pub mod file_storage;
 pub mod user;
 pub mod workspace;
diff --git a/src/biz/collab.rs b/src/biz/collab.rs
index 03e6d068..fd32a982 100644
--- a/src/biz/collab.rs
+++ b/src/biz/collab.rs
@@ -1,7 +1,4 @@
-use database::{
-  collab_db_ops::{self, collab_exists, insert_af_collab},
-  user,
-};
+use database::user;
 use database_entity::{
   AFCollabSnapshots, DeleteCollabParams, InsertCollabParams, QueryObjectSnapshotParams,
   QuerySnapshotParams,
@@ -16,10 +13,8 @@ pub async fn create_collab(
   params: &InsertCollabParams,
 ) -> Result<(), AppError> {
   params.validate()?;
-
   // TODO: access control for user_uuid
-
-  if collab_exists(pg_pool, &params.object_id).await? {
+  if database::collab::collab_exists(pg_pool, &params.object_id).await? {
     return Err(ErrorCode::RecordAlreadyExists.into());
   }
   upsert_collab(pg_pool, user_uuid, params).await
@@ -36,7 +31,7 @@ pub async fn upsert_collab(
 
   let owner_uid = user::uid_from_uuid(pg_pool, user_uuid).await?;
   let mut tx = pg_pool.begin().await?;
-  insert_af_collab(&mut tx, owner_uid, params).await?;
+  database::collab::insert_af_collab(&mut tx, owner_uid, params).await?;
   tx.commit().await?;
   Ok(())
 }
@@ -48,7 +43,7 @@ pub async fn get_collab_snapshot(
 ) -> Result<Vec<u8>, AppError> {
   // TODO: access control for user_uuid
 
-  let blob = collab_db_ops::get_snapshot_blob(pg_pool, params.snapshot_id).await?;
+  let blob = database::collab::get_snapshot_blob(pg_pool, params.snapshot_id).await?;
   Ok(blob)
 }
 
@@ -58,8 +53,7 @@ pub async fn get_all_collab_snapshot(
   params: &QueryObjectSnapshotParams,
 ) -> Result<AFCollabSnapshots, AppError> {
   // TODO: access control for user_uuid
-
-  let snapshots = collab_db_ops::get_all_snapshots(pg_pool, &params.object_id).await?;
+  let snapshots = database::collab::get_all_snapshots(pg_pool, &params.object_id).await?;
   Ok(snapshots)
 }
 pub async fn delete_collab(
@@ -71,6 +65,6 @@ pub async fn delete_collab(
 
   // TODO: access control for user_uuid
 
-  collab_db_ops::delete_collab(pg_pool, &params.object_id).await?;
+  database::collab::delete_collab(pg_pool, &params.object_id).await?;
   Ok(())
 }