From d4b020b64f934efbe965bc19ce0b67fba9d9b5a4 Mon Sep 17 00:00:00 2001
From: appflowy <annie@appflowy.io>
Date: Thu, 23 Sep 2021 16:10:24 +0800
Subject: [PATCH] rename backend dir

---
 backend/src/application.rs                     | 18 ++++++++----------
 backend/src/context.rs                         |  2 +-
 backend/src/entities/token.rs                  |  2 +-
 backend/src/middleware/auth_middleware.rs      |  2 +-
 .../service/{workspace_service => }/app/app.rs |  5 +----
 .../service/{workspace_service => }/app/mod.rs |  0
 .../{workspace_service => }/app/router.rs      |  4 ++--
 .../{workspace_service => }/app/sql_builder.rs |  0
 .../src/service/{doc_service => doc}/doc.rs    |  0
 .../src/service/{doc_service => doc}/mod.rs    |  0
 .../src/service/{doc_service => doc}/router.rs |  2 +-
 .../{doc_service => doc}/sql_builder.rs        |  0
 backend/src/service/mod.rs                     | 10 ++++++----
 .../src/service/{user_service => user}/auth.rs |  6 ++----
 .../{user_service => user}/logged_user.rs      |  0
 .../src/service/{user_service => user}/mod.rs  | 11 ++++++-----
 .../service/{user_service => user}/router.rs   |  9 +--------
 .../user_default => user}/user_default.rs      |  8 +++++---
 .../service/{user_service => user}/utils.rs    |  0
 .../{workspace_service => }/view/mod.rs        |  0
 .../{workspace_service => }/view/router.rs     |  2 +-
 .../view/sql_builder.rs                        |  0
 .../{workspace_service => }/view/view.rs       |  6 +++---
 .../{workspace_service => }/workspace/mod.rs   |  0
 .../workspace/router.rs                        |  9 ++-------
 .../workspace/sql_builder.rs                   |  0
 .../workspace/workspace.rs                     |  5 +----
 backend/src/service/workspace_service/mod.rs   |  4 ----
 .../workspace_service/user_default/mod.rs      |  3 ---
 .../{ws_service => ws}/entities/connect.rs     |  2 +-
 .../{ws_service => ws}/entities/message.rs     |  2 +-
 .../service/{ws_service => ws}/entities/mod.rs |  0
 backend/src/service/{ws_service => ws}/mod.rs  |  0
 .../src/service/{ws_service => ws}/router.rs   |  4 ++--
 .../service/{ws_service => ws}/ws_client.rs    |  2 +-
 .../service/{ws_service => ws}/ws_server.rs    |  2 +-
 36 files changed, 48 insertions(+), 72 deletions(-)
 rename backend/src/service/{workspace_service => }/app/app.rs (97%)
 rename backend/src/service/{workspace_service => }/app/mod.rs (100%)
 rename backend/src/service/{workspace_service => }/app/router.rs (92%)
 rename backend/src/service/{workspace_service => }/app/sql_builder.rs (100%)
 rename backend/src/service/{doc_service => doc}/doc.rs (100%)
 rename backend/src/service/{doc_service => doc}/mod.rs (100%)
 rename backend/src/service/{doc_service => doc}/router.rs (95%)
 rename backend/src/service/{doc_service => doc}/sql_builder.rs (100%)
 rename backend/src/service/{user_service => user}/auth.rs (98%)
 rename backend/src/service/{user_service => user}/logged_user.rs (100%)
 rename backend/src/service/{user_service => user}/mod.rs (83%)
 rename backend/src/service/{user_service => user}/router.rs (91%)
 rename backend/src/service/{workspace_service/user_default => user}/user_default.rs (92%)
 rename backend/src/service/{user_service => user}/utils.rs (100%)
 rename backend/src/service/{workspace_service => }/view/mod.rs (100%)
 rename backend/src/service/{workspace_service => }/view/router.rs (94%)
 rename backend/src/service/{workspace_service => }/view/sql_builder.rs (100%)
 rename backend/src/service/{workspace_service => }/view/view.rs (98%)
 rename backend/src/service/{workspace_service => }/workspace/mod.rs (100%)
 rename backend/src/service/{workspace_service => }/workspace/router.rs (91%)
 rename backend/src/service/{workspace_service => }/workspace/sql_builder.rs (100%)
 rename backend/src/service/{workspace_service => }/workspace/workspace.rs (97%)
 delete mode 100644 backend/src/service/workspace_service/mod.rs
 delete mode 100644 backend/src/service/workspace_service/user_default/mod.rs
 rename backend/src/service/{ws_service => ws}/entities/connect.rs (95%)
 rename backend/src/service/{ws_service => ws}/entities/message.rs (94%)
 rename backend/src/service/{ws_service => ws}/entities/mod.rs (100%)
 rename backend/src/service/{ws_service => ws}/mod.rs (100%)
 rename backend/src/service/{ws_service => ws}/router.rs (91%)
 rename backend/src/service/{ws_service => ws}/ws_client.rs (99%)
 rename backend/src/service/{ws_service => ws}/ws_server.rs (97%)

