Mirrored_Repos/AppFlowy
1
0
Fork 0
mirror of https://github.com/AppFlowy-IO/AppFlowy.git synced 2024-08-30 18:12:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: rename flowy-folder structs

Browse Source
This commit is contained in:
appflowy
2022-07-19 14:11:29 +08:00
parent 0ecff26636
commit 193527e043
64 changed files with 565 additions and 599 deletions
Download Patch File Download Diff File Expand all files Collapse all files

154
frontend/rust-lib/flowy-net/src/http_server/folder.rs
View File

@ -1,15 +1,14 @@
use crate::{
configuration::{ClientServerConfiguration, HEADER_TOKEN},
configuration::ClientServerConfiguration,
request::{HttpRequestBuilder, ResponseMiddleware},
};
use flowy_error::FlowyError;
use flowy_folder::entities::{
trash::RepeatedTrashId,
view::{CreateViewParams, RepeatedViewId, UpdateViewParams, ViewId},
workspace::{CreateWorkspaceParams, UpdateWorkspaceParams, WorkspaceId},
{AppId, CreateAppParams, UpdateAppParams},
trash::RepeatedTrashIdPB,
view::{CreateViewParams, RepeatedViewIdPB, UpdateViewParams, ViewIdPB},
workspace::{CreateWorkspaceParams, UpdateWorkspaceParams, WorkspaceIdPB},
{AppIdPB, CreateAppParams, UpdateAppParams},
};
use flowy_folder::event_map::FolderCouldServiceV1;
use flowy_folder_data_model::revision::{AppRevision, TrashRevision, ViewRevision, WorkspaceRevision};
use http_flowy::errors::ServerError;
@ -45,7 +44,7 @@ impl FolderCouldServiceV1 for FolderHttpCloudService {
})
}
fn read_workspace(&self, token: &str, params: WorkspaceId) -> FutureResult<Vec<WorkspaceRevision>, FlowyError> {
fn read_workspace(&self, token: &str, params: WorkspaceIdPB) -> FutureResult<Vec<WorkspaceRevision>, FlowyError> {
let token = token.to_owned();
let url = self.config.workspace_url();
FutureResult::new(async move {
@ -63,7 +62,7 @@ impl FolderCouldServiceV1 for FolderHttpCloudService {
})
}
fn delete_workspace(&self, token: &str, params: WorkspaceId) -> FutureResult<(), FlowyError> {
fn delete_workspace(&self, token: &str, params: WorkspaceIdPB) -> FutureResult<(), FlowyError> {
let token = token.to_owned();
let url = self.config.workspace_url();
FutureResult::new(async move {
@ -81,7 +80,7 @@ impl FolderCouldServiceV1 for FolderHttpCloudService {
})
}
fn read_view(&self, token: &str, params: ViewId) -> FutureResult<Option<ViewRevision>, FlowyError> {
fn read_view(&self, token: &str, params: ViewIdPB) -> FutureResult<Option<ViewRevision>, FlowyError> {
let token = token.to_owned();
let url = self.config.view_url();
FutureResult::new(async move {
@ -90,7 +89,7 @@ impl FolderCouldServiceV1 for FolderHttpCloudService {
})
}
fn delete_view(&self, token: &str, params: RepeatedViewId) -> FutureResult<(), FlowyError> {
fn delete_view(&self, token: &str, params: RepeatedViewIdPB) -> FutureResult<(), FlowyError> {
let token = token.to_owned();
let url = self.config.view_url();
FutureResult::new(async move {
@ -117,7 +116,7 @@ impl FolderCouldServiceV1 for FolderHttpCloudService {
})
}
fn read_app(&self, token: &str, params: AppId) -> FutureResult<Option<AppRevision>, FlowyError> {
fn read_app(&self, token: &str, params: AppIdPB) -> FutureResult<Option<AppRevision>, FlowyError> {
let token = token.to_owned();
let url = self.config.app_url();
FutureResult::new(async move {
@ -135,7 +134,7 @@ impl FolderCouldServiceV1 for FolderHttpCloudService {
})
}
fn delete_app(&self, token: &str, params: AppId) -> FutureResult<(), FlowyError> {
fn delete_app(&self, token: &str, params: AppIdPB) -> FutureResult<(), FlowyError> {
let token = token.to_owned();
let url = self.config.app_url();
FutureResult::new(async move {
@ -144,7 +143,7 @@ impl FolderCouldServiceV1 for FolderHttpCloudService {
})
}
fn create_trash(&self, token: &str, params: RepeatedTrashId) -> FutureResult<(), FlowyError> {
fn create_trash(&self, token: &str, params: RepeatedTrashIdPB) -> FutureResult<(), FlowyError> {
let token = token.to_owned();
let url = self.config.trash_url();
FutureResult::new(async move {
@ -153,7 +152,7 @@ impl FolderCouldServiceV1 for FolderHttpCloudService {
})
}
fn delete_trash(&self, token: &str, params: RepeatedTrashId) -> FutureResult<(), FlowyError> {
fn delete_trash(&self, token: &str, params: RepeatedTrashIdPB) -> FutureResult<(), FlowyError> {
let token = token.to_owned();
let url = self.config.trash_url();
FutureResult::new(async move {
@ -172,6 +171,7 @@ impl FolderCouldServiceV1 for FolderHttpCloudService {
}
}
#[allow(dead_code)]
fn request_builder() -> HttpRequestBuilder {
HttpRequestBuilder::new().middleware(MIDDLEWARE.clone())
}
@ -193,7 +193,7 @@ pub async fn create_workspace_request(
pub async fn read_workspaces_request(
_token: &str,
_params: WorkspaceId,
_params: WorkspaceIdPB,
_url: &str,
) -> Result<Vec<WorkspaceRevision>, ServerError> {
// let repeated_workspace = request_builder()
@ -208,26 +208,26 @@ pub async fn read_workspaces_request(
}
pub async fn update_workspace_request(
token: &str,
params: UpdateWorkspaceParams,
url: &str,
_token: &str,
_params: UpdateWorkspaceParams,
_url: &str,
) -> Result<(), ServerError> {
let _ = request_builder()
.patch(&url.to_owned())
.header(HEADER_TOKEN, token)
.protobuf(params)?
.send()
.await?;
// let _ = request_builder()
// .patch(&url.to_owned())
// .header(HEADER_TOKEN, token)
// .protobuf(params)?
// .send()
// .await?;
Ok(())
}
pub async fn delete_workspace_request(token: &str, params: WorkspaceId, url: &str) -> Result<(), ServerError> {
let _ = request_builder()
.delete(url)
.header(HEADER_TOKEN, token)
.protobuf(params)?
.send()
.await?;
pub async fn delete_workspace_request(_token: &str, _params: WorkspaceIdPB, _url: &str) -> Result<(), ServerError> {
// let _ = request_builder()
// .delete(url)
// .header(HEADER_TOKEN, token)
// .protobuf(params)?
// .send()
// .await?;
Ok(())
}
@ -247,7 +247,7 @@ pub async fn create_app_request(
unimplemented!()
}
pub async fn read_app_request(_token: &str, _params: AppId, _url: &str) -> Result<Option<AppRevision>, ServerError> {
pub async fn read_app_request(_token: &str, _params: AppIdPB, _url: &str) -> Result<Option<AppRevision>, ServerError> {
// let app = request_builder()
// .get(&url.to_owned())
// .header(HEADER_TOKEN, token)
@ -259,23 +259,23 @@ pub async fn read_app_request(_token: &str, _params: AppId, _url: &str) -> Resul
unimplemented!()
}
pub async fn update_app_request(token: &str, params: UpdateAppParams, url: &str) -> Result<(), ServerError> {
let _ = request_builder()
.patch(&url.to_owned())
.header(HEADER_TOKEN, token)
.protobuf(params)?
.send()
.await?;
pub async fn update_app_request(_token: &str, _params: UpdateAppParams, _url: &str) -> Result<(), ServerError> {
// let _ = request_builder()
// .patch(&url.to_owned())
// .header(HEADER_TOKEN, token)
// .protobuf(params)?
// .send()
// .await?;
Ok(())
}
pub async fn delete_app_request(token: &str, params: AppId, url: &str) -> Result<(), ServerError> {
let _ = request_builder()
.delete(&url.to_owned())
.header(HEADER_TOKEN, token)
.protobuf(params)?
.send()
.await?;
pub async fn delete_app_request(_token: &str, _params: AppIdPB, _url: &str) -> Result<(), ServerError> {
// let _ = request_builder()
// .delete(&url.to_owned())
// .header(HEADER_TOKEN, token)
// .protobuf(params)?
// .send()
// .await?;
Ok(())
}
@ -295,7 +295,11 @@ pub async fn create_view_request(
unimplemented!()
}
pub async fn read_view_request(_token: &str, _params: ViewId, _url: &str) -> Result<Option<ViewRevision>, ServerError> {
pub async fn read_view_request(
_token: &str,
_params: ViewIdPB,
_url: &str,
) -> Result<Option<ViewRevision>, ServerError> {
// let view = request_builder()
// .get(&url.to_owned())
// .header(HEADER_TOKEN, token)
@ -307,43 +311,43 @@ pub async fn read_view_request(_token: &str, _params: ViewId, _url: &str) -> Res
unimplemented!()
}
pub async fn update_view_request(token: &str, params: UpdateViewParams, url: &str) -> Result<(), ServerError> {
let _ = request_builder()
.patch(&url.to_owned())
.header(HEADER_TOKEN, token)
.protobuf(params)?
.send()
.await?;
pub async fn update_view_request(_token: &str, _params: UpdateViewParams, _url: &str) -> Result<(), ServerError> {
// let _ = request_builder()
// .patch(&url.to_owned())
// .header(HEADER_TOKEN, token)
// .protobuf(params)?
// .send()
// .await?;
Ok(())
}
pub async fn delete_view_request(token: &str, params: RepeatedViewId, url: &str) -> Result<(), ServerError> {
let _ = request_builder()
.delete(&url.to_owned())
.header(HEADER_TOKEN, token)
.protobuf(params)?
.send()
.await?;
pub async fn delete_view_request(_token: &str, _params: RepeatedViewIdPB, _url: &str) -> Result<(), ServerError> {
// let _ = request_builder()
// .delete(&url.to_owned())
// .header(HEADER_TOKEN, token)
// .protobuf(params)?
// .send()
// .await?;
Ok(())
}
pub async fn create_trash_request(token: &str, params: RepeatedTrashId, url: &str) -> Result<(), ServerError> {
let _ = request_builder()
.post(&url.to_owned())
.header(HEADER_TOKEN, token)
.protobuf(params)?
.send()
.await?;
pub async fn create_trash_request(_token: &str, _params: RepeatedTrashIdPB, _url: &str) -> Result<(), ServerError> {
// let _ = request_builder()
// .post(&url.to_owned())
// .header(HEADER_TOKEN, token)
// .protobuf(params)?
// .send()
// .await?;
Ok(())
}
pub async fn delete_trash_request(token: &str, params: RepeatedTrashId, url: &str) -> Result<(), ServerError> {
let _ = request_builder()
.delete(&url.to_owned())
.header(HEADER_TOKEN, token)
.protobuf(params)?
.send()
.await?;
pub async fn delete_trash_request(_token: &str, _params: RepeatedTrashIdPB, _url: &str) -> Result<(), ServerError> {
// let _ = request_builder()
// .delete(&url.to_owned())
// .header(HEADER_TOKEN, token)
// .protobuf(params)?
// .send()
// .await?;
Ok(())
}

24
frontend/rust-lib/flowy-net/src/local_server/server.rs
View File

@ -253,10 +253,10 @@ impl RevisionUser for LocalRevisionUser {
}
use flowy_folder::entities::{
app::{AppId, CreateAppParams, UpdateAppParams},
trash::RepeatedTrashId,
view::{CreateViewParams, RepeatedViewId, UpdateViewParams, ViewId},
workspace::{CreateWorkspaceParams, UpdateWorkspaceParams, WorkspaceId},
app::{AppIdPB, CreateAppParams, UpdateAppParams},
trash::RepeatedTrashIdPB,
view::{CreateViewParams, RepeatedViewIdPB, UpdateViewParams, ViewIdPB},
workspace::{CreateWorkspaceParams, UpdateWorkspaceParams, WorkspaceIdPB},
};
use flowy_folder_data_model::revision::{
gen_app_id, gen_workspace_id, AppRevision, TrashRevision, ViewRevision, WorkspaceRevision,
@ -289,7 +289,7 @@ impl FolderCouldServiceV1 for LocalServer {
FutureResult::new(async { Ok(workspace) })
}
fn read_workspace(&self, _token: &str, _params: WorkspaceId) -> FutureResult<Vec<WorkspaceRevision>, FlowyError> {
fn read_workspace(&self, _token: &str, _params: WorkspaceIdPB) -> FutureResult<Vec<WorkspaceRevision>, FlowyError> {
FutureResult::new(async { Ok(vec![]) })
}
@ -297,7 +297,7 @@ impl FolderCouldServiceV1 for LocalServer {
FutureResult::new(async { Ok(()) })
}
fn delete_workspace(&self, _token: &str, _params: WorkspaceId) -> FutureResult<(), FlowyError> {
fn delete_workspace(&self, _token: &str, _params: WorkspaceIdPB) -> FutureResult<(), FlowyError> {
FutureResult::new(async { Ok(()) })
}
@ -320,11 +320,11 @@ impl FolderCouldServiceV1 for LocalServer {
FutureResult::new(async { Ok(view) })
}
fn read_view(&self, _token: &str, _params: ViewId) -> FutureResult<Option<ViewRevision>, FlowyError> {
fn read_view(&self, _token: &str, _params: ViewIdPB) -> FutureResult<Option<ViewRevision>, FlowyError> {
FutureResult::new(async { Ok(None) })
}
fn delete_view(&self, _token: &str, _params: RepeatedViewId) -> FutureResult<(), FlowyError> {
fn delete_view(&self, _token: &str, _params: RepeatedViewIdPB) -> FutureResult<(), FlowyError> {
FutureResult::new(async { Ok(()) })
}
@ -347,7 +347,7 @@ impl FolderCouldServiceV1 for LocalServer {
FutureResult::new(async { Ok(app) })
}
fn read_app(&self, _token: &str, _params: AppId) -> FutureResult<Option<AppRevision>, FlowyError> {
fn read_app(&self, _token: &str, _params: AppIdPB) -> FutureResult<Option<AppRevision>, FlowyError> {
FutureResult::new(async { Ok(None) })
}
@ -355,15 +355,15 @@ impl FolderCouldServiceV1 for LocalServer {
FutureResult::new(async { Ok(()) })
}
fn delete_app(&self, _token: &str, _params: AppId) -> FutureResult<(), FlowyError> {
fn delete_app(&self, _token: &str, _params: AppIdPB) -> FutureResult<(), FlowyError> {
FutureResult::new(async { Ok(()) })
}
fn create_trash(&self, _token: &str, _params: RepeatedTrashId) -> FutureResult<(), FlowyError> {
fn create_trash(&self, _token: &str, _params: RepeatedTrashIdPB) -> FutureResult<(), FlowyError> {
FutureResult::new(async { Ok(()) })
}
fn delete_trash(&self, _token: &str, _params: RepeatedTrashId) -> FutureResult<(), FlowyError> {
fn delete_trash(&self, _token: &str, _params: RepeatedTrashIdPB) -> FutureResult<(), FlowyError> {
FutureResult::new(async { Ok(()) })
}