From fd2115f54feda5e08bf15296399575fc81a1168f Mon Sep 17 00:00:00 2001 From: Zack Fu Zi Xiang Date: Thu, 9 May 2024 11:01:16 +0800 Subject: [PATCH] feat: add post method for batch get collab --- libs/client-api/src/http.rs | 4 ++-- src/api/workspace.rs | 31 +++++-------------------------- 2 files changed, 7 insertions(+), 28 deletions(-) diff --git a/libs/client-api/src/http.rs b/libs/client-api/src/http.rs index 357329e6..78587f35 100644 --- a/libs/client-api/src/http.rs +++ b/libs/client-api/src/http.rs @@ -970,14 +970,14 @@ impl Client { params: Vec, ) -> Result { let url = format!( - "{}/api/workspace/v1/{}/collab_list", + "{}/api/workspace/{}/collab_list", self.base_url, workspace_id ); let params = BatchQueryCollabParams(params); let resp = self .http_client_with_auth(Method::GET, &url) .await? - .query(¶ms) + .json(¶ms) .send() .await?; log_request_id(&resp); diff --git a/src/api/workspace.rs b/src/api/workspace.rs index fe326c64..2528d274 100644 --- a/src/api/workspace.rs +++ b/src/api/workspace.rs @@ -7,7 +7,7 @@ use crate::biz::user::auth::jwt::UserUuid; use crate::biz::workspace; use crate::domain::compression::{decompress, CompressionType, X_COMPRESSION_TYPE}; use crate::state::AppState; -use actix_web::web::{Bytes, Payload, Query}; +use actix_web::web::{Bytes, Payload}; use actix_web::web::{Data, Json, PayloadConfig}; use actix_web::{web, Scope}; use actix_web::{HttpRequest, Result}; @@ -126,11 +126,11 @@ pub fn workspace_scope() -> Scope { web::resource("/{workspace_id}/collab/{object_id}/member/list") .route(web::get().to(get_collab_member_list_handler)), ) - .service( // Deprecated - web::resource("/{workspace_id}/collab_list").route(web::get().to(batch_get_collab_handler)), - ) .service( - web::resource("/v1/{workspace_id}/collab_list").route(web::get().to(v1_batch_get_collab_handler)), + web::resource("/{workspace_id}/collab_list") + .route(web::get().to(batch_get_collab_handler)) // deprecated: browser cannot use json param + // for GET request + .route(web::post().to(batch_get_collab_handler)), ) .service( web::resource("/{workspace_id}/summarize_row").route(web::post().to(summary_row_handler)), @@ -749,7 +749,6 @@ async fn get_all_collab_snapshot_list_handler( Ok(Json(AppResponse::Ok().with_data(data))) } -// Deprecated #[instrument(level = "debug", skip(payload, state), err)] async fn batch_get_collab_handler( user_uuid: UserUuid, @@ -770,26 +769,6 @@ async fn batch_get_collab_handler( Ok(Json(AppResponse::Ok().with_data(result))) } -#[instrument(level = "debug", skip(payload, state), err)] -async fn v1_batch_get_collab_handler( - user_uuid: UserUuid, - state: Data, - payload: Query, -) -> Result>> { - let uid = state - .user_cache - .get_user_uid(&user_uuid) - .await - .map_err(AppResponseError::from)?; - let result = BatchQueryCollabResult( - state - .collab_access_control_storage - .batch_get_collab(&uid, payload.into_inner().0) - .await, - ); - Ok(Json(AppResponse::Ok().with_data(result))) -} - #[instrument(skip(state, payload), err)] async fn update_collab_handler( user_uuid: UserUuid,