diff --git a/backend/src/application.rs b/backend/src/application.rs
index 77d9ac348c..5efbcea88d 100644
--- a/backend/src/application.rs
+++ b/backend/src/application.rs
@@ -14,15 +14,13 @@ use crate::{
     },
     context::AppContext,
     service::{
-        doc_service::router as doc,
-        user_service::router as user,
-        workspace_service::{
-            app::router as app,
-            view::router as view,
-            workspace::router as workspace,
-        },
-        ws_service,
-        ws_service::WSServer,
+        app::router as app,
+        doc::router as doc,
+        user::router as user,
+        view::router as view,
+        workspace::router as workspace,
+        ws,
+        ws::WSServer,
     },
 };
 
@@ -82,7 +80,7 @@ async fn period_check(_pool: Data<PgPool>) {
     }
 }
 
-fn ws_scope() -> Scope { web::scope("/ws").service(ws_service::router::establish_ws_connection) }
+fn ws_scope() -> Scope { web::scope("/ws").service(ws::router::establish_ws_connection) }
 
 fn user_scope() -> Scope {
     // https://developer.mozilla.org/en-US/docs/Web/HTTP
diff --git a/backend/src/context.rs b/backend/src/context.rs
index 0ed14a78b9..5f6a48f44f 100644
--- a/backend/src/context.rs
+++ b/backend/src/context.rs
@@ -1,4 +1,4 @@
-use crate::service::ws_service::WSServer;
+use crate::service::ws::WSServer;
 use actix::Addr;
 
 use sqlx::PgPool;
diff --git a/backend/src/entities/token.rs b/backend/src/entities/token.rs
index 52086c28f7..25d37e0844 100644
--- a/backend/src/entities/token.rs
+++ b/backend/src/entities/token.rs
@@ -74,7 +74,7 @@ impl Token {
     }
 }
 
-use crate::service::user_service::EXPIRED_DURATION_DAYS;
+use crate::service::user::EXPIRED_DURATION_DAYS;
 use actix_web::{dev::Payload, FromRequest, HttpRequest};
 use flowy_net::config::HEADER_TOKEN;
 use futures::future::{ready, Ready};
