From b26276cfda47c883abe5e01b1d62c6f28dbc58dd Mon Sep 17 00:00:00 2001 From: Michael Chung Date: Wed, 6 Dec 2023 23:36:20 -0500 Subject: [PATCH] done now for code --- crates/service/web/storyteller_web/src/api_doc.rs | 5 ++++- .../src/http_server/common_responses/user_details_lite.rs | 8 +++++--- .../endpoints/weights/list_available_weights.rs | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/crates/service/web/storyteller_web/src/api_doc.rs b/crates/service/web/storyteller_web/src/api_doc.rs index 178e8871ae..1d96b220e0 100644 --- a/crates/service/web/storyteller_web/src/api_doc.rs +++ b/crates/service/web/storyteller_web/src/api_doc.rs @@ -6,6 +6,8 @@ use crate::http_server::web_utils::response_success_helpers::*; use crate::http_server::endpoints::weights::delete_weight::*; use crate::http_server::endpoints::weights::get_weight::*; use crate::http_server::endpoints::weights::update_weight::*; +use crate::http_server::endpoints::weights::list_weights_by_user::*; +use crate::http_server::common_responses::user_details_lite::{DefaultAvatarInfo, UserDetailsLight}; use enums::by_table::model_weights::{ weights_types::WeightsType, weights_category::WeightsCategory, @@ -40,7 +42,8 @@ use utoipa::OpenApi; DeleteWeightPathInfo,DeleteWeightRequest,DeleteWeightError,DeleteWeightRequest,DeleteWeightError, ListWeightError,ModelWeightForList,ListWeightError, ListAvailableWeightsQuery,ListAvailableWeightsSuccessResponse,ModelWeightForList, - ListWeightsByUserError,ListWeightsByUserSuccessResponse,ListWeightsByUserPathInfo,Weight + ListWeightsByUserError,ListWeightsByUserSuccessResponse,ListWeightsByUserPathInfo,Weight, + UserDetailsLight,DefaultAvatarInfo )))] pub struct ApiDoc; diff --git a/crates/service/web/storyteller_web/src/http_server/common_responses/user_details_lite.rs b/crates/service/web/storyteller_web/src/http_server/common_responses/user_details_lite.rs index d1353f60f7..c325ce0585 100644 --- a/crates/service/web/storyteller_web/src/http_server/common_responses/user_details_lite.rs +++ b/crates/service/web/storyteller_web/src/http_server/common_responses/user_details_lite.rs @@ -2,9 +2,9 @@ use tokens::tokens::users::UserToken; use crate::user_avatars::default_avatar_color_from_username::default_avatar_color_from_username; use crate::user_avatars::default_avatar_from_username::default_avatar_from_username; - +use utoipa::ToSchema; /// Everything we need to refer to a user on the public web interface. -#[derive(Clone, Serialize)] +#[derive(Clone, Serialize,ToSchema)] pub struct UserDetailsLight { /// The token for the user pub user_token: UserToken, @@ -82,7 +82,9 @@ impl UserDetailsLight { } } -#[derive(Clone, Serialize)] + + +#[derive(Clone, Serialize,ToSchema)] pub struct DefaultAvatarInfo { pub image_index: u8, pub color_index: u8, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights.rs index c41e38de99..7886625891 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/list_available_weights.rs @@ -17,7 +17,7 @@ use enums::by_table::model_weights::{ use tokens::tokens::users::UserToken; use tokens::tokens::model_weights::ModelWeightToken; -use crate::http_server::common_responses::user_details_lite::UserDetailsLight; +use crate::http_server::common_responses::user_details_lite::{UserDetailsLight,DefaultAvatarInfo}; use crate::server_state::ServerState; use utoipa::ToSchema;