From c9b2d3ea10b52603b0e963958efa04726fc0c96e Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sat, 19 Feb 2022 02:25:11 -0500 Subject: [PATCH] continued refactor of db queries into lib --- crates/lib/database_queries/src/lib.rs | 1 + .../model_categories}/get_category_by_token.rs | 4 ++-- .../list_categories_query_builder.rs | 4 ++-- .../database_queries/src/model_categories/mod.rs | 2 ++ .../src/w2l/w2l_inference_jobs/mod.rs | 1 + .../src/w2l/w2l_templates}/list_w2l_templates.rs | 4 +++- .../database_queries/src/w2l/w2l_templates/mod.rs | 3 ++- .../src/database/queries/categories/mod.rs | 1 - .../storyteller_web/src/database/queries/mod.rs | 4 +--- .../src/database/query_builders/mod.rs | 1 - .../endpoints/api_tokens/delete_api_token.rs | 1 - .../endpoints/api_tokens/edit_api_token.rs | 1 - .../endpoints/categories/assign_tts_category.rs | 2 +- .../endpoints/categories/get_category.rs | 3 +-- .../endpoints/categories/list_tts_categories.rs | 2 +- .../endpoints/misc/detect_locale_handler.rs | 2 -- .../moderation/categories/edit_category.rs | 2 +- .../list_tts_categories_for_moderation.rs | 2 +- .../endpoints/users/list_user_w2l_templates.rs | 15 +++++++++++---- .../endpoints/w2l/list_w2l_templates.rs | 15 +++++++++++---- 20 files changed, 41 insertions(+), 29 deletions(-) rename crates/{service/storyteller_web/src/database/queries/categories => lib/database_queries/src/model_categories}/get_category_by_token.rs (97%) rename crates/{service/storyteller_web/src/database/query_builders => lib/database_queries/src/model_categories}/list_categories_query_builder.rs (98%) create mode 100644 crates/lib/database_queries/src/model_categories/mod.rs rename crates/{service/storyteller_web/src/database/queries => lib/database_queries/src/w2l/w2l_templates}/list_w2l_templates.rs (98%) delete mode 100644 crates/service/storyteller_web/src/database/queries/categories/mod.rs diff --git a/crates/lib/database_queries/src/lib.rs b/crates/lib/database_queries/src/lib.rs index 6f01cc9da8..a393f3c05b 100644 --- a/crates/lib/database_queries/src/lib.rs +++ b/crates/lib/database_queries/src/lib.rs @@ -5,6 +5,7 @@ mod builders; pub mod api_tokens; pub mod column_types; pub mod helpers; +pub mod model_categories; pub mod tokens; pub mod tts; pub mod twitch_event_rules; diff --git a/crates/service/storyteller_web/src/database/queries/categories/get_category_by_token.rs b/crates/lib/database_queries/src/model_categories/get_category_by_token.rs similarity index 97% rename from crates/service/storyteller_web/src/database/queries/categories/get_category_by_token.rs rename to crates/lib/database_queries/src/model_categories/get_category_by_token.rs index fa7aeaa9a4..5d5b71b0d0 100644 --- a/crates/service/storyteller_web/src/database/queries/categories/get_category_by_token.rs +++ b/crates/lib/database_queries/src/model_categories/get_category_by_token.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; -use crate::AnyhowResult; -use database_queries::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool}; +use container_common::anyhow_result::AnyhowResult; +use crate::helpers::boolean_converters::{nullable_i8_to_optional_bool, i8_to_bool}; use log::{info, warn, log}; use sqlx::MySqlPool; diff --git a/crates/service/storyteller_web/src/database/query_builders/list_categories_query_builder.rs b/crates/lib/database_queries/src/model_categories/list_categories_query_builder.rs similarity index 98% rename from crates/service/storyteller_web/src/database/query_builders/list_categories_query_builder.rs rename to crates/lib/database_queries/src/model_categories/list_categories_query_builder.rs index 1b52af54c1..34c69f8b13 100644 --- a/crates/service/storyteller_web/src/database/query_builders/list_categories_query_builder.rs +++ b/crates/lib/database_queries/src/model_categories/list_categories_query_builder.rs @@ -1,7 +1,7 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use container_common::anyhow_result::AnyhowResult; -use database_queries::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; +use crate::helpers::boolean_converters::{i8_to_bool, nullable_i8_to_optional_bool}; use log::{warn, info}; use sqlx::MySqlPool; @@ -318,7 +318,7 @@ pub struct RawInternalCategoryRecord { #[cfg(test)] mod tests { - use crate::database::query_builders::list_categories_query_builder::ListCategoriesQueryBuilder; + use crate::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/model_categories/mod.rs new file mode 100644 index 0000000000..f00a822919 --- /dev/null +++ b/crates/lib/database_queries/src/model_categories/mod.rs @@ -0,0 +1,2 @@ +pub mod get_category_by_token; +pub mod list_categories_query_builder; \ No newline at end of file diff --git a/crates/lib/database_queries/src/w2l/w2l_inference_jobs/mod.rs b/crates/lib/database_queries/src/w2l/w2l_inference_jobs/mod.rs index e69de29bb2..4e398c43ff 100644 --- a/crates/lib/database_queries/src/w2l/w2l_inference_jobs/mod.rs +++ b/crates/lib/database_queries/src/w2l/w2l_inference_jobs/mod.rs @@ -0,0 +1 @@ +// TODO: Move the "job queries" here and break them down into several files. \ No newline at end of file diff --git a/crates/service/storyteller_web/src/database/queries/list_w2l_templates.rs b/crates/lib/database_queries/src/w2l/w2l_templates/list_w2l_templates.rs similarity index 98% rename from crates/service/storyteller_web/src/database/queries/list_w2l_templates.rs rename to crates/lib/database_queries/src/w2l/w2l_templates/list_w2l_templates.rs index cd0dd17349..0ce308eba7 100644 --- a/crates/service/storyteller_web/src/database/queries/list_w2l_templates.rs +++ b/crates/lib/database_queries/src/w2l/w2l_templates/list_w2l_templates.rs @@ -1,9 +1,11 @@ use anyhow::anyhow; use chrono::{DateTime, Utc}; use container_common::anyhow_result::AnyhowResult; +use crate::helpers::boolean_converters::nullable_i8_to_optional_bool; use log::{warn, info}; use sqlx::MySqlPool; -use database_queries::helpers::boolean_converters::nullable_i8_to_optional_bool; + +// FIXME: This is the old style of query scoping and shouldn't be copied. #[derive(Serialize)] pub struct W2lTemplateRecordForList { diff --git a/crates/lib/database_queries/src/w2l/w2l_templates/mod.rs b/crates/lib/database_queries/src/w2l/w2l_templates/mod.rs index 53e519b560..d6ae263916 100644 --- a/crates/lib/database_queries/src/w2l/w2l_templates/mod.rs +++ b/crates/lib/database_queries/src/w2l/w2l_templates/mod.rs @@ -1,2 +1,3 @@ pub mod delete_w2l_template_various_scopes; -pub mod get_w2l_template; \ No newline at end of file +pub mod get_w2l_template; +pub mod list_w2l_templates; \ No newline at end of file diff --git a/crates/service/storyteller_web/src/database/queries/categories/mod.rs b/crates/service/storyteller_web/src/database/queries/categories/mod.rs deleted file mode 100644 index 8012259411..0000000000 --- a/crates/service/storyteller_web/src/database/queries/categories/mod.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod get_category_by_token; \ No newline at end of file diff --git a/crates/service/storyteller_web/src/database/queries/mod.rs b/crates/service/storyteller_web/src/database/queries/mod.rs index 7cf0869e6f..e7d90bdf2c 100644 --- a/crates/service/storyteller_web/src/database/queries/mod.rs +++ b/crates/service/storyteller_web/src/database/queries/mod.rs @@ -1,8 +1,6 @@ pub mod badges; -pub mod categories; pub mod create_session; pub mod get_user_profile_by_username; pub mod list_ip_bans; pub mod list_user_badges; -pub mod list_user_roles; -pub mod list_w2l_templates; \ No newline at end of file +pub mod list_user_roles; \ No newline at end of file diff --git a/crates/service/storyteller_web/src/database/query_builders/mod.rs b/crates/service/storyteller_web/src/database/query_builders/mod.rs index f3d5ea05aa..32052e5d3d 100644 --- a/crates/service/storyteller_web/src/database/query_builders/mod.rs +++ b/crates/service/storyteller_web/src/database/query_builders/mod.rs @@ -1,2 +1 @@ -pub mod list_categories_query_builder; pub mod list_users_query_builder; \ No newline at end of file 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 3010c2744c..0ecb7713f4 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 @@ -6,7 +6,6 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::database::queries::categories::get_category_by_token::get_category_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/api_tokens/edit_api_token.rs b/crates/service/storyteller_web/src/http_server/endpoints/api_tokens/edit_api_token.rs index 2aedf13e84..7454753195 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,7 +18,6 @@ use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; use std::fmt; use std::sync::Arc; -use crate::database::queries::categories::get_category_by_token::get_category_by_token; 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 crate::http_server::web_utils::ip_address::get_request_ip; 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 8a65e10444..155d9031d1 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 @@ -7,13 +7,13 @@ use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use anyhow::anyhow; -use crate::database::queries::categories::get_category_by_token::get_category_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; 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 http_server_common::response::serialize_as_json_error::serialize_as_json_error; use log::{info, warn, log}; 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 15b652e69a..e134e89919 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 @@ -7,14 +7,13 @@ use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use chrono::{DateTime, Utc}; -use crate::database::queries::categories::get_category_by_token::get_category_by_token; -use crate::database::query_builders::list_categories_query_builder::ListCategoriesQueryBuilder; 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 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 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 160171cb4c..10b969fef5 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 @@ -7,13 +7,13 @@ use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use chrono::{DateTime, Utc}; -use crate::database::query_builders::list_categories_query_builder::ListCategoriesQueryBuilder; 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 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 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/misc/detect_locale_handler.rs b/crates/service/storyteller_web/src/http_server/endpoints/misc/detect_locale_handler.rs index 49322e718f..d1aecf561b 100644 --- a/crates/service/storyteller_web/src/http_server/endpoints/misc/detect_locale_handler.rs +++ b/crates/service/storyteller_web/src/http_server/endpoints/misc/detect_locale_handler.rs @@ -7,8 +7,6 @@ use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use chrono::{DateTime, Utc}; -use crate::database::queries::categories::get_category_by_token::get_category_by_token; -use crate::database::query_builders::list_categories_query_builder::ListCategoriesQueryBuilder; 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/moderation/categories/edit_category.rs b/crates/service/storyteller_web/src/http_server/endpoints/moderation/categories/edit_category.rs index 87d61be31d..76cdd7eb76 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 @@ -6,13 +6,13 @@ use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; -use crate::database::queries::categories::get_category_by_token::get_category_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; 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 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 09cd85fad5..fb4d21fe98 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 @@ -7,13 +7,13 @@ use actix_web::http::StatusCode; use actix_web::web::{Path, Json}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest}; use chrono::{DateTime, Utc}; -use crate::database::query_builders::list_categories_query_builder::ListCategoriesQueryBuilder; 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 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 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/users/list_user_w2l_templates.rs b/crates/service/storyteller_web/src/http_server/endpoints/users/list_user_w2l_templates.rs index 071e91af1b..399cae9737 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 @@ -1,23 +1,23 @@ use actix_http::Error; use actix_http::http::header; -use actix_web::cookie::Cookie; use actix_web::HttpResponseBuilder; +use actix_web::cookie::Cookie; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::web::Path; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::database::queries::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use derive_more::{Display, Error}; +use database_queries::w2l::w2l_templates::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; +use std::fmt; use std::sync::Arc; /// For the URL PathInfo @@ -32,7 +32,7 @@ pub struct ListW2lTemplatesForUserSuccessResponse { pub templates: Vec, } -#[derive(Debug, Display)] +#[derive(Debug)] pub enum ListW2lTemplatesForUserError { ServerError, } @@ -53,6 +53,13 @@ impl ResponseError for ListW2lTemplatesForUserError { } } +// NB: Not using derive_more::Display since Clion doesn't understand it. +impl fmt::Display for ListW2lTemplatesForUserError { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "{:?}", self) + } +} + pub async fn list_user_w2l_templates_handler( http_request: HttpRequest, path: Path, 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 83b087acdf..2ff15bc617 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 @@ -1,22 +1,22 @@ use actix_http::Error; use actix_http::http::header; -use actix_web::cookie::Cookie; use actix_web::HttpResponseBuilder; +use actix_web::cookie::Cookie; use actix_web::error::ResponseError; use actix_web::http::StatusCode; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::database::queries::list_w2l_templates::{list_w2l_templates, W2lTemplateRecordForList}; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; -use derive_more::{Display, Error}; +use database_queries::w2l::w2l_templates::list_w2l_templates::{W2lTemplateRecordForList, list_w2l_templates}; use log::{info, warn, log}; use regex::Regex; use sqlx::MySqlPool; use sqlx::error::DatabaseError; use sqlx::error::Error::Database; use sqlx::mysql::MySqlDatabaseError; +use std::fmt; use std::sync::Arc; #[derive(Serialize)] @@ -25,7 +25,7 @@ pub struct ListW2lTemplatesSuccessResponse { pub templates: Vec, } -#[derive(Debug, Display)] +#[derive(Debug)] pub enum ListW2lTemplatesError { ServerError, } @@ -46,6 +46,13 @@ impl ResponseError for ListW2lTemplatesError { } } +// NB: Not using derive_more::Display since Clion doesn't understand it. +impl fmt::Display for ListW2lTemplatesError { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + write!(f, "{:?}", self) + } +} + pub async fn list_w2l_templates_handler( http_request: HttpRequest, server_state: web::Data>) -> Result