diff --git a/backend/src/middleware/auth_middleware.rs b/backend/src/middleware/auth_middleware.rs
index 34b4615203..fa826c416d 100644
--- a/backend/src/middleware/auth_middleware.rs
+++ b/backend/src/middleware/auth_middleware.rs
@@ -1,4 +1,4 @@
-use crate::service::user_service::{LoggedUser, AUTHORIZED_USERS};
+use crate::service::user::{LoggedUser, AUTHORIZED_USERS};
 use actix_service::{Service, Transform};
 use actix_web::{
     dev::{ServiceRequest, ServiceResponse},
diff --git a/backend/src/service/workspace_service/app/app.rs b/backend/src/service/app/app.rs
similarity index 97%
rename from backend/src/service/workspace_service/app/app.rs
rename to backend/src/service/app/app.rs
index f8a872ab1b..e3e107b35d 100644
--- a/backend/src/service/workspace_service/app/app.rs
+++ b/backend/src/service/app/app.rs
@@ -17,10 +17,7 @@ use flowy_workspace::{
 
 use crate::{
     entities::workspace::{AppTable, APP_TABLE},
-    service::{
-        user_service::LoggedUser,
-        workspace_service::{app::sql_builder::*, view::read_views_belong_to_id},
-    },
+    service::{app::sql_builder::*, user::LoggedUser, view::read_views_belong_to_id},
     sqlx_ext::{map_sqlx_error, SqlBuilder},
 };
 
diff --git a/backend/src/service/workspace_service/app/mod.rs b/backend/src/service/app/mod.rs
similarity index 100%
rename from backend/src/service/workspace_service/app/mod.rs
rename to backend/src/service/app/mod.rs
diff --git a/backend/src/service/workspace_service/app/router.rs b/backend/src/service/app/router.rs
similarity index 92%
rename from backend/src/service/workspace_service/app/router.rs
rename to backend/src/service/app/router.rs
index 469d5cd110..432cf11d9f 100644
--- a/backend/src/service/workspace_service/app/router.rs
+++ b/backend/src/service/app/router.rs
@@ -13,9 +13,9 @@ use flowy_workspace::protobuf::{
 };
 
 use crate::service::{
-    user_service::LoggedUser,
+    app::app::{create_app, delete_app, read_app, update_app},
+    user::LoggedUser,
     util::parse_from_payload,
-    workspace_service::app::app::{create_app, delete_app, read_app, update_app},
 };
 
 pub async fn create_handler(
diff --git a/backend/src/service/workspace_service/app/sql_builder.rs b/backend/src/service/app/sql_builder.rs
similarity index 100%
rename from backend/src/service/workspace_service/app/sql_builder.rs
rename to backend/src/service/app/sql_builder.rs
diff --git a/backend/src/service/doc_service/doc.rs b/backend/src/service/doc/doc.rs
similarity index 100%
rename from backend/src/service/doc_service/doc.rs
rename to backend/src/service/doc/doc.rs
diff --git a/backend/src/service/doc_service/mod.rs b/backend/src/service/doc/mod.rs
similarity index 100%
rename from backend/src/service/doc_service/mod.rs
rename to backend/src/service/doc/mod.rs
diff --git a/backend/src/service/doc_service/router.rs b/backend/src/service/doc/router.rs
similarity index 95%
rename from backend/src/service/doc_service/router.rs
rename to backend/src/service/doc/router.rs
index 59bd129c17..177aae14a6 100644
--- a/backend/src/service/doc_service/router.rs
+++ b/backend/src/service/doc/router.rs
@@ -8,7 +8,7 @@ use flowy_document::protobuf::{QueryDocParams, UpdateDocParams};
 use flowy_net::errors::ServerError;
 
 use crate::service::{
-    doc_service::{read_doc, update_doc},
+    doc::{read_doc, update_doc},
     util::parse_from_payload,
 };
 
diff --git a/backend/src/service/doc_service/sql_builder.rs b/backend/src/service/doc/sql_builder.rs
similarity index 100%
rename from backend/src/service/doc_service/sql_builder.rs
rename to backend/src/service/doc/sql_builder.rs
diff --git a/backend/src/service/mod.rs b/backend/src/service/mod.rs
index 2447faf567..3a52636333 100644
--- a/backend/src/service/mod.rs
+++ b/backend/src/service/mod.rs
@@ -1,6 +1,8 @@
-pub mod doc_service;
+pub mod app;
+pub mod doc;
 pub(crate) mod log;
-pub mod user_service;
+pub mod user;
 pub(crate) mod util;
-pub mod workspace_service;
-pub mod ws_service;
+pub mod view;
+pub mod workspace;
+pub mod ws;
diff --git a/backend/src/service/user_service/auth.rs b/backend/src/service/user/auth.rs
similarity index 98%
rename from backend/src/service/user_service/auth.rs
rename to backend/src/service/user/auth.rs
index d52331c90c..ccc6707a80 100644
--- a/backend/src/service/user_service/auth.rs
+++ b/backend/src/service/user/auth.rs
@@ -20,14 +20,12 @@ use flowy_user::{
 
 use crate::{
     entities::{token::Token, user::UserTable},
-    service::{
-        user_service::{hash_password, verify_password, LoggedUser},
-        workspace_service::user_default::create_default_workspace,
-    },
+    service::user::{hash_password, verify_password, LoggedUser},
     sqlx_ext::{map_sqlx_error, DBTransaction, SqlBuilder},
 };
 
 use super::AUTHORIZED_USERS;
+use crate::service::user::user_default::create_default_workspace;
 
 pub async fn sign_in(pool: &PgPool, params: SignInParams) -> Result<SignInResponse, ServerError> {
     let email =
diff --git a/backend/src/service/user_service/logged_user.rs b/backend/src/service/user/logged_user.rs
similarity index 100%
rename from backend/src/service/user_service/logged_user.rs
rename to backend/src/service/user/logged_user.rs
diff --git a/backend/src/service/user_service/mod.rs b/backend/src/service/user/mod.rs
similarity index 83%
rename from backend/src/service/user_service/mod.rs
rename to backend/src/service/user/mod.rs
index ae79137ff4..cf8a2f0d15 100644
--- a/backend/src/service/user_service/mod.rs
+++ b/backend/src/service/user/mod.rs
@@ -1,8 +1,9 @@
-mod auth;
-mod logged_user;
-pub mod router;
-mod utils;
-
 pub use auth::*;
 pub use logged_user::*;
 pub use utils::*;
+
+mod auth;
+mod logged_user;
+pub mod router;
+pub mod user_default;
+mod utils;
diff --git a/backend/src/service/user_service/router.rs b/backend/src/service/user/router.rs
similarity index 91%
rename from backend/src/service/user_service/router.rs
rename to backend/src/service/user/router.rs
index 1cadc720e0..d238005652 100644
--- a/backend/src/service/user_service/router.rs
+++ b/backend/src/service/user/router.rs
@@ -12,14 +12,7 @@ use flowy_user::protobuf::{SignInParams, SignUpParams, UpdateUserParams};
 use crate::{
     entities::token::Token,
     service::{
-        user_service::{
-            get_user_profile,
-            register_user,
-            set_user_profile,
-            sign_in,
-            sign_out,
-            LoggedUser,
-        },
+        user::{get_user_profile, register_user, set_user_profile, sign_in, sign_out, LoggedUser},
         util::parse_from_payload,
     },
 };
diff --git a/backend/src/service/workspace_service/user_default/user_default.rs b/backend/src/service/user/user_default.rs
similarity index 92%
rename from backend/src/service/workspace_service/user_default/user_default.rs
rename to backend/src/service/user/user_default.rs
index 7689d64eb2..63a5119605 100644
--- a/backend/src/service/workspace_service/user_default/user_default.rs
+++ b/backend/src/service/user/user_default.rs
@@ -1,15 +1,17 @@
 use flowy_net::errors::ServerError;
-use flowy_workspace::protobuf::{App, CreateViewParams, View, ViewType, Workspace};
+use flowy_workspace::{
+    entities::view::default_delta,
+    protobuf::{App, CreateViewParams, View, ViewType, Workspace},
+};
 
 use crate::{
-    service::workspace_service::{
+    service::{
         app::sql_builder::NewAppSqlBuilder as AppBuilder,
         view::create_view_with_transaction,
         workspace::sql_builder::NewWorkspaceBuilder as WorkspaceBuilder,
     },
     sqlx_ext::{map_sqlx_error, DBTransaction},
 };
-use flowy_workspace::entities::view::default_delta;
 
 pub async fn create_default_workspace(
     transaction: &mut DBTransaction<'_>,
diff --git a/backend/src/service/user_service/utils.rs b/backend/src/service/user/utils.rs
similarity index 100%
rename from backend/src/service/user_service/utils.rs
rename to backend/src/service/user/utils.rs
diff --git a/backend/src/service/workspace_service/view/mod.rs b/backend/src/service/view/mod.rs
similarity index 100%
rename from backend/src/service/workspace_service/view/mod.rs
rename to backend/src/service/view/mod.rs
diff --git a/backend/src/service/workspace_service/view/router.rs b/backend/src/service/view/router.rs
similarity index 94%
rename from backend/src/service/workspace_service/view/router.rs
rename to backend/src/service/view/router.rs
index ee226a74ff..91b231cbb7 100644
--- a/backend/src/service/workspace_service/view/router.rs
+++ b/backend/src/service/view/router.rs
@@ -14,7 +14,7 @@ use flowy_workspace::protobuf::{
 
 use crate::service::{
     util::parse_from_payload,
-    workspace_service::view::{create_view, delete_view, read_view, update_view},
+    view::{create_view, delete_view, read_view, update_view},
 };
 
 pub async fn create_handler(
diff --git a/backend/src/service/workspace_service/view/sql_builder.rs b/backend/src/service/view/sql_builder.rs
similarity index 100%
rename from backend/src/service/workspace_service/view/sql_builder.rs
rename to backend/src/service/view/sql_builder.rs
diff --git a/backend/src/service/workspace_service/view/view.rs b/backend/src/service/view/view.rs
similarity index 98%
rename from backend/src/service/workspace_service/view/view.rs
rename to backend/src/service/view/view.rs
index cd5dda8c25..26ec6b3d23 100644
--- a/backend/src/service/workspace_service/view/view.rs
+++ b/backend/src/service/view/view.rs
@@ -2,6 +2,7 @@ use anyhow::Context;
 use chrono::Utc;
 use sqlx::{postgres::PgArguments, PgPool, Postgres};
 
+use flowy_document::protobuf::CreateDocParams;
 use flowy_net::{
     errors::{invalid_params, ServerError},
     response::FlowyResponse,
@@ -17,12 +18,11 @@ use flowy_workspace::{
 use crate::{
     entities::workspace::{ViewTable, VIEW_TABLE},
     service::{
-        doc_service::{create_doc, delete_doc},
-        workspace_service::view::sql_builder::*,
+        doc::{create_doc, delete_doc},
+        view::sql_builder::*,
     },
     sqlx_ext::{map_sqlx_error, DBTransaction, SqlBuilder},
 };
-use flowy_document::protobuf::CreateDocParams;
 
 pub(crate) async fn create_view(
     pool: &PgPool,
diff --git a/backend/src/service/workspace_service/workspace/mod.rs b/backend/src/service/workspace/mod.rs
similarity index 100%
rename from backend/src/service/workspace_service/workspace/mod.rs
rename to backend/src/service/workspace/mod.rs
diff --git a/backend/src/service/workspace_service/workspace/router.rs b/backend/src/service/workspace/router.rs
similarity index 91%
rename from backend/src/service/workspace_service/workspace/router.rs
rename to backend/src/service/workspace/router.rs
index 380a2fc7dd..50f51e33e8 100644
--- a/backend/src/service/workspace_service/workspace/router.rs
+++ b/backend/src/service/workspace/router.rs
@@ -13,14 +13,9 @@ use flowy_workspace::protobuf::{
 };
 
 use crate::service::{
-    user_service::LoggedUser,
+    user::LoggedUser,
     util::parse_from_payload,
-    workspace_service::workspace::{
-        create_workspace,
-        delete_workspace,
-        read_workspaces,
-        update_workspace,
-    },
+    workspace::{create_workspace, delete_workspace, read_workspaces, update_workspace},
 };
 
 pub async fn create_handler(
diff --git a/backend/src/service/workspace_service/workspace/sql_builder.rs b/backend/src/service/workspace/sql_builder.rs
similarity index 100%
rename from backend/src/service/workspace_service/workspace/sql_builder.rs
rename to backend/src/service/workspace/sql_builder.rs
diff --git a/backend/src/service/workspace_service/workspace/workspace.rs b/backend/src/service/workspace/workspace.rs
similarity index 97%
rename from backend/src/service/workspace_service/workspace/workspace.rs
rename to backend/src/service/workspace/workspace.rs
index 93617eeb34..9fcf855378 100644
--- a/backend/src/service/workspace_service/workspace/workspace.rs
+++ b/backend/src/service/workspace/workspace.rs
@@ -12,10 +12,7 @@ use flowy_workspace::{
 
 use crate::{
     entities::workspace::{AppTable, WorkspaceTable, WORKSPACE_TABLE},
-    service::{
-        user_service::LoggedUser,
-        workspace_service::{view::read_views_belong_to_id, workspace::sql_builder::*},
-    },
+    service::{user::LoggedUser, view::read_views_belong_to_id, workspace::sql_builder::*},
     sqlx_ext::*,
 };
 
diff --git a/backend/src/service/workspace_service/mod.rs b/backend/src/service/workspace_service/mod.rs
deleted file mode 100644
index 6da0e61849..0000000000
--- a/backend/src/service/workspace_service/mod.rs
+++ /dev/null
@@ -1,4 +0,0 @@
-pub mod app;
-pub mod user_default;
-pub mod view;
-pub mod workspace;
diff --git a/backend/src/service/workspace_service/user_default/mod.rs b/backend/src/service/workspace_service/user_default/mod.rs
deleted file mode 100644
index b6df24eb64..0000000000
--- a/backend/src/service/workspace_service/user_default/mod.rs
+++ /dev/null
@@ -1,3 +0,0 @@
-mod user_default;
-
-pub use user_default::*;
diff --git a/backend/src/service/ws_service/entities/connect.rs b/backend/src/service/ws/entities/connect.rs
similarity index 95%
rename from backend/src/service/ws_service/entities/connect.rs
rename to backend/src/service/ws/entities/connect.rs
index 3e2b998171..06eef3e9a6 100644
--- a/backend/src/service/ws_service/entities/connect.rs
+++ b/backend/src/service/ws/entities/connect.rs
@@ -1,4 +1,4 @@
-use crate::service::ws_service::ClientMessage;
+use crate::service::ws::ClientMessage;
 use actix::{Message, Recipient};
 use flowy_net::errors::ServerError;
 use serde::{Deserialize, Serialize};
diff --git a/backend/src/service/ws_service/entities/message.rs b/backend/src/service/ws/entities/message.rs
similarity index 94%
rename from backend/src/service/ws_service/entities/message.rs
rename to backend/src/service/ws/entities/message.rs
index 486f854209..406ca12df4 100644
--- a/backend/src/service/ws_service/entities/message.rs
+++ b/backend/src/service/ws/entities/message.rs
@@ -1,4 +1,4 @@
-use crate::service::ws_service::entities::SessionId;
+use crate::service::ws::entities::SessionId;
 use actix::Message;
 use bytes::Bytes;
 use std::fmt::Formatter;
diff --git a/backend/src/service/ws_service/entities/mod.rs b/backend/src/service/ws/entities/mod.rs
similarity index 100%
rename from backend/src/service/ws_service/entities/mod.rs
rename to backend/src/service/ws/entities/mod.rs
diff --git a/backend/src/service/ws_service/mod.rs b/backend/src/service/ws/mod.rs
similarity index 100%
rename from backend/src/service/ws_service/mod.rs
rename to backend/src/service/ws/mod.rs
diff --git a/backend/src/service/ws_service/router.rs b/backend/src/service/ws/router.rs
similarity index 91%
rename from backend/src/service/ws_service/router.rs
rename to backend/src/service/ws/router.rs
index 027643cc7c..6a59952b38 100644
--- a/backend/src/service/ws_service/router.rs
+++ b/backend/src/service/ws/router.rs
@@ -1,7 +1,7 @@
-use crate::service::ws_service::{WSClient, WSServer};
+use crate::service::ws::{WSClient, WSServer};
 use actix::Addr;
 
-use crate::service::user_service::LoggedUser;
+use crate::service::user::LoggedUser;
 use actix_web::{
     get,
     web::{Data, Path, Payload},
diff --git a/backend/src/service/ws_service/ws_client.rs b/backend/src/service/ws/ws_client.rs
similarity index 99%
rename from backend/src/service/ws_service/ws_client.rs
rename to backend/src/service/ws/ws_client.rs
index b15e73f79b..da2389209f 100644
--- a/backend/src/service/ws_service/ws_client.rs
+++ b/backend/src/service/ws/ws_client.rs
@@ -1,6 +1,6 @@
 use crate::{
     config::{HEARTBEAT_INTERVAL, PING_TIMEOUT},
-    service::ws_service::{
+    service::ws::{
         entities::{Connect, Disconnect, SessionId},
         ClientMessage,
         MessageData,
diff --git a/backend/src/service/ws_service/ws_server.rs b/backend/src/service/ws/ws_server.rs
similarity index 97%
rename from backend/src/service/ws_service/ws_server.rs
rename to backend/src/service/ws/ws_server.rs
index 5d9e80e2f7..318d1256a2 100644
--- a/backend/src/service/ws_service/ws_server.rs
+++ b/backend/src/service/ws/ws_server.rs
@@ -1,4 +1,4 @@
-use crate::service::ws_service::{
+use crate::service::ws::{
     entities::{Connect, Disconnect, Session, SessionId},
     ClientMessage,
     MessageData,