From ec42723cf0a397403b088c4d852d27959bcc08eb Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Sun, 5 Sep 2021 22:22:24 -0400 Subject: [PATCH] move query builders together --- src/database/queries/mod.rs | 2 -- .../list_tts_inference_results_query_builder.rs} | 2 +- .../list_w2l_inference_results_query_builder.rs} | 2 +- src/database/query_builders/mod.rs | 2 ++ .../endpoints/users/list_user_tts_inference_results.rs | 4 ++-- .../endpoints/users/list_user_w2l_inference_results.rs | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) rename src/database/{queries/list_tts_inference_results.rs => query_builders/list_tts_inference_results_query_builder.rs} (99%) rename src/database/{queries/list_w2l_inference_results.rs => query_builders/list_w2l_inference_results_query_builder.rs} (99%) diff --git a/src/database/queries/mod.rs b/src/database/queries/mod.rs index d038a21c4d..0702a3f63b 100644 --- a/src/database/queries/mod.rs +++ b/src/database/queries/mod.rs @@ -5,11 +5,9 @@ pub mod delete_tts_result; pub mod delete_w2l_result; pub mod delete_w2l_template; pub mod list_ip_bans; -pub mod list_tts_inference_results; pub mod list_tts_models; pub mod list_user_badges; pub mod list_user_roles; -pub mod list_w2l_inference_results; pub mod list_w2l_templates; pub mod query_tts_model; pub mod query_tts_result; diff --git a/src/database/queries/list_tts_inference_results.rs b/src/database/query_builders/list_tts_inference_results_query_builder.rs similarity index 99% rename from src/database/queries/list_tts_inference_results.rs rename to src/database/query_builders/list_tts_inference_results_query_builder.rs index cda1765345..6840023eef 100644 --- a/src/database/queries/list_tts_inference_results.rs +++ b/src/database/query_builders/list_tts_inference_results_query_builder.rs @@ -326,7 +326,7 @@ pub struct RawInternalTtsRecord { #[cfg(test)] mod tests { - use crate::database::queries::list_tts_inference_results::ListTtsResultsQueryBuilder; + use crate::database::query_builders::list_tts_inference_results_query_builder::ListTtsResultsQueryBuilder; #[test] fn predicates_without_scoping() { diff --git a/src/database/queries/list_w2l_inference_results.rs b/src/database/query_builders/list_w2l_inference_results_query_builder.rs similarity index 99% rename from src/database/queries/list_w2l_inference_results.rs rename to src/database/query_builders/list_w2l_inference_results_query_builder.rs index ed60b82df0..a0e5c6b8ea 100644 --- a/src/database/queries/list_w2l_inference_results.rs +++ b/src/database/query_builders/list_w2l_inference_results_query_builder.rs @@ -372,7 +372,7 @@ pub struct RawInternalTtsRecord { #[cfg(test)] mod tests { - use crate::database::queries::list_w2l_inference_results::ListW2lResultsQueryBuilder; + use crate::database::query_builders::list_w2l_inference_results_query_builder::ListW2lResultsQueryBuilder; #[test] fn predicates_without_scoping() { diff --git a/src/database/query_builders/mod.rs b/src/database/query_builders/mod.rs index 655403af0f..5ff3bb338b 100644 --- a/src/database/query_builders/mod.rs +++ b/src/database/query_builders/mod.rs @@ -1 +1,3 @@ +pub mod list_tts_inference_results_query_builder; pub mod list_users_query_builder; +pub mod list_w2l_inference_results_query_builder; diff --git a/src/http_server/endpoints/users/list_user_tts_inference_results.rs b/src/http_server/endpoints/users/list_user_tts_inference_results.rs index 9cb351e076..c632a6473f 100644 --- a/src/http_server/endpoints/users/list_user_tts_inference_results.rs +++ b/src/http_server/endpoints/users/list_user_tts_inference_results.rs @@ -9,8 +9,8 @@ use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; use crate::database::queries::create_session::create_session_for_user; -use crate::database::queries::list_tts_inference_results::ListTtsResultsQueryBuilder; -use crate::database::queries::list_tts_inference_results::TtsInferenceRecordForList; +use crate::database::query_builders::list_tts_inference_results_query_builder::ListTtsResultsQueryBuilder; +use crate::database::query_builders::list_tts_inference_results_query_builder::TtsInferenceRecordForList; 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; diff --git a/src/http_server/endpoints/users/list_user_w2l_inference_results.rs b/src/http_server/endpoints/users/list_user_w2l_inference_results.rs index 146676cd1b..52dc38c569 100644 --- a/src/http_server/endpoints/users/list_user_w2l_inference_results.rs +++ b/src/http_server/endpoints/users/list_user_w2l_inference_results.rs @@ -8,8 +8,8 @@ use actix_web::web::{Path, Query}; use actix_web::{Responder, web, HttpResponse, error, HttpRequest, HttpMessage}; use chrono::{DateTime, Utc}; use crate::AnyhowResult; -use crate::database::queries::list_w2l_inference_results::ListW2lResultsQueryBuilder; -use crate::database::queries::list_w2l_inference_results::W2lInferenceRecordForList; +use crate::database::query_builders::list_w2l_inference_results_query_builder::ListW2lResultsQueryBuilder; +use crate::database::query_builders::list_w2l_inference_results_query_builder::W2lInferenceRecordForList; use crate::http_server::web_utils::response_error_helpers::to_simple_json_error; use crate::server_state::ServerState; use derive_more::{Display, Error};