refactor query modules

crates/lib/mysql_queries/src/queries/mod.rs

@@ -18,7 +18,6 @@ pub mod stats;
 pub mod trending_model_analytics;
 pub mod tts;
 pub mod twitch;
-pub mod user_bookmarks;
 pub mod users;
 pub mod vocoder;
 pub mod voice_clone_requests;

crates/lib/mysql_queries/src/queries/users/mod.rs

@@ -1,5 +1,6 @@
 pub mod user;
 pub mod user_badges;
+pub mod user_bookmarks;
 pub mod user_password_resets;
 pub mod user_profiles;
 pub mod user_ratings;

crates/lib/mysql_queries/src/queries/users/user_bookmarks/get_total_bookmark_count_for_entity.rs

@@ -1,11 +1,11 @@
 use anyhow::anyhow;
 use log::warn;
-use sqlx::{MySql};
+use sqlx::MySql;
 use sqlx::pool::PoolConnection;
 
 use errors::AnyhowResult;
 
-use crate::queries::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
+use crate::queries::users::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
 
 pub struct BookmarkCount {
   pub total_count: usize,

crates/lib/mysql_queries/src/queries/users/user_bookmarks/get_user_bookmark_transactional_locking.rs

@@ -7,7 +7,7 @@ use errors::AnyhowResult;
 use tokens::tokens::user_bookmarks::UserBookmarkToken;
 use tokens::tokens::users::UserToken;
 
-use crate::queries::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
+use crate::queries::users::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
 
 pub struct UserBookmark {
   pub token: UserBookmarkToken,

crates/lib/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks.rs

@@ -6,8 +6,8 @@ use enums::by_table::model_weights::weights_types::WeightsType;
 use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
 use errors::AnyhowResult;
 
-use crate::queries::user_bookmarks::list_user_bookmarks_result::RawUserBookmarkRecord;
-use crate::queries::user_bookmarks::list_user_bookmarks_result::UserBookmark;
+use crate::queries::users::user_bookmarks::list_user_bookmarks_result::RawUserBookmarkRecord;
+use crate::queries::users::user_bookmarks::list_user_bookmarks_result::UserBookmark;
 
 pub struct UserBookmarkListPage {
   pub results: Vec<UserBookmark>,

crates/lib/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks_for_entity.rs

@@ -7,7 +7,7 @@ use errors::AnyhowResult;
 use tokens::tokens::user_bookmarks::UserBookmarkToken;
 use tokens::tokens::users::UserToken;
 
-use crate::queries::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
+use crate::queries::users::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
 
 pub struct UserBookmark {
   pub token: UserBookmarkToken,

crates/lib/mysql_queries/src/queries/users/user_bookmarks/list_user_bookmarks_result.rs

@@ -70,56 +70,56 @@ pub struct UserBookmark {
 }
 
 pub struct RawUserBookmarkRecord {
-  pub (crate) token: UserBookmarkToken,
+  pub(crate) token: UserBookmarkToken,
 
-  pub (crate) entity_type: UserBookmarkEntityType,
-  pub (crate) entity_token: String,
+  pub(crate) entity_type: UserBookmarkEntityType,
+  pub(crate) entity_token: String,
 
   // TODO(bt,2023-12-30): I don't think these user fields are necessary.
   //  We already know the user we're querying on behalf of, so presumably we
   //  already have their info (ie. profile page use).
-  pub (crate) user_token: UserToken,
-  pub (crate) username: String,
-  pub (crate) user_display_name: String,
-  pub (crate) user_gravatar_hash: String,
+  pub(crate) user_token: UserToken,
+  pub(crate) username: String,
+  pub(crate) user_display_name: String,
+  pub(crate) user_gravatar_hash: String,
 
-  pub (crate) created_at: DateTime<Utc>,
-  pub (crate) updated_at: DateTime<Utc>,
-  pub (crate) deleted_at: Option<DateTime<Utc>>,
+  pub(crate) created_at: DateTime<Utc>,
+  pub(crate) updated_at: DateTime<Utc>,
+  pub(crate) deleted_at: Option<DateTime<Utc>>,
 
-  pub (crate) maybe_ratings_positive_count: Option<u32>,
-  pub (crate) maybe_ratings_negative_count: Option<u32>,
-  pub (crate) maybe_bookmark_count: Option<u32>,
+  pub(crate) maybe_ratings_positive_count: Option<u32>,
+  pub(crate) maybe_ratings_negative_count: Option<u32>,
+  pub(crate) maybe_bookmark_count: Option<u32>,
 
-  pub (crate) maybe_media_file_type: Option<MediaFileType>,
-  pub (crate) maybe_media_file_origin_category: Option<MediaFileOriginCategory>,
-  pub (crate) maybe_media_file_public_bucket_hash: Option<String>,
-  pub (crate) maybe_media_file_public_bucket_prefix: Option<String>,
-  pub (crate) maybe_media_file_public_bucket_extension: Option<String>,
+  pub(crate) maybe_media_file_type: Option<MediaFileType>,
+  pub(crate) maybe_media_file_origin_category: Option<MediaFileOriginCategory>,
+  pub(crate) maybe_media_file_public_bucket_hash: Option<String>,
+  pub(crate) maybe_media_file_public_bucket_prefix: Option<String>,
+  pub(crate) maybe_media_file_public_bucket_extension: Option<String>,
 
-  pub (crate) maybe_media_file_creator_user_token: Option<UserToken>,
-  pub (crate) maybe_media_file_creator_username: Option<String>,
-  pub (crate) maybe_media_file_creator_display_name: Option<String>,
-  pub (crate) maybe_media_file_creator_gravatar_hash: Option<String>,
+  pub(crate) maybe_media_file_creator_user_token: Option<UserToken>,
+  pub(crate) maybe_media_file_creator_username: Option<String>,
+  pub(crate) maybe_media_file_creator_display_name: Option<String>,
+  pub(crate) maybe_media_file_creator_gravatar_hash: Option<String>,
 
-  pub (crate) maybe_model_weight_type: Option<WeightsType>,
-  pub (crate) maybe_model_weight_category: Option<WeightsCategory>,
+  pub(crate) maybe_model_weight_type: Option<WeightsType>,
+  pub(crate) maybe_model_weight_category: Option<WeightsCategory>,
 
-  pub (crate) maybe_model_weight_cover_image_public_bucket_hash: Option<String>,
-  pub (crate) maybe_model_weight_cover_image_public_bucket_prefix: Option<String>,
-  pub (crate) maybe_model_weight_cover_image_public_bucket_extension: Option<String>,
+  pub(crate) maybe_model_weight_cover_image_public_bucket_hash: Option<String>,
+  pub(crate) maybe_model_weight_cover_image_public_bucket_prefix: Option<String>,
+  pub(crate) maybe_model_weight_cover_image_public_bucket_extension: Option<String>,
 
-  pub (crate) maybe_model_weight_creator_user_token: Option<UserToken>,
-  pub (crate) maybe_model_weight_creator_username: Option<String>,
-  pub (crate) maybe_model_weight_creator_display_name: Option<String>,
-  pub (crate) maybe_model_weight_creator_gravatar_hash: Option<String>,
+  pub(crate) maybe_model_weight_creator_user_token: Option<UserToken>,
+  pub(crate) maybe_model_weight_creator_username: Option<String>,
+  pub(crate) maybe_model_weight_creator_display_name: Option<String>,
+  pub(crate) maybe_model_weight_creator_gravatar_hash: Option<String>,
 
-  pub (crate) maybe_descriptive_text_model_weight_title: Option<String>,
-  pub (crate) maybe_descriptive_text_tts_model_title: Option<String>,
-  pub (crate) maybe_descriptive_text_tts_result_inference_text: Option<String>,
-  pub (crate) maybe_descriptive_text_user_display_name: Option<String>,
-  pub (crate) maybe_descriptive_text_voice_conversion_model_title: Option<String>,
-  pub (crate) maybe_descriptive_text_zs_voice_title: Option<String>,
+  pub(crate) maybe_descriptive_text_model_weight_title: Option<String>,
+  pub(crate) maybe_descriptive_text_tts_model_title: Option<String>,
+  pub(crate) maybe_descriptive_text_tts_result_inference_text: Option<String>,
+  pub(crate) maybe_descriptive_text_user_display_name: Option<String>,
+  pub(crate) maybe_descriptive_text_voice_conversion_model_title: Option<String>,
+  pub(crate) maybe_descriptive_text_zs_voice_title: Option<String>,
 }
 
 impl RawUserBookmarkRecord {

crates/lib/mysql_queries/src/queries/users/user_bookmarks/upsert_user_bookmark.rs

@@ -7,7 +7,7 @@ use errors::AnyhowResult;
 use tokens::tokens::user_bookmarks::UserBookmarkToken;
 use tokens::tokens::users::UserToken;
 
-use crate::queries::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
+use crate::queries::users::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
 
 pub struct CreateUserBookmarkArgs<'e, 'c, E>
   where E: 'e + Executor<'c, Database = MySql>

crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/batch_get_user_bookmarks_handler.rs

@@ -9,7 +9,7 @@ use utoipa::{IntoParams, ToSchema};
 
 use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
 use http_server_common::response::serialize_as_json_error::serialize_as_json_error;
-use mysql_queries::queries::user_bookmarks::batch_get_user_bookmarks::{batch_get_user_bookmarks, BatchUserBookmark};
+use mysql_queries::queries::users::user_bookmarks::batch_get_user_bookmarks::{batch_get_user_bookmarks, BatchUserBookmark};
 use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::model_weights::ModelWeightToken;
 use tokens::tokens::tts_models::TtsModelToken;

crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/create_user_bookmark_handler.rs

@@ -16,10 +16,10 @@ use utoipa::ToSchema;
 use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
 use mysql_queries::queries::entity_stats::stats_entity_token::StatsEntityToken;
 use mysql_queries::queries::entity_stats::upsert_entity_stats_on_bookmark_event::{BookmarkAction, upsert_entity_stats_on_bookmark_event, UpsertEntityStatsArgs};
-use mysql_queries::queries::user_bookmarks::upsert_user_bookmark::{upsert_user_bookmark, CreateUserBookmarkArgs};
-use mysql_queries::queries::user_bookmarks::get_total_bookmark_count_for_entity::get_total_bookmark_count_for_entity;
-use mysql_queries::queries::user_bookmarks::get_user_bookmark_transactional_locking::{BookmarkIdentifier, get_user_bookmark_transactional_locking};
-use mysql_queries::queries::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
+use mysql_queries::queries::users::user_bookmarks::upsert_user_bookmark::{upsert_user_bookmark, CreateUserBookmarkArgs};
+use mysql_queries::queries::users::user_bookmarks::get_total_bookmark_count_for_entity::get_total_bookmark_count_for_entity;
+use mysql_queries::queries::users::user_bookmarks::get_user_bookmark_transactional_locking::{BookmarkIdentifier, get_user_bookmark_transactional_locking};
+use mysql_queries::queries::users::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
 use tokens::tokens::media_files::MediaFileToken;
 use tokens::tokens::model_weights::ModelWeightToken;
 use tokens::tokens::tts_models::TtsModelToken;

crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/delete_user_bookmark_handler.rs

@@ -16,8 +16,8 @@ use utoipa::ToSchema;
 
 use mysql_queries::queries::entity_stats::stats_entity_token::StatsEntityToken;
 use mysql_queries::queries::entity_stats::upsert_entity_stats_on_bookmark_event::{BookmarkAction, upsert_entity_stats_on_bookmark_event, UpsertEntityStatsArgs};
-use mysql_queries::queries::user_bookmarks::delete_user_bookmark::delete_user_bookmark;
-use mysql_queries::queries::user_bookmarks::get_user_bookmark_transactional_locking::{BookmarkIdentifier, get_user_bookmark_transactional_locking};
+use mysql_queries::queries::users::user_bookmarks::delete_user_bookmark::delete_user_bookmark;
+use mysql_queries::queries::users::user_bookmarks::get_user_bookmark_transactional_locking::{BookmarkIdentifier, get_user_bookmark_transactional_locking};
 use tokens::tokens::user_bookmarks::UserBookmarkToken;
 
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;

crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_entity_handler.rs

@@ -15,8 +15,8 @@ use log::warn;
 use utoipa::ToSchema;
 
 use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
-use mysql_queries::queries::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
-use mysql_queries::queries::user_bookmarks::list_user_bookmarks_for_entity::list_user_bookmarks_for_entity;
+use mysql_queries::queries::users::user_bookmarks::user_bookmark_entity_token::UserBookmarkEntityToken;
+use mysql_queries::queries::users::user_bookmarks::list_user_bookmarks_for_entity::list_user_bookmarks_for_entity;
 use tokens::tokens::user_bookmarks::UserBookmarkToken;
 
 use crate::http_server::common_responses::user_details_lite::{DefaultAvatarInfo, UserDetailsLight};

crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_session_handler.rs

@@ -10,7 +10,7 @@ use chrono::{DateTime, Utc};
 use log::warn;
 
 use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
-use mysql_queries::queries::user_bookmarks::list_user_bookmarks::{ list_user_bookmarks_by_maybe_entity_type};
+use mysql_queries::queries::users::user_bookmarks::list_user_bookmarks::{ list_user_bookmarks_by_maybe_entity_type};
 use tokens::tokens::user_bookmarks::UserBookmarkToken;
 
 use crate::http_server::web_utils::response_error_helpers::to_simple_json_error;

crates/service/web/storyteller_web/src/http_server/endpoints/user_bookmarks/list_user_bookmarks_for_user_handler.rs

@@ -19,7 +19,7 @@ use enums::by_table::media_files::media_file_type::MediaFileType;
 use enums::by_table::model_weights::weights_category::WeightsCategory;
 use enums::by_table::model_weights::weights_types::WeightsType;
 use enums::by_table::user_bookmarks::user_bookmark_entity_type::UserBookmarkEntityType;
-use mysql_queries::queries::user_bookmarks::list_user_bookmarks::{list_user_bookmarks_by_maybe_entity_type, ListUserBookmarksForUserArgs};
+use mysql_queries::queries::users::user_bookmarks::list_user_bookmarks::{list_user_bookmarks_by_maybe_entity_type, ListUserBookmarksForUserArgs};
 use tokens::tokens::user_bookmarks::UserBookmarkToken;
 
 use crate::http_server::common_responses::pagination_page::PaginationPage;