diff --git a/crates/lib/database_queries/src/lib.rs b/crates/lib/database_queries/src/lib.rs index eb91b80f33..defc1886a9 100644 --- a/crates/lib/database_queries/src/lib.rs +++ b/crates/lib/database_queries/src/lib.rs @@ -2,17 +2,8 @@ mod builders; -pub mod api_tokens; pub mod column_types; pub mod helpers; -pub mod ip_bans; pub mod mediators; -pub mod model_categories; +pub mod queries; pub mod tokens; -pub mod tts; -pub mod twitch_event_rules; -pub mod twitch_oauth; -pub mod twitch_pubsub; -pub mod users; -pub mod voice_clone_requests; -pub mod w2l; diff --git a/crates/lib/database_queries/src/api_tokens/create_api_token.rs b/crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs similarity index 95% rename from crates/lib/database_queries/src/api_tokens/create_api_token.rs rename to crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs index faa7403a54..50ee9b4ad7 100644 --- a/crates/lib/database_queries/src/api_tokens/create_api_token.rs +++ b/crates/lib/database_queries/src/queries/api_tokens/create_api_token.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use container_common::anyhow_result::AnyhowResult; -use crate::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; +use crate::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; use crate::tokens::Tokens; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/api_tokens/delete_api_token.rs b/crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs similarity index 100% rename from crates/lib/database_queries/src/api_tokens/delete_api_token.rs rename to crates/lib/database_queries/src/queries/api_tokens/delete_api_token.rs diff --git a/crates/lib/database_queries/src/api_tokens/edit_api_token.rs b/crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs similarity index 100% rename from crates/lib/database_queries/src/api_tokens/edit_api_token.rs rename to crates/lib/database_queries/src/queries/api_tokens/edit_api_token.rs diff --git a/crates/lib/database_queries/src/api_tokens/list_available_api_tokens_for_user.rs b/crates/lib/database_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs similarity index 100% rename from crates/lib/database_queries/src/api_tokens/list_available_api_tokens_for_user.rs rename to crates/lib/database_queries/src/queries/api_tokens/list_available_api_tokens_for_user.rs diff --git a/crates/lib/database_queries/src/api_tokens/mod.rs b/crates/lib/database_queries/src/queries/api_tokens/mod.rs similarity index 100% rename from crates/lib/database_queries/src/api_tokens/mod.rs rename to crates/lib/database_queries/src/queries/api_tokens/mod.rs diff --git a/crates/lib/database_queries/src/ip_bans/list_ip_bans.rs b/crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs similarity index 100% rename from crates/lib/database_queries/src/ip_bans/list_ip_bans.rs rename to crates/lib/database_queries/src/queries/ip_bans/list_ip_bans.rs diff --git a/crates/lib/database_queries/src/ip_bans/mod.rs b/crates/lib/database_queries/src/queries/ip_bans/mod.rs similarity index 100% rename from crates/lib/database_queries/src/ip_bans/mod.rs rename to crates/lib/database_queries/src/queries/ip_bans/mod.rs diff --git a/crates/lib/database_queries/src/queries/mod.rs b/crates/lib/database_queries/src/queries/mod.rs new file mode 100644 index 0000000000..f7393c2273 --- /dev/null +++ b/crates/lib/database_queries/src/queries/mod.rs @@ -0,0 +1,8 @@ +pub mod api_tokens; +pub mod ip_bans; +pub mod model_categories; +pub mod tts; +pub mod twitch; +pub mod users; +pub mod voice_clone_requests; +pub mod w2l; diff --git a/crates/lib/database_queries/src/model_categories/get_category_by_token.rs b/crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs similarity index 100% rename from crates/lib/database_queries/src/model_categories/get_category_by_token.rs rename to crates/lib/database_queries/src/queries/model_categories/get_category_by_token.rs diff --git a/crates/lib/database_queries/src/model_categories/list_categories_query_builder.rs b/crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs similarity index 99% rename from crates/lib/database_queries/src/model_categories/list_categories_query_builder.rs rename to crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs index 34c69f8b13..9c2235d402 100644 --- a/crates/lib/database_queries/src/model_categories/list_categories_query_builder.rs +++ b/crates/lib/database_queries/src/queries/model_categories/list_categories_query_builder.rs @@ -318,7 +318,7 @@ pub struct RawInternalCategoryRecord { #[cfg(test)] mod tests { - use crate::model_categories::list_categories_query_builder::ListCategoriesQueryBuilder; + use crate::queries::model_categories::list_categories_query_builder::ListCategoriesQueryBuilder; #[test] fn predicates_default_scoping() { diff --git a/crates/lib/database_queries/src/model_categories/mod.rs b/crates/lib/database_queries/src/queries/model_categories/mod.rs similarity index 100% rename from crates/lib/database_queries/src/model_categories/mod.rs rename to crates/lib/database_queries/src/queries/model_categories/mod.rs diff --git a/crates/lib/database_queries/src/tts/mod.rs b/crates/lib/database_queries/src/queries/tts/mod.rs similarity index 100% rename from crates/lib/database_queries/src/tts/mod.rs rename to crates/lib/database_queries/src/queries/tts/mod.rs diff --git a/crates/lib/database_queries/src/tts/stats/calculate_tts_model_leaderboard.rs b/crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs similarity index 100% rename from crates/lib/database_queries/src/tts/stats/calculate_tts_model_leaderboard.rs rename to crates/lib/database_queries/src/queries/tts/stats/calculate_tts_model_leaderboard.rs diff --git a/crates/lib/database_queries/src/tts/stats/mod.rs b/crates/lib/database_queries/src/queries/tts/stats/mod.rs similarity index 100% rename from crates/lib/database_queries/src/tts/stats/mod.rs rename to crates/lib/database_queries/src/queries/tts/stats/mod.rs diff --git a/crates/lib/database_queries/src/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs b/crates/lib/database_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs rename to crates/lib/database_queries/src/queries/tts/tts_category_assignments/fetch_and_build_tts_model_category_map.rs diff --git a/crates/lib/database_queries/src/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs b/crates/lib/database_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs rename to crates/lib/database_queries/src/queries/tts/tts_category_assignments/list_assigned_tts_categories_query_builder.rs diff --git a/crates/lib/database_queries/src/tts/tts_category_assignments/mod.rs b/crates/lib/database_queries/src/queries/tts/tts_category_assignments/mod.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_category_assignments/mod.rs rename to crates/lib/database_queries/src/queries/tts/tts_category_assignments/mod.rs diff --git a/crates/lib/database_queries/src/tts/tts_inference_jobs/_keys.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/_keys.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_inference_jobs/_keys.rs rename to crates/lib/database_queries/src/queries/tts/tts_inference_jobs/_keys.rs diff --git a/crates/lib/database_queries/src/tts/tts_inference_jobs/insert_tts_inference_job.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_inference_jobs/insert_tts_inference_job.rs rename to crates/lib/database_queries/src/queries/tts/tts_inference_jobs/insert_tts_inference_job.rs diff --git a/crates/lib/database_queries/src/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs similarity index 98% rename from crates/lib/database_queries/src/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs rename to crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs index 718414db09..20a54dc768 100644 --- a/crates/lib/database_queries/src/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/list_available_tts_inference_jobs.rs @@ -4,7 +4,7 @@ use container_common::anyhow_result::AnyhowResult; use crate::column_types::job_status::JobStatus; use crate::column_types::record_visibility::RecordVisibility; use crate::helpers::boolean_converters::i8_to_bool; -use crate::tts::tts_inference_jobs::_keys::TtsInferenceJobId; +use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; use log::{warn, info}; use sqlx::MySqlPool; diff --git a/crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_done.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs similarity index 91% rename from crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_done.rs rename to crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs index 6d94cf3ff6..abbd33a670 100644 --- a/crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_done.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_done.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use container_common::anyhow_result::AnyhowResult; -use crate::tts::tts_inference_jobs::_keys::TtsInferenceJobId; +use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs similarity index 90% rename from crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs rename to crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs index 3bb8a93143..a68476b592 100644 --- a/crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_failure.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use container_common::anyhow_result::AnyhowResult; -use crate::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; +use crate::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs similarity index 96% rename from crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs rename to crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs index 98708357bd..2c8ae40f9c 100644 --- a/crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_pending_and_grab_lock.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use container_common::anyhow_result::AnyhowResult; -use crate::tts::tts_inference_jobs::_keys::TtsInferenceJobId; +use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs similarity index 90% rename from crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs rename to crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs index 58c605d9c5..0b7c65e649 100644 --- a/crates/lib/database_queries/src/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mark_tts_inference_job_permanently_dead.rs @@ -1,6 +1,6 @@ use anyhow::anyhow; use container_common::anyhow_result::AnyhowResult; -use crate::tts::tts_inference_jobs::_keys::TtsInferenceJobId; +use crate::queries::tts::tts_inference_jobs::_keys::TtsInferenceJobId; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/tts/tts_inference_jobs/mod.rs b/crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mod.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_inference_jobs/mod.rs rename to crates/lib/database_queries/src/queries/tts/tts_inference_jobs/mod.rs diff --git a/crates/lib/database_queries/src/tts/tts_models/delete_tts_model_various_scopes.rs b/crates/lib/database_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_models/delete_tts_model_various_scopes.rs rename to crates/lib/database_queries/src/queries/tts/tts_models/delete_tts_model_various_scopes.rs diff --git a/crates/lib/database_queries/src/tts/tts_models/get_tts_model.rs b/crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_models/get_tts_model.rs rename to crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model.rs diff --git a/crates/lib/database_queries/src/tts/tts_models/get_tts_model_for_inference.rs b/crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_models/get_tts_model_for_inference.rs rename to crates/lib/database_queries/src/queries/tts/tts_models/get_tts_model_for_inference.rs diff --git a/crates/lib/database_queries/src/tts/tts_models/list_tts_models.rs b/crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_models/list_tts_models.rs rename to crates/lib/database_queries/src/queries/tts/tts_models/list_tts_models.rs diff --git a/crates/lib/database_queries/src/tts/tts_models/mod.rs b/crates/lib/database_queries/src/queries/tts/tts_models/mod.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_models/mod.rs rename to crates/lib/database_queries/src/queries/tts/tts_models/mod.rs diff --git a/crates/lib/database_queries/src/tts/tts_results/delete_tts_result_various_scopes.rs b/crates/lib/database_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_results/delete_tts_result_various_scopes.rs rename to crates/lib/database_queries/src/queries/tts/tts_results/delete_tts_result_various_scopes.rs diff --git a/crates/lib/database_queries/src/tts/tts_results/insert_tts_result.rs b/crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs similarity index 97% rename from crates/lib/database_queries/src/tts/tts_results/insert_tts_result.rs rename to crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs index be881d67f3..00b75da4d1 100644 --- a/crates/lib/database_queries/src/tts/tts_results/insert_tts_result.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_results/insert_tts_result.rs @@ -1,8 +1,8 @@ use anyhow::anyhow; use container_common::anyhow_result::AnyhowResult; use crate::column_types::vocoder_type::VocoderType; +use crate::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; use crate::tokens::Tokens; -use crate::tts::tts_inference_jobs::list_available_tts_inference_jobs::AvailableTtsInferenceJob; use log::warn; use sqlx::MySqlPool; use sqlx; diff --git a/crates/lib/database_queries/src/tts/tts_results/list_tts_results_query_builder.rs b/crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs similarity index 99% rename from crates/lib/database_queries/src/tts/tts_results/list_tts_results_query_builder.rs rename to crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs index 8c40002ff0..a60b5bc44e 100644 --- a/crates/lib/database_queries/src/tts/tts_results/list_tts_results_query_builder.rs +++ b/crates/lib/database_queries/src/queries/tts/tts_results/list_tts_results_query_builder.rs @@ -326,7 +326,7 @@ pub struct RawInternalTtsRecord { #[cfg(test)] mod tests { - use crate::tts::tts_results::list_tts_results_query_builder::ListTtsResultsQueryBuilder; + use crate::queries::tts::tts_results::list_tts_results_query_builder::ListTtsResultsQueryBuilder; #[test] fn predicates_without_scoping() { diff --git a/crates/lib/database_queries/src/tts/tts_results/mod.rs b/crates/lib/database_queries/src/queries/tts/tts_results/mod.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_results/mod.rs rename to crates/lib/database_queries/src/queries/tts/tts_results/mod.rs diff --git a/crates/lib/database_queries/src/tts/tts_results/query_tts_result.rs b/crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs similarity index 100% rename from crates/lib/database_queries/src/tts/tts_results/query_tts_result.rs rename to crates/lib/database_queries/src/queries/tts/tts_results/query_tts_result.rs diff --git a/crates/lib/database_queries/src/queries/twitch/mod.rs b/crates/lib/database_queries/src/queries/twitch/mod.rs new file mode 100644 index 0000000000..445b7129e7 --- /dev/null +++ b/crates/lib/database_queries/src/queries/twitch/mod.rs @@ -0,0 +1,3 @@ +pub mod twitch_event_rules; +pub mod twitch_oauth; +pub mod twitch_pubsub; diff --git a/crates/lib/database_queries/src/twitch_event_rules/delete_twitch_event_rule.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_event_rules/delete_twitch_event_rule.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_event_rules/delete_twitch_event_rule.rs diff --git a/crates/lib/database_queries/src/twitch_event_rules/get_twitch_event_rule_for_user.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_event_rules/get_twitch_event_rule_for_user.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_event_rules/get_twitch_event_rule_for_user.rs diff --git a/crates/lib/database_queries/src/twitch_event_rules/insert_twitch_event_rule_builder.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_event_rules/insert_twitch_event_rule_builder.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_event_rules/insert_twitch_event_rule_builder.rs diff --git a/crates/lib/database_queries/src/twitch_event_rules/list_twitch_event_rules_for_user.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_event_rules/list_twitch_event_rules_for_user.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_event_rules/list_twitch_event_rules_for_user.rs diff --git a/crates/lib/database_queries/src/twitch_event_rules/mod.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/mod.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_event_rules/mod.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_event_rules/mod.rs diff --git a/crates/lib/database_queries/src/twitch_event_rules/update_twitch_event_rule_builder.rs b/crates/lib/database_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_event_rules/update_twitch_event_rule_builder.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_event_rules/update_twitch_event_rule_builder.rs diff --git a/crates/lib/database_queries/src/twitch_oauth/find.rs b/crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_oauth/find.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_oauth/find.rs diff --git a/crates/lib/database_queries/src/twitch_oauth/insert.rs b/crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_oauth/insert.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_oauth/insert.rs diff --git a/crates/lib/database_queries/src/twitch_oauth/mod.rs b/crates/lib/database_queries/src/queries/twitch/twitch_oauth/mod.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_oauth/mod.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_oauth/mod.rs diff --git a/crates/lib/database_queries/src/twitch_pubsub/insert_bits.rs b/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_pubsub/insert_bits.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_bits.rs diff --git a/crates/lib/database_queries/src/twitch_pubsub/insert_channel_points.rs b/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_pubsub/insert_channel_points.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_pubsub/insert_channel_points.rs diff --git a/crates/lib/database_queries/src/twitch_pubsub/mod.rs b/crates/lib/database_queries/src/queries/twitch/twitch_pubsub/mod.rs similarity index 100% rename from crates/lib/database_queries/src/twitch_pubsub/mod.rs rename to crates/lib/database_queries/src/queries/twitch/twitch_pubsub/mod.rs diff --git a/crates/lib/database_queries/src/users/get_user_profile_by_username.rs b/crates/lib/database_queries/src/queries/users/get_user_profile_by_username.rs similarity index 100% rename from crates/lib/database_queries/src/users/get_user_profile_by_username.rs rename to crates/lib/database_queries/src/queries/users/get_user_profile_by_username.rs diff --git a/crates/lib/database_queries/src/users/list_users_query_builder.rs b/crates/lib/database_queries/src/queries/users/list_users_query_builder.rs similarity index 100% rename from crates/lib/database_queries/src/users/list_users_query_builder.rs rename to crates/lib/database_queries/src/queries/users/list_users_query_builder.rs diff --git a/crates/lib/database_queries/src/users/mod.rs b/crates/lib/database_queries/src/queries/users/mod.rs similarity index 100% rename from crates/lib/database_queries/src/users/mod.rs rename to crates/lib/database_queries/src/queries/users/mod.rs diff --git a/crates/lib/database_queries/src/users/user_badges/list_user_badges.rs b/crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs similarity index 100% rename from crates/lib/database_queries/src/users/user_badges/list_user_badges.rs rename to crates/lib/database_queries/src/queries/users/user_badges/list_user_badges.rs diff --git a/crates/lib/database_queries/src/users/user_badges/mod.rs b/crates/lib/database_queries/src/queries/users/user_badges/mod.rs similarity index 100% rename from crates/lib/database_queries/src/users/user_badges/mod.rs rename to crates/lib/database_queries/src/queries/users/user_badges/mod.rs diff --git a/crates/lib/database_queries/src/users/user_roles/list_user_roles.rs b/crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs similarity index 100% rename from crates/lib/database_queries/src/users/user_roles/list_user_roles.rs rename to crates/lib/database_queries/src/queries/users/user_roles/list_user_roles.rs diff --git a/crates/lib/database_queries/src/users/user_roles/mod.rs b/crates/lib/database_queries/src/queries/users/user_roles/mod.rs similarity index 100% rename from crates/lib/database_queries/src/users/user_roles/mod.rs rename to crates/lib/database_queries/src/queries/users/user_roles/mod.rs diff --git a/crates/lib/database_queries/src/users/user_sessions/create_session.rs b/crates/lib/database_queries/src/queries/users/user_sessions/create_session.rs similarity index 100% rename from crates/lib/database_queries/src/users/user_sessions/create_session.rs rename to crates/lib/database_queries/src/queries/users/user_sessions/create_session.rs diff --git a/crates/lib/database_queries/src/users/user_sessions/mod.rs b/crates/lib/database_queries/src/queries/users/user_sessions/mod.rs similarity index 100% rename from crates/lib/database_queries/src/users/user_sessions/mod.rs rename to crates/lib/database_queries/src/queries/users/user_sessions/mod.rs diff --git a/crates/lib/database_queries/src/voice_clone_requests/get_voice_clone_request.rs b/crates/lib/database_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs similarity index 100% rename from crates/lib/database_queries/src/voice_clone_requests/get_voice_clone_request.rs rename to crates/lib/database_queries/src/queries/voice_clone_requests/get_voice_clone_request.rs diff --git a/crates/lib/database_queries/src/voice_clone_requests/insert_voice_clone_requests_builder.rs b/crates/lib/database_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs similarity index 100% rename from crates/lib/database_queries/src/voice_clone_requests/insert_voice_clone_requests_builder.rs rename to crates/lib/database_queries/src/queries/voice_clone_requests/insert_voice_clone_requests_builder.rs diff --git a/crates/lib/database_queries/src/voice_clone_requests/mod.rs b/crates/lib/database_queries/src/queries/voice_clone_requests/mod.rs similarity index 100% rename from crates/lib/database_queries/src/voice_clone_requests/mod.rs rename to crates/lib/database_queries/src/queries/voice_clone_requests/mod.rs diff --git a/crates/lib/database_queries/src/w2l/mod.rs b/crates/lib/database_queries/src/queries/w2l/mod.rs similarity index 100% rename from crates/lib/database_queries/src/w2l/mod.rs rename to crates/lib/database_queries/src/queries/w2l/mod.rs diff --git a/crates/lib/database_queries/src/w2l/stats/calculate_w2l_template_leaderboard.rs b/crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs similarity index 100% rename from crates/lib/database_queries/src/w2l/stats/calculate_w2l_template_leaderboard.rs rename to crates/lib/database_queries/src/queries/w2l/stats/calculate_w2l_template_leaderboard.rs diff --git a/crates/lib/database_queries/src/w2l/stats/mod.rs b/crates/lib/database_queries/src/queries/w2l/stats/mod.rs similarity index 100% rename from crates/lib/database_queries/src/w2l/stats/mod.rs rename to crates/lib/database_queries/src/queries/w2l/stats/mod.rs diff --git a/crates/lib/database_queries/src/w2l/w2l_inference_jobs/mod.rs b/crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/mod.rs similarity index 100% rename from crates/lib/database_queries/src/w2l/w2l_inference_jobs/mod.rs rename to crates/lib/database_queries/src/queries/w2l/w2l_inference_jobs/mod.rs diff --git a/crates/lib/database_queries/src/w2l/w2l_results/delete_w2l_result_various_scopes.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs similarity index 100% rename from crates/lib/database_queries/src/w2l/w2l_results/delete_w2l_result_various_scopes.rs rename to crates/lib/database_queries/src/queries/w2l/w2l_results/delete_w2l_result_various_scopes.rs diff --git a/crates/lib/database_queries/src/w2l/w2l_results/list_w2l_inference_results_query_builder.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs similarity index 99% rename from crates/lib/database_queries/src/w2l/w2l_results/list_w2l_inference_results_query_builder.rs rename to crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs index 252b213e86..6c4a6f1760 100644 --- a/crates/lib/database_queries/src/w2l/w2l_results/list_w2l_inference_results_query_builder.rs +++ b/crates/lib/database_queries/src/queries/w2l/w2l_results/list_w2l_inference_results_query_builder.rs @@ -372,7 +372,7 @@ pub struct RawInternalTtsRecord { #[cfg(test)] mod tests { - use crate::w2l::w2l_results::list_w2l_inference_results_query_builder::ListW2lResultsQueryBuilder; + use crate::queries::w2l::w2l_results::list_w2l_inference_results_query_builder::ListW2lResultsQueryBuilder; #[test] fn predicates_without_scoping() { diff --git a/crates/lib/database_queries/src/w2l/w2l_results/mod.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/mod.rs similarity index 100% rename from crates/lib/database_queries/src/w2l/w2l_results/mod.rs rename to crates/lib/database_queries/src/queries/w2l/w2l_results/mod.rs diff --git a/crates/lib/database_queries/src/w2l/w2l_results/query_w2l_result.rs b/crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs similarity index 100% rename from crates/lib/database_queries/src/w2l/w2l_results/query_w2l_result.rs rename to crates/lib/database_queries/src/queries/w2l/w2l_results/query_w2l_result.rs diff --git a/crates/lib/database_queries/src/w2l/w2l_templates/delete_w2l_template_various_scopes.rs b/crates/lib/database_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs similarity index 100% rename from crates/lib/database_queries/src/w2l/w2l_templates/delete_w2l_template_various_scopes.rs rename to crates/lib/database_queries/src/queries/w2l/w2l_templates/delete_w2l_template_various_scopes.rs diff --git a/crates/lib/database_queries/src/w2l/w2l_templates/get_w2l_template.rs b/crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs similarity index 100% rename from crates/lib/database_queries/src/w2l/w2l_templates/get_w2l_template.rs rename to crates/lib/database_queries/src/queries/w2l/w2l_templates/get_w2l_template.rs diff --git a/crates/lib/database_queries/src/w2l/w2l_templates/list_w2l_templates.rs b/crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs similarity index 100% rename from crates/lib/database_queries/src/w2l/w2l_templates/list_w2l_templates.rs rename to crates/lib/database_queries/src/queries/w2l/w2l_templates/list_w2l_templates.rs diff --git a/crates/lib/database_queries/src/w2l/w2l_templates/mod.rs b/crates/lib/database_queries/src/queries/w2l/w2l_templates/mod.rs similarity index 100% rename from crates/lib/database_queries/src/w2l/w2l_templates/mod.rs rename to crates/lib/database_queries/src/queries/w2l/w2l_templates/mod.rs diff --git a/crates/service/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs b/crates/service/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs index f3edd03409..bddc37ec98 100644 --- a/crates/service/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs +++ b/crates/service/obs_gateway/src/endpoints_ws/obs_gateway_websocket_handler.rs @@ -5,13 +5,14 @@ use actix_web::{middleware, web, App, Error, HttpRequest, HttpResponse, HttpServ use actix_web_actors::ws; use container_common::anyhow_result::AnyhowResult; use container_common::token::random_crockford_token::random_crockford_token; +use crate::endpoints_ws::obs_gateway_websocket_handler::ResponseType::TtsEvent; use crate::redis::constants::OBS_ACTIVE_TTL_SECONDS; use crate::redis::obs_active_payload::ObsActivePayload; use crate::server_state::ObsGatewayServerState; use crate::twitch::pubsub::build_pubsub_topics_for_user::build_pubsub_topics_for_user; use crate::twitch::twitch_user_id::TwitchUserId; use crate::twitch::websocket_client::TwitchWebsocketClient; -use database_queries::twitch_oauth::find::{TwitchOauthTokenFinder, TwitchOauthTokenRecord}; +use database_queries::queries::twitch::twitch_oauth::find::{TwitchOauthTokenFinder, TwitchOauthTokenRecord}; use futures_timer::Delay; use futures_util::FutureExt; use http_server_common::error::common_server_error::CommonServerError; @@ -28,10 +29,9 @@ use std::thread::sleep; use std::time::Duration; use tokio::runtime::Handle; use twitch_api2::pubsub::Topic; -use twitch_api2::pubsub; -use twitch_api2::pubsub::channel_bits::ChannelBitsEventsV2Reply::BitsEvent; use twitch_api2::pubsub::TopicData::ChannelPointsChannelV1; -use crate::endpoints_ws::obs_gateway_websocket_handler::ResponseType::TtsEvent; +use twitch_api2::pubsub::channel_bits::ChannelBitsEventsV2Reply::BitsEvent; +use twitch_api2::pubsub; // TODO: Redis calls are synchronous (but fast), but is there any way to make them async? diff --git a/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs b/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs index 80fcffa007..9160e5910c 100644 --- a/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs +++ b/crates/service/obs_gateway/src/threads/twitch_pubsub_user_subscriber_thread.rs @@ -8,12 +8,12 @@ use crate::twitch::oauth::oauth_token_refresher::OauthTokenRefresher; use crate::twitch::pubsub::build_pubsub_topics_for_user::build_pubsub_topics_for_user; use crate::twitch::twitch_user_id::TwitchUserId; use crate::twitch::websocket_client::TwitchWebsocketClient; +use database_queries::queries::tts::tts_inference_jobs::insert_tts_inference_job::TtsInferenceJobInsertBuilder; +use database_queries::queries::twitch::twitch_oauth::find::{TwitchOauthTokenRecord, TwitchOauthTokenFinder}; +use database_queries::queries::twitch::twitch_oauth::insert::TwitchOauthTokenInsertBuilder; +use database_queries::queries::twitch::twitch_pubsub::insert_bits::TwitchPubsubBitsInsertBuilder; +use database_queries::queries::twitch::twitch_pubsub::insert_channel_points::TwitchPubsubChannelPointsInsertBuilder; use database_queries::tokens::Tokens; -use database_queries::tts::tts_inference_jobs::insert_tts_inference_job::TtsInferenceJobInsertBuilder; -use database_queries::twitch_oauth::find::{TwitchOauthTokenRecord, TwitchOauthTokenFinder}; -use database_queries::twitch_oauth::insert::TwitchOauthTokenInsertBuilder; -use database_queries::twitch_pubsub::insert_bits::TwitchPubsubBitsInsertBuilder; -use database_queries::twitch_pubsub::insert_channel_points::TwitchPubsubChannelPointsInsertBuilder; use log::debug; use log::error; use log::info; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs b/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs index f5f1d82d21..c45016a671 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/create_api_token.rs @@ -22,7 +22,7 @@ use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::fmt; use std::sync::Arc; -use database_queries::api_tokens::create_api_token::create_api_token_for_user; +use database_queries::queries::api_tokens::create_api_token::create_api_token_for_user; // =============== Request =============== diff --git a/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs b/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs index 0ecb7713f4..c5a303d36f 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/delete_api_token.rs @@ -10,7 +10,7 @@ use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; +use database_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log, error}; use regex::Regex; @@ -20,7 +20,7 @@ use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::fmt; use std::sync::Arc; -use database_queries::api_tokens::delete_api_token::delete_api_token; +use database_queries::queries::api_tokens::delete_api_token::delete_api_token; // =============== Request =============== diff --git a/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs b/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs index 7454753195..213cb0a584 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs @@ -18,8 +18,8 @@ use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::fmt; use std::sync::Arc; -use database_queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; -use database_queries::api_tokens::edit_api_token::edit_api_token; +use database_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; +use database_queries::queries::api_tokens::edit_api_token::edit_api_token; use crate::http_server::web_utils::ip_address::get_request_ip; // =============== Request =============== diff --git a/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs b/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs index d7e57c0c83..b9bb38519f 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/list_api_tokens.rs @@ -13,7 +13,7 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success use crate::server_state::ServerState; use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::markdown_to_html::markdown_to_html; -use database_queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; +use database_queries::queries::api_tokens::list_available_api_tokens_for_user::list_available_api_tokens_for_user; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use lexical_sort::natural_lexical_cmp; use log::{info, warn, log}; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/categories/assign_tts_category.rs b/crates/service/storyteller_web/src/http_server/endpoints/categories/assign_tts_category.rs index 155d9031d1..015ba9fa10 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/categories/assign_tts_category.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/categories/assign_tts_category.rs @@ -13,8 +13,8 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success use crate::server_state::ServerState; use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::markdown_to_html::markdown_to_html; -use database_queries::model_categories::get_category_by_token::get_category_by_token; -use database_queries::tts::tts_models::get_tts_model::get_tts_model_by_token; +use database_queries::queries::model_categories::get_category_by_token::get_category_by_token; +use database_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/categories/get_category.rs b/crates/service/storyteller_web/src/http_server/endpoints/categories/get_category.rs index e134e89919..00fea85139 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/categories/get_category.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/categories/get_category.rs @@ -13,7 +13,7 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success use crate::server_state::ServerState; use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::markdown_to_html::markdown_to_html; -use database_queries::model_categories::get_category_by_token::get_category_by_token; +use database_queries::queries::model_categories::get_category_by_token::get_category_by_token; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/categories/list_tts_categories.rs b/crates/service/storyteller_web/src/http_server/endpoints/categories/list_tts_categories.rs index 10b969fef5..0a7c312ae2 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/categories/list_tts_categories.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/categories/list_tts_categories.rs @@ -13,7 +13,7 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success use crate::server_state::ServerState; use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::markdown_to_html::markdown_to_html; -use database_queries::model_categories::list_categories_query_builder::ListCategoriesQueryBuilder; +use database_queries::queries::model_categories::list_categories_query_builder::ListCategoriesQueryBuilder; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use lexical_sort::natural_lexical_cmp; use log::{info, warn, log}; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/categories/list_tts_model_assigned_categories.rs b/crates/service/storyteller_web/src/http_server/endpoints/categories/list_tts_model_assigned_categories.rs index c08faf969a..3daff48f93 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/categories/list_tts_model_assigned_categories.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/categories/list_tts_model_assigned_categories.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::server_state::ServerState; -use database_queries::tts::tts_category_assignments::list_assigned_tts_categories_query_builder::ListAssignedTtsCategoriesQueryBuilder; +use database_queries::queries::tts::tts_category_assignments::list_assigned_tts_categories_query_builder::ListAssignedTtsCategoriesQueryBuilder; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs b/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs index 5b31ce7826..de65564b56 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/leaderboard/get_leaderboard.rs @@ -9,10 +9,10 @@ use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::server_state::ServerState; -use database_queries::tts::stats::calculate_tts_model_leaderboard::TtsLeaderboardRecordForList; -use database_queries::tts::stats::calculate_tts_model_leaderboard::calculate_tts_model_leaderboard; -use database_queries::w2l::stats::calculate_w2l_template_leaderboard::W2lLeaderboardRecordForList; -use database_queries::w2l::stats::calculate_w2l_template_leaderboard::calculate_w2l_template_leaderboard; +use database_queries::queries::tts::stats::calculate_tts_model_leaderboard::TtsLeaderboardRecordForList; +use database_queries::queries::tts::stats::calculate_tts_model_leaderboard::calculate_tts_model_leaderboard; +use database_queries::queries::w2l::stats::calculate_w2l_template_leaderboard::W2lLeaderboardRecordForList; +use database_queries::queries::w2l::stats::calculate_w2l_template_leaderboard::calculate_w2l_template_leaderboard; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs b/crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs index 76cdd7eb76..5c19e5dee7 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs @@ -12,7 +12,7 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success use crate::server_state::ServerState; use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::markdown_to_html::markdown_to_html; -use database_queries::model_categories::get_category_by_token::get_category_by_token; +use database_queries::queries::model_categories::get_category_by_token::get_category_by_token; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs b/crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs index fb4d21fe98..e471a96184 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/list_tts_categories_for_moderation.rs @@ -13,7 +13,7 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success use crate::server_state::ServerState; use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::markdown_to_html::markdown_to_html; -use database_queries::model_categories::list_categories_query_builder::ListCategoriesQueryBuilder; +use database_queries::queries::model_categories::list_categories_query_builder::ListCategoriesQueryBuilder; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; use regex::Regex; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs b/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs index 9c433ca30e..9683d99b9b 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_bans/ban_user.rs @@ -9,7 +9,7 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::server_state::ServerState; -use database_queries::users::get_user_profile_by_username::get_user_profile_by_username; +use database_queries::queries::users::get_user_profile_by_username::get_user_profile_by_username; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs b/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs index 32964ed038..63bf3f01a7 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_roles/list_roles.rs @@ -14,7 +14,7 @@ use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; -use database_queries::users::user_roles::list_user_roles::{UserRoleForList, list_user_roles}; +use database_queries::queries::users::user_roles::list_user_roles::{UserRoleForList, list_user_roles}; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs b/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs index 0ed4710c5b..acd6c34dfa 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/moderation/user_roles/set_user_role.rs @@ -13,8 +13,8 @@ use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; -use database_queries::users::get_user_profile_by_username::get_user_profile_by_username; -use database_queries::users::user_roles::list_user_roles::list_user_roles; +use database_queries::queries::users::get_user_profile_by_username::get_user_profile_by_username; +use database_queries::queries::users::user_roles::list_user_roles::list_user_roles; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs b/crates/service/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs index 77fe21d928..07e1c22a68 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/moderation/users/list_users.rs @@ -9,7 +9,7 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::server_state::ServerState; -use database_queries::users::list_users_query_builder::{UserForList, ListUsersQueryBuilder}; +use database_queries::queries::users::list_users_query_builder::{UserForList, ListUsersQueryBuilder}; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs b/crates/service/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs index d018d6fee5..398392ad0b 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/tts/delete_tts_model.rs @@ -12,11 +12,11 @@ use crate::http_server::web_utils::response_success_helpers::simple_json_success use crate::server_state::ServerState; use crate::util::delete_role_disambiguation::DeleteRole; use crate::util::delete_role_disambiguation::delete_role_disambiguation; -use database_queries::tts::tts_models::delete_tts_model_various_scopes::delete_tts_model_as_mod; -use database_queries::tts::tts_models::delete_tts_model_various_scopes::delete_tts_model_as_user; -use database_queries::tts::tts_models::delete_tts_model_various_scopes::undelete_tts_model_as_mod; -use database_queries::tts::tts_models::delete_tts_model_various_scopes::undelete_tts_model_as_user; -use database_queries::tts::tts_models::get_tts_model::get_tts_model_by_token; +use database_queries::queries::tts::tts_models::delete_tts_model_various_scopes::delete_tts_model_as_mod; +use database_queries::queries::tts::tts_models::delete_tts_model_various_scopes::delete_tts_model_as_user; +use database_queries::queries::tts::tts_models::delete_tts_model_various_scopes::undelete_tts_model_as_mod; +use database_queries::queries::tts::tts_models::delete_tts_model_various_scopes::undelete_tts_model_as_user; +use database_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs b/crates/service/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs index 5301abb70d..2f4c5b45a0 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/tts/delete_tts_result.rs @@ -15,11 +15,11 @@ use crate::util::delete_role_disambiguation::delete_role_disambiguation; use crate::validations::model_uploads::validate_model_title; use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; -use database_queries::tts::tts_results::delete_tts_result_various_scopes::delete_tts_inference_result_as_mod; -use database_queries::tts::tts_results::delete_tts_result_various_scopes::delete_tts_inference_result_as_user; -use database_queries::tts::tts_results::delete_tts_result_various_scopes::undelete_tts_inference_result_as_mod; -use database_queries::tts::tts_results::delete_tts_result_various_scopes::undelete_tts_inference_result_as_user; -use database_queries::tts::tts_results::query_tts_result::select_tts_result_by_token; +use database_queries::queries::tts::tts_results::delete_tts_result_various_scopes::delete_tts_inference_result_as_mod; +use database_queries::queries::tts::tts_results::delete_tts_result_various_scopes::delete_tts_inference_result_as_user; +use database_queries::queries::tts::tts_results::delete_tts_result_various_scopes::undelete_tts_inference_result_as_mod; +use database_queries::queries::tts::tts_results::delete_tts_result_various_scopes::undelete_tts_inference_result_as_user; +use database_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs b/crates/service/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs index 1545a654d8..3d96899698 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/tts/edit_tts_model.rs @@ -14,7 +14,7 @@ use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::markdown_to_html::markdown_to_html; use database_queries::column_types::record_visibility::RecordVisibility; use database_queries::column_types::vocoder_type::VocoderType; -use database_queries::tts::tts_models::get_tts_model::get_tts_model_by_token; +use database_queries::queries::tts::tts_models::get_tts_model::get_tts_model_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs b/crates/service/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs index fa5081175f..15aff691b5 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/tts/edit_tts_result.rs @@ -13,7 +13,7 @@ use crate::server_state::ServerState; use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::markdown_to_html::markdown_to_html; use database_queries::column_types::record_visibility::RecordVisibility; -use database_queries::tts::tts_results::query_tts_result::select_tts_result_by_token; +use database_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs b/crates/service/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs index 5cc5c5c713..954e5e93cc 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/tts/get_tts_model.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::tts::tts_models::get_tts_model::{TtsModelRecordForResponse, get_tts_model_by_token}; +use database_queries::queries::tts::tts_models::get_tts_model::{TtsModelRecordForResponse, get_tts_model_by_token}; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs b/crates/service/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs index c87872956f..3da2574f26 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/tts/get_tts_result.rs @@ -14,8 +14,8 @@ use crate::http_server::web_utils::session_checker::SessionRecord; use crate::server_state::ServerState; use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; -use database_queries::tts::tts_results::query_tts_result::TtsResultRecordForResponse; -use database_queries::tts::tts_results::query_tts_result::select_tts_result_by_token; +use database_queries::queries::tts::tts_results::query_tts_result::TtsResultRecordForResponse; +use database_queries::queries::tts::tts_results::query_tts_result::select_tts_result_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs b/crates/service/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs index 443ec91587..f56b113799 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/tts/list_tts_models.rs @@ -9,8 +9,8 @@ use container_common::anyhow_result::AnyhowResult; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::tts::tts_category_assignments::fetch_and_build_tts_model_category_map::fetch_and_build_tts_model_category_map; -use database_queries::tts::tts_models::list_tts_models::list_tts_models; +use database_queries::queries::tts::tts_category_assignments::fetch_and_build_tts_model_category_map::fetch_and_build_tts_model_category_map; +use database_queries::queries::tts::tts_models::list_tts_models::list_tts_models; use lexical_sort::natural_lexical_cmp; use log::{info, warn, log, error}; use regex::Regex; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/twitch/oauth_end.rs b/crates/service/storyteller_web/src/http_server/endpoints/twitch/oauth_end.rs index 5b8df49835..612c75e1fc 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/twitch/oauth_end.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/twitch/oauth_end.rs @@ -1,7 +1,7 @@ use actix_http::{StatusCode, header}; use actix_web::{HttpResponse, HttpRequest, web, ResponseError}; use crate::server_state::ServerState; -use database_queries::twitch_oauth::insert::TwitchOauthTokenInsertBuilder; +use database_queries::queries::twitch::twitch_oauth::insert::TwitchOauthTokenInsertBuilder; use http_server_common::request::get_request_ip::get_request_ip; use http_server_common::response::response_error_helpers::to_simple_json_error; use log::error; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/users/create_account.rs b/crates/service/storyteller_web/src/http_server/endpoints/users/create_account.rs index f81565276b..d61fb24fd9 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/users/create_account.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/users/create_account.rs @@ -15,7 +15,7 @@ use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; use crate::validations::username_reservations::is_reserved_username; use database_queries::tokens::Tokens; -use database_queries::users::user_sessions::create_session::create_session_for_user; +use database_queries::queries::users::user_sessions::create_session::create_session_for_user; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/users/edit_profile.rs b/crates/service/storyteller_web/src/http_server/endpoints/users/edit_profile.rs index 9a6211d573..83682fdc82 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/users/edit_profile.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/users/edit_profile.rs @@ -21,7 +21,7 @@ use crate::validations::username::validate_username; use crate::validations::username_reservations::is_reserved_username; use crate::validations::website_url::validate_website_url; use database_queries::column_types::record_visibility::RecordVisibility; -use database_queries::users::get_user_profile_by_username::get_user_profile_by_username; +use database_queries::queries::users::get_user_profile_by_username::get_user_profile_by_username; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/users/get_profile.rs b/crates/service/storyteller_web/src/http_server/endpoints/users/get_profile.rs index 0f2acd33c6..b838e2ed10 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/users/get_profile.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/users/get_profile.rs @@ -12,8 +12,8 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use database_queries::column_types::record_visibility::RecordVisibility; use database_queries::helpers::boolean_converters::i8_to_bool; -use database_queries::users::user_badges::list_user_badges::UserBadgeForList; -use database_queries::users::user_badges::list_user_badges::list_user_badges; +use database_queries::queries::users::user_badges::list_user_badges::UserBadgeForList; +use database_queries::queries::users::user_badges::list_user_badges::list_user_badges; use log::{info, warn, log}; use md5::{Md5, Digest}; use regex::Regex; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_tts_inference_results.rs b/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_tts_inference_results.rs index 69ff5c10f0..8197eceaaa 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_tts_inference_results.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_tts_inference_results.rs @@ -11,7 +11,7 @@ use crate::AnyhowResult; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::tts::tts_results::list_tts_results_query_builder::{ListTtsResultsQueryBuilder, TtsInferenceRecordForList}; +use database_queries::queries::tts::tts_results::list_tts_results_query_builder::{ListTtsResultsQueryBuilder, TtsInferenceRecordForList}; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_tts_models.rs b/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_tts_models.rs index c9141c8146..ace2c6a14a 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_tts_models.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_tts_models.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::tts::tts_models::list_tts_models::{TtsModelRecordForList, list_tts_models}; +use database_queries::queries::tts::tts_models::list_tts_models::{TtsModelRecordForList, list_tts_models}; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_w2l_inference_results.rs b/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_w2l_inference_results.rs index ae48e13259..5f8f585cdd 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_w2l_inference_results.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_w2l_inference_results.rs @@ -10,8 +10,8 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::w2l::w2l_results::list_w2l_inference_results_query_builder::ListW2lResultsQueryBuilder; -use database_queries::w2l::w2l_results::list_w2l_inference_results_query_builder::W2lInferenceRecordForList; +use database_queries::queries::w2l::w2l_results::list_w2l_inference_results_query_builder::ListW2lResultsQueryBuilder; +use database_queries::queries::w2l::w2l_results::list_w2l_inference_results_query_builder::W2lInferenceRecordForList; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_w2l_templates.rs b/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_w2l_templates.rs index 399cae9737..8c6f9f1f5d 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_w2l_templates.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_w2l_templates.rs @@ -10,7 +10,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::w2l::w2l_templates::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; +use database_queries::queries::w2l::w2l_templates::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/users/login.rs b/crates/service/storyteller_web/src/http_server/endpoints/users/login.rs index 9bf940f700..c1b9745be0 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/users/login.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/users/login.rs @@ -11,7 +11,7 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::serialize_as_json_error::serialize_as_json_error; use crate::server_state::ServerState; use database_queries::helpers::boolean_converters::i8_to_bool; -use database_queries::users::user_sessions::create_session::create_session_for_user; +use database_queries::queries::users::user_sessions::create_session::create_session_for_user; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs b/crates/service/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs index 6cf259aa9c..4302111506 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_result.rs @@ -15,11 +15,11 @@ use crate::util::delete_role_disambiguation::delete_role_disambiguation; use crate::validations::model_uploads::validate_model_title; use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; -use database_queries::w2l::w2l_results::delete_w2l_result_various_scopes::delete_w2l_inference_result_as_mod; -use database_queries::w2l::w2l_results::delete_w2l_result_various_scopes::delete_w2l_inference_result_as_user; -use database_queries::w2l::w2l_results::delete_w2l_result_various_scopes::undelete_w2l_inference_result_as_mod; -use database_queries::w2l::w2l_results::delete_w2l_result_various_scopes::undelete_w2l_inference_result_as_user; -use database_queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; +use database_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::delete_w2l_inference_result_as_mod; +use database_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::delete_w2l_inference_result_as_user; +use database_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::undelete_w2l_inference_result_as_mod; +use database_queries::queries::w2l::w2l_results::delete_w2l_result_various_scopes::undelete_w2l_inference_result_as_user; +use database_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs b/crates/service/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs index 6ed18dd417..a23d27f0b0 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/w2l/delete_w2l_template.rs @@ -6,11 +6,11 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use database_queries::w2l::w2l_templates::delete_w2l_template_various_scopes::delete_w2l_template_as_mod; -use database_queries::w2l::w2l_templates::delete_w2l_template_various_scopes::delete_w2l_template_as_user; -use database_queries::w2l::w2l_templates::delete_w2l_template_various_scopes::undelete_w2l_template_as_mod; -use database_queries::w2l::w2l_templates::delete_w2l_template_various_scopes::undelete_w2l_template_as_user; -use database_queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; +use database_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::delete_w2l_template_as_mod; +use database_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::delete_w2l_template_as_user; +use database_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::undelete_w2l_template_as_mod; +use database_queries::queries::w2l::w2l_templates::delete_w2l_template_various_scopes::undelete_w2l_template_as_user; +use database_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; use crate::http_server::web_utils::ip_address::get_request_ip; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::http_server::web_utils::response_success_helpers::simple_json_success; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs b/crates/service/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs index 00b8713b5d..98c1301f5b 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_result.rs @@ -13,7 +13,7 @@ use crate::server_state::ServerState; use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::markdown_to_html::markdown_to_html; use database_queries::column_types::record_visibility::RecordVisibility; -use database_queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; +use database_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs b/crates/service/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs index 254b31979d..20a4f93214 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/w2l/edit_w2l_template.rs @@ -13,7 +13,7 @@ use crate::server_state::ServerState; use crate::util::email_to_gravatar::email_to_gravatar; use crate::util::markdown_to_html::markdown_to_html; use database_queries::column_types::record_visibility::RecordVisibility; -use database_queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; +use database_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs b/crates/service/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs index cd0bb254e4..0204780f6a 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/w2l/get_w2l_result.rs @@ -9,8 +9,8 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::w2l::w2l_results::query_w2l_result::W2lResultRecordForResponse; -use database_queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; +use database_queries::queries::w2l::w2l_results::query_w2l_result::W2lResultRecordForResponse; +use database_queries::queries::w2l::w2l_results::query_w2l_result::select_w2l_result_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs b/crates/service/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs index 41c042a24f..ba3f883c4f 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/w2l/get_w2l_template.rs @@ -12,8 +12,8 @@ use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; -use database_queries::w2l::w2l_templates::get_w2l_template::W2lTemplateRecordForResponse; -use database_queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; +use database_queries::queries::w2l::w2l_templates::get_w2l_template::W2lTemplateRecordForResponse; +use database_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs b/crates/service/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs index 2ff15bc617..4c7a0e0236 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/w2l/list_w2l_templates.rs @@ -9,7 +9,7 @@ use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use database_queries::w2l::w2l_templates::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; +use database_queries::queries::w2l::w2l_templates::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs b/crates/service/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs index 88584e63aa..b6aab394a4 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/w2l/set_w2l_template_mod_approval.rs @@ -12,7 +12,7 @@ use crate::server_state::ServerState; use crate::validations::model_uploads::validate_model_title; use crate::validations::passwords::validate_passwords; use crate::validations::username::validate_username; -use database_queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; +use database_queries::queries::w2l::w2l_templates::get_w2l_template::select_w2l_template_by_token; use log::{info, warn, log}; use regex::Regex; use sqlx::error::DatabaseError; diff --git a/crates/service/storyteller_web/src/main.rs b/crates/service/storyteller_web/src/main.rs index 53dee6cfd2..8df94e82ab 100644 --- a/crates/service/storyteller_web/src/main.rs +++ b/crates/service/storyteller_web/src/main.rs @@ -30,8 +30,8 @@ mod job_queries; // NB: Also so sqlx codegens everything. // Not sure if this is strictly necessary. mod shared_queries { - use database_queries::twitch_oauth::find; - use database_queries::twitch_oauth::insert; + use database_queries::queries::twitch::twitch_oauth::find; + use database_queries::queries::twitch::twitch_oauth::insert; } use actix_cors::Cors; diff --git a/crates/service/storyteller_web/src/threads/poll_ip_banlist_thread.rs b/crates/service/storyteller_web/src/threads/poll_ip_banlist_thread.rs index 7706e84201..babb3fe49a 100644 --- a/crates/service/storyteller_web/src/threads/poll_ip_banlist_thread.rs +++ b/crates/service/storyteller_web/src/threads/poll_ip_banlist_thread.rs @@ -1,6 +1,6 @@ use anyhow::Error; use crate::threads::ip_banlist_set::IpBanlistSet; -use database_queries::ip_bans::list_ip_bans::list_ip_bans; +use database_queries::queries::ip_bans::list_ip_bans::list_ip_bans; use log::info; use log::warn; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/tts_inference_job.rs b/crates/service/storyteller_web/src/tts_inference_job.rs index 879d1e09b0..76982a56e2 100644 --- a/crates/service/storyteller_web/src/tts_inference_job.rs +++ b/crates/service/storyteller_web/src/tts_inference_job.rs @@ -44,13 +44,13 @@ use crate::util::semi_persistent_cache_dir::SemiPersistentCacheDir; use data_encoding::{HEXUPPER, HEXLOWER, HEXLOWER_PERMISSIVE}; use database_queries::column_types::vocoder_type::VocoderType; use database_queries::mediators::firehose_publisher::FirehosePublisher; -use database_queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::{AvailableTtsInferenceJob, list_available_tts_inference_jobs}; -use database_queries::tts::tts_inference_jobs::mark_tts_inference_job_done::mark_tts_inference_job_done; -use database_queries::tts::tts_inference_jobs::mark_tts_inference_job_failure::mark_tts_inference_job_failure; -use database_queries::tts::tts_inference_jobs::mark_tts_inference_job_pending_and_grab_lock::mark_tts_inference_job_pending_and_grab_lock; -use database_queries::tts::tts_inference_jobs::mark_tts_inference_job_permanently_dead::mark_tts_inference_job_permanently_dead; -use database_queries::tts::tts_models::get_tts_model_for_inference::{get_tts_model_for_inference, TtsModelForInferenceError, TtsModelForInferenceRecord}; -use database_queries::tts::tts_results::insert_tts_result::insert_tts_result; +use database_queries::queries::tts::tts_inference_jobs::list_available_tts_inference_jobs::{AvailableTtsInferenceJob, list_available_tts_inference_jobs}; +use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_done::mark_tts_inference_job_done; +use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_failure::mark_tts_inference_job_failure; +use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_pending_and_grab_lock::mark_tts_inference_job_pending_and_grab_lock; +use database_queries::queries::tts::tts_inference_jobs::mark_tts_inference_job_permanently_dead::mark_tts_inference_job_permanently_dead; +use database_queries::queries::tts::tts_models::get_tts_model_for_inference::{get_tts_model_for_inference, TtsModelForInferenceError, TtsModelForInferenceRecord}; +use database_queries::queries::tts::tts_results::insert_tts_result::insert_tts_result; use log::{warn, info, error}; use newrelic_telemetry::Client as NewRelicClient; use newrelic_telemetry::ClientBuilder;