From baffa751d630dfa2c3dab0c882b95616f1ebb5f0 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 11 Jul 2021 16:19:33 -0400 Subject: [PATCH] visibility enums --- src/database/enums/record_visibility.rs | 9 ++++----- src/http_server/endpoints/users/get_profile.rs | 11 +++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/src/database/enums/record_visibility.rs b/src/database/enums/record_visibility.rs index f9f51d8f16..d589f4cfe5 100644 --- a/src/database/enums/record_visibility.rs +++ b/src/database/enums/record_visibility.rs @@ -1,15 +1,14 @@ //! These are columns where users can control the visibility of their data. -//#[sqlx(rename_all = "lowercase", rename = "preferred_tts_result_visibility")] - +/// To use this in a query, the query must have type annotations. +/// See: https://www.gitmemory.com/issue/launchbadge/sqlx/1241/847154375 +/// eg. preferred_tts_result_visibility as `preferred_tts_result_visibility: crate::database::enums::record_visibility::RecordVisibility` #[derive(Clone, Copy, PartialEq, Eq, Debug, Serialize, Deserialize, sqlx::Type)] +#[serde(rename_all = "lowercase")] #[sqlx(rename_all = "lowercase")] pub enum RecordVisibility { - #[sqlx(rename = "public")] Public, - #[sqlx(rename = "hidden")] Hidden, - #[sqlx(rename = "private")] Private, } diff --git a/src/http_server/endpoints/users/get_profile.rs b/src/http_server/endpoints/users/get_profile.rs index ea1f17e527..ac5bc31dbe 100644 --- a/src/http_server/endpoints/users/get_profile.rs +++ b/src/http_server/endpoints/users/get_profile.rs @@ -51,8 +51,7 @@ pub struct UserProfileRecordForResponse { pub is_banned: bool, pub disable_gravatar: bool, pub preferred_tts_result_visibility: RecordVisibility, - //pub preferred_tts_result_visibility: String, - //pub preferred_w2l_result_visibility: RecordVisibility, + pub preferred_w2l_result_visibility: RecordVisibility, pub discord_username: Option, pub twitch_username: Option, pub twitter_username: Option, @@ -82,8 +81,7 @@ pub struct RawUserProfileRecord { pub is_banned: i8, pub disable_gravatar: i8, pub preferred_tts_result_visibility: RecordVisibility, - //pub preferred_tts_result_visibility: String, - //pub preferred_w2l_result_visibility: RecordVisibility, + pub preferred_w2l_result_visibility: RecordVisibility, pub discord_username: Option, pub twitch_username: Option, pub twitter_username: Option, @@ -145,6 +143,7 @@ SELECT is_banned, disable_gravatar, preferred_tts_result_visibility as `preferred_tts_result_visibility: crate::database::enums::record_visibility::RecordVisibility`, + preferred_w2l_result_visibility as `preferred_w2l_result_visibility: crate::database::enums::record_visibility::RecordVisibility`, discord_username, twitch_username, twitter_username, @@ -197,8 +196,8 @@ WHERE user_role_slug: profile_record.user_role_slug.clone(), is_banned: i8_to_bool(profile_record.is_banned), disable_gravatar: i8_to_bool(profile_record.disable_gravatar), - preferred_tts_result_visibility: profile_record.preferred_tts_result_visibility.clone(), - //preferred_w2l_result_visibility: profile_record.preferred_w2l_result_visibility, + preferred_tts_result_visibility: profile_record.preferred_tts_result_visibility, + preferred_w2l_result_visibility: profile_record.preferred_w2l_result_visibility, discord_username: profile_record.discord_username.clone(), twitch_username: profile_record.twitch_username.clone(), twitter_username: profile_record.twitter_username.clone(),