From 17a965a30be17926f2d7f1269ac669f9b48dcf4c Mon Sep 17 00:00:00 2001 From: Zack Fu Zi Xiang Date: Mon, 4 Mar 2024 09:11:44 +0800 Subject: [PATCH] chore: remove commented blocks --- libs/client-api-test-util/src/test_client.rs | 10 ++-------- libs/client-api/src/http.rs | 2 +- libs/database/src/pg_row.rs | 11 ----------- 3 files changed, 3 insertions(+), 20 deletions(-) diff --git a/libs/client-api-test-util/src/test_client.rs b/libs/client-api-test-util/src/test_client.rs index 258179a4..98ad380f 100644 --- a/libs/client-api-test-util/src/test_client.rs +++ b/libs/client-api-test-util/src/test_client.rs @@ -22,8 +22,7 @@ use database_entity::dto::{ use mime::Mime; use serde_json::Value; use shared_entity::dto::workspace_dto::{ - BlobMetadata, CreateWorkspaceMember, WorkspaceMemberChangeset, WorkspaceMemberInvitation, - WorkspaceSpaceUsage, + BlobMetadata, WorkspaceMemberChangeset, WorkspaceMemberInvitation, WorkspaceSpaceUsage, }; use shared_entity::response::AppResponseError; use std::collections::HashMap; @@ -182,11 +181,6 @@ impl TestClient { ) -> Result<(), AppResponseError> { let email = other_client.email().await; - // self - // .api_client - // .add_workspace_members(workspace_id, vec![CreateWorkspaceMember { email, role }]) - // .await - self .api_client .invite_workspace_members( @@ -208,7 +202,7 @@ impl TestClient { other_client .api_client - .accept_workspace_invitation(&target_invitation.invite_id.to_string().as_str()) + .accept_workspace_invitation(target_invitation.invite_id.to_string().as_str()) .await } diff --git a/libs/client-api/src/http.rs b/libs/client-api/src/http.rs index 91f6efbb..1cbedccd 100644 --- a/libs/client-api/src/http.rs +++ b/libs/client-api/src/http.rs @@ -634,7 +634,7 @@ impl Client { let resp = builder.send().await?; log_request_id(&resp); let res = AppResponse::>::from_response(resp).await?; - Ok(res.into_data()?) + res.into_data() } pub async fn accept_workspace_invitation( diff --git a/libs/database/src/pg_row.rs b/libs/database/src/pg_row.rs index 1b4b54ed..9d893584 100644 --- a/libs/database/src/pg_row.rs +++ b/libs/database/src/pg_row.rs @@ -175,17 +175,6 @@ pub struct AFSnapshotRow { pub workspace_id: Uuid, } -// #[derive(FromRow, Deserialize, Serialize)] -// pub struct AFWorkspaceInvitation { -// pub invite_id: Uuid, -// pub workspace_id: Uuid, -// pub workspace_name: Option, -// pub inviter_email: Option, -// pub inviter_name: Option, -// pub status: AFWorkspaceInvitationStatus, -// pub updated_at: DateTime, -// } - #[derive(FromRow, Deserialize, Serialize)] pub struct AFWorkspaceInvitationMinimal { pub workspace_id: Uuid,