From 7897ef730e24c1ee069be4db56409ddac8f23ed9 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Thu, 21 Dec 2023 19:04:56 -0500 Subject: [PATCH] refactor, fix tests --- crates/cli/dev-database-seed/src/seeding/model_weights.rs | 2 +- .../dev-database-seed/src/seeding/seed_model_weights.rs | 2 +- .../queries/model_weights/{ => create}/create_weight.rs | 0 .../mysql_queries/src/queries/model_weights/create/mod.rs | 3 ++- .../mysql_queries/src/queries/model_weights/edit/mod.rs | 3 ++- .../src/queries/model_weights/{ => edit}/update_weight.rs | 0 crates/lib/mysql_queries/src/queries/model_weights/mod.rs | 2 -- .../lib/mysql_queries/src/queries/model_weights/tests.rs | 8 ++++---- .../src/http_server/endpoints/weights/update_weight.rs | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) rename crates/lib/mysql_queries/src/queries/model_weights/{ => create}/create_weight.rs (100%) rename crates/lib/mysql_queries/src/queries/model_weights/{ => edit}/update_weight.rs (100%) diff --git a/crates/cli/dev-database-seed/src/seeding/model_weights.rs b/crates/cli/dev-database-seed/src/seeding/model_weights.rs index 96233496d5..f5f16cfb81 100644 --- a/crates/cli/dev-database-seed/src/seeding/model_weights.rs +++ b/crates/cli/dev-database-seed/src/seeding/model_weights.rs @@ -9,7 +9,7 @@ use enums::by_table::model_weights::{ }; use enums::common::visibility::Visibility; use errors::{anyhow, AnyhowResult}; -use mysql_queries::queries::model_weights::create_weight::{create_weight, CreateModelWeightsArgs}; +use mysql_queries::queries::model_weights::create::create_weight::{create_weight, CreateModelWeightsArgs}; use mysql_queries::queries::users::user::get_user_token_by_username::get_user_token_by_username; use tokens::tokens::model_weights::ModelWeightToken; use tokens::tokens::users::UserToken; diff --git a/crates/cli/dev-database-seed/src/seeding/seed_model_weights.rs b/crates/cli/dev-database-seed/src/seeding/seed_model_weights.rs index 5f0bb838bb..24b0a5efa8 100644 --- a/crates/cli/dev-database-seed/src/seeding/seed_model_weights.rs +++ b/crates/cli/dev-database-seed/src/seeding/seed_model_weights.rs @@ -15,7 +15,7 @@ use filesys::file_size::file_size; use filesys::path_to_string::path_to_string; use hashing::sha256::sha256_hash_file::sha256_hash_file; use mimetypes::mimetype_for_bytes::get_mimetype_for_bytes; -use mysql_queries::queries::model_weights::create_weight::{ +use mysql_queries::queries::model_weights::create::create_weight::{ create_weight, CreateModelWeightsArgs, }; diff --git a/crates/lib/mysql_queries/src/queries/model_weights/create_weight.rs b/crates/lib/mysql_queries/src/queries/model_weights/create/create_weight.rs similarity index 100% rename from crates/lib/mysql_queries/src/queries/model_weights/create_weight.rs rename to crates/lib/mysql_queries/src/queries/model_weights/create/create_weight.rs diff --git a/crates/lib/mysql_queries/src/queries/model_weights/create/mod.rs b/crates/lib/mysql_queries/src/queries/model_weights/create/mod.rs index 2b876c4c48..5ed7f83cf7 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/create/mod.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/create/mod.rs @@ -1 +1,2 @@ -pub mod create_model_weight_from_voice_conversion_download_job; \ No newline at end of file +pub mod create_model_weight_from_voice_conversion_download_job; +pub mod create_weight; diff --git a/crates/lib/mysql_queries/src/queries/model_weights/edit/mod.rs b/crates/lib/mysql_queries/src/queries/model_weights/edit/mod.rs index d2628b7b1e..bbac2db88a 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/edit/mod.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/edit/mod.rs @@ -1 +1,2 @@ -pub mod set_model_weight_avatar; \ No newline at end of file +pub mod set_model_weight_avatar; +pub mod update_weight; diff --git a/crates/lib/mysql_queries/src/queries/model_weights/update_weight.rs b/crates/lib/mysql_queries/src/queries/model_weights/edit/update_weight.rs similarity index 100% rename from crates/lib/mysql_queries/src/queries/model_weights/update_weight.rs rename to crates/lib/mysql_queries/src/queries/model_weights/edit/update_weight.rs diff --git a/crates/lib/mysql_queries/src/queries/model_weights/mod.rs b/crates/lib/mysql_queries/src/queries/model_weights/mod.rs index 798b1df3a0..8170d5ddfd 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/mod.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/mod.rs @@ -1,5 +1,4 @@ pub mod create; -pub mod create_weight; pub mod delete_weights; pub mod edit; pub mod get_weight; @@ -8,4 +7,3 @@ pub mod list; pub mod migration; pub mod model_weight_info_lite; pub mod tests; -pub mod update_weight; \ No newline at end of file diff --git a/crates/lib/mysql_queries/src/queries/model_weights/tests.rs b/crates/lib/mysql_queries/src/queries/model_weights/tests.rs index c964160692..9b92e9440a 100644 --- a/crates/lib/mysql_queries/src/queries/model_weights/tests.rs +++ b/crates/lib/mysql_queries/src/queries/model_weights/tests.rs @@ -17,8 +17,8 @@ mod tests { use enums::common::visibility::Visibility; use tokens::tokens::{model_weights::ModelWeightToken, users::UserToken}; - use crate::queries::model_weights::create_weight::create_weight; - use crate::queries::model_weights::create_weight::CreateModelWeightsArgs; + use crate::queries::model_weights::create::create_weight::create_weight; + use crate::queries::model_weights::create::create_weight::CreateModelWeightsArgs; use crate::queries::model_weights::delete_weights::{ delete_weights_as_mod, delete_weights_as_user, @@ -298,11 +298,11 @@ mod tests { can_see_deleted, mysql_pool: &pool, }).await?; - for weight in weights_by_username.iter() { + for weight in weights_by_username.records.iter() { // print weight println!("weight: {:?}", weight.creator_username); } - assert_eq!(weights_by_username.len(), 5); + assert_eq!(weights_by_username.records.len(), 5); Ok(()) } diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update_weight.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update_weight.rs index 8f69470054..9f69aefcdc 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update_weight.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/weights/update_weight.rs @@ -11,7 +11,7 @@ use enums::common::visibility::Visibility; use http_server_common::response::response_success_helpers::simple_json_success; use http_server_common::response::serialize_as_json_error::serialize_as_json_error; use mysql_queries::queries::model_weights::get_weight::get_weight_by_token; -use mysql_queries::queries::model_weights::update_weight::{ update_weights, UpdateWeightArgs }; +use mysql_queries::queries::model_weights::edit::update_weight::{ update_weights, UpdateWeightArgs }; use tokens::tokens::model_weights::ModelWeightToken; use crate::server_state::ServerState;