mirror of
https://github.com/storytold/artcraft.git
synced 2026-11-17 15:15:17 +00:00
continued refactor of db queries into lib
This commit is contained in:
1 parent
8854366c12
commit
c9b2d3ea10
20 files changed
+41
-29
No files matched your search
@@ -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;
|
||||
|
||||
+2
-2
@@ -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;
|
||||
|
||||
+2
-2
@@ -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() {
|
||||
@@ -0,0 +1,2 @@
|
||||
pub mod get_category_by_token;
|
||||
pub mod list_categories_query_builder;
|
||||
@@ -0,0 +1 @@
|
||||
// TODO: Move the "job queries" here and break them down into several files.
|
||||
+3
-1
@@ -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 {
|
||||
@@ -1,2 +1,3 @@
|
||||
pub mod delete_w2l_template_various_scopes;
|
||||
pub mod get_w2l_template;
|
||||
pub mod get_w2l_template;
|
||||
pub mod list_w2l_templates;
|
||||
@@ -1 +0,0 @@
|
||||
pub mod get_category_by_token;
|
||||
@@ -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;
|
||||
pub mod list_user_roles;
|
||||
@@ -1,2 +1 @@
|
||||
pub mod list_categories_query_builder;
|
||||
pub mod list_users_query_builder;
|
||||
-1
@@ -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;
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -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};
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -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};
|
||||
|
||||
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+1
-1
@@ -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;
|
||||
|
||||
+11
-4
@@ -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<W2lTemplateRecordForList>,
|
||||
}
|
||||
|
||||
#[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<GetProfilePathInfo>,
|
||||
|
||||
@@ -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<W2lTemplateRecordForList>,
|
||||
}
|
||||
|
||||
#[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<Arc<ServerState>>) -> Result<HttpResponse, ListW2lTemplatesError>
|
||||
|
||||
Reference in new issue
Block a user