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 struct property

Browse Source
This commit is contained in:
appflowy
2022-02-24 21:49:18 +08:00
parent 93695dc4be
commit ed9a48fc1c
65 changed files with 965 additions and 1512 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend/rust-lib/flowy-folder/tests/workspace/folder_test.rs
View File

@ -1,6 +1,6 @@
use crate::script::{invalid_workspace_name_test_case, FolderScript::*, FolderTest};
use flowy_collaboration::{client_document::default::initial_delta_string, entities::revision::RevisionState};
use flowy_folder::entities::workspace::CreateWorkspaceRequest;
use flowy_folder::entities::workspace::CreateWorkspacePayload;
use flowy_test::{event_builder::*, FlowySDKTest};
#[tokio::test]
@ -64,14 +64,14 @@ async fn workspace_create_with_apps() {
async fn workspace_create_with_invalid_name() {
for (name, code) in invalid_workspace_name_test_case() {
let sdk = FlowySDKTest::default();
let request = CreateWorkspaceRequest {
let request = CreateWorkspacePayload {
name,
desc: "".to_owned(),
};
assert_eq!(
FolderEventBuilder::new(sdk)
.event(flowy_folder::event_map::FolderEvent::CreateWorkspace)
.request(request)
.payload(request)
.async_send()
.await
.error()

61
frontend/rust-lib/flowy-folder/tests/workspace/helper.rs
View File

@ -1,23 +1,24 @@
use flowy_collaboration::entities::document_info::DocumentInfo;
use flowy_folder::event_map::FolderEvent::*;
use flowy_folder_data_model::entities::view::{RepeatedViewId, ViewId};
use flowy_folder_data_model::entities::workspace::WorkspaceId;
use flowy_folder_data_model::entities::{
app::{App, AppId, CreateAppRequest, QueryAppRequest, UpdateAppRequest},
app::{App, AppId, CreateAppPayload, UpdateAppPayload},
trash::{RepeatedTrash, TrashId, TrashType},
view::{CreateViewRequest, UpdateViewRequest, View, ViewType},
workspace::{CreateWorkspaceRequest, QueryWorkspaceRequest, RepeatedWorkspace, Workspace},
view::{CreateViewPayload, UpdateViewPayload, View, ViewType},
workspace::{CreateWorkspacePayload, RepeatedWorkspace, Workspace},
};
use flowy_test::{event_builder::*, FlowySDKTest};
pub async fn create_workspace(sdk: &FlowySDKTest, name: &str, desc: &str) -> Workspace {
let request = CreateWorkspaceRequest {
let request = CreateWorkspacePayload {
name: name.to_owned(),
desc: desc.to_owned(),
};
let workspace = FolderEventBuilder::new(sdk.clone())
.event(CreateWorkspace)
.request(request)
.payload(request)
.async_send()
.await
.parse::<Workspace>();
@ -25,16 +26,16 @@ pub async fn create_workspace(sdk: &FlowySDKTest, name: &str, desc: &str) -> Wor
}
pub async fn read_workspace(sdk: &FlowySDKTest, workspace_id: Option<String>) -> Vec<Workspace> {
let request = QueryWorkspaceRequest { workspace_id };
let request = WorkspaceId { value: workspace_id };
let repeated_workspace = FolderEventBuilder::new(sdk.clone())
.event(ReadWorkspaces)
.request(request.clone())
.payload(request.clone())
.async_send()
.await
.parse::<RepeatedWorkspace>();
let workspaces;
if let Some(workspace_id) = &request.workspace_id {
if let Some(workspace_id) = &request.value {
workspaces = repeated_workspace
.into_inner()
.into_iter()
@ -49,7 +50,7 @@ pub async fn read_workspace(sdk: &FlowySDKTest, workspace_id: Option<String>) ->
}
pub async fn create_app(sdk: &FlowySDKTest, workspace_id: &str, name: &str, desc: &str) -> App {
let create_app_request = CreateAppRequest {
let create_app_request = CreateAppPayload {
workspace_id: workspace_id.to_owned(),
name: name.to_string(),
desc: desc.to_string(),
@ -58,7 +59,7 @@ pub async fn create_app(sdk: &FlowySDKTest, workspace_id: &str, name: &str, desc
let app = FolderEventBuilder::new(sdk.clone())
.event(CreateApp)
.request(create_app_request)
.payload(create_app_request)
.async_send()
.await
.parse::<App>();
@ -66,13 +67,13 @@ pub async fn create_app(sdk: &FlowySDKTest, workspace_id: &str, name: &str, desc
}
pub async fn read_app(sdk: &FlowySDKTest, app_id: &str) -> App {
let request = QueryAppRequest {
app_ids: vec![app_id.to_owned()],
let request = AppId {
value: app_id.to_owned(),
};
let app = FolderEventBuilder::new(sdk.clone())
.event(ReadApp)
.request(request)
.payload(request)
.async_send()
.await
.parse::<App>();
@ -81,7 +82,7 @@ pub async fn read_app(sdk: &FlowySDKTest, app_id: &str) -> App {
}
pub async fn update_app(sdk: &FlowySDKTest, app_id: &str, name: Option<String>, desc: Option<String>) {
let request = UpdateAppRequest {
let request = UpdateAppPayload {
app_id: app_id.to_string(),
name,
desc,
@ -91,25 +92,25 @@ pub async fn update_app(sdk: &FlowySDKTest, app_id: &str, name: Option<String>,
FolderEventBuilder::new(sdk.clone())
.event(UpdateApp)
.request(request)
.payload(request)
.async_send()
.await;
}
pub async fn delete_app(sdk: &FlowySDKTest, app_id: &str) {
let request = AppId {
app_id: app_id.to_string(),
value: app_id.to_string(),
};
FolderEventBuilder::new(sdk.clone())
.event(DeleteApp)
.request(request)
.payload(request)
.async_send()
.await;
}
pub async fn create_view(sdk: &FlowySDKTest, app_id: &str, name: &str, desc: &str, view_type: ViewType) -> View {
let request = CreateViewRequest {
let request = CreateViewPayload {
belong_to_id: app_id.to_string(),
name: name.to_string(),
desc: desc.to_string(),
@ -118,7 +119,7 @@ pub async fn create_view(sdk: &FlowySDKTest, app_id: &str, name: &str, desc: &st
};
let view = FolderEventBuilder::new(sdk.clone())
.event(CreateView)
.request(request)
.payload(request)
.async_send()
.await
.parse::<View>();
@ -126,19 +127,17 @@ pub async fn create_view(sdk: &FlowySDKTest, app_id: &str, name: &str, desc: &st
}
pub async fn read_view(sdk: &FlowySDKTest, view_id: &str) -> View {
let request = ViewId {
view_id: view_id.to_string(),
};
let view_id: ViewId = view_id.into();
FolderEventBuilder::new(sdk.clone())
.event(ReadView)
.request(request)
.payload(view_id)
.async_send()
.await
.parse::<View>()
}
pub async fn update_view(sdk: &FlowySDKTest, view_id: &str, name: Option<String>, desc: Option<String>) {
let request = UpdateViewRequest {
let request = UpdateViewPayload {
view_id: view_id.to_string(),
name,
desc,
@ -146,7 +145,7 @@ pub async fn update_view(sdk: &FlowySDKTest, view_id: &str, name: Option<String>
};
FolderEventBuilder::new(sdk.clone())
.event(UpdateView)
.request(request)
.payload(request)
.async_send()
.await;
}
@ -155,18 +154,16 @@ pub async fn delete_view(sdk: &FlowySDKTest, view_ids: Vec<String>) {
let request = RepeatedViewId { items: view_ids };
FolderEventBuilder::new(sdk.clone())
.event(DeleteView)
.request(request)
.payload(request)
.async_send()
.await;
}
pub async fn open_document(sdk: &FlowySDKTest, view_id: &str) -> DocumentInfo {
let request = ViewId {
view_id: view_id.to_string(),
};
let view_id: ViewId = view_id.into();
FolderEventBuilder::new(sdk.clone())
.event(OpenView)
.request(request)
.payload(view_id)
.async_send()
.await
.parse::<DocumentInfo>()
@ -187,7 +184,7 @@ pub async fn restore_app_from_trash(sdk: &FlowySDKTest, app_id: &str) {
};
FolderEventBuilder::new(sdk.clone())
.event(PutbackTrash)
.request(id)
.payload(id)
.async_send()
.await;
}
@ -199,7 +196,7 @@ pub async fn restore_view_from_trash(sdk: &FlowySDKTest, view_id: &str) {
};
FolderEventBuilder::new(sdk.clone())
.event(PutbackTrash)
.request(id)
.payload(id)
.async_send()
.await;
}