diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/mod.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/mod.rs new file mode 100644 index 0000000000..22d12a3827 --- /dev/null +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/mod.rs @@ -0,0 +1 @@ +pub mod user; diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user_jobs/list_user_jobs.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs similarity index 94% rename from crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user_jobs/list_user_jobs.rs rename to crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs index 3e851d42da..ef9b8e899a 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user_jobs/list_user_jobs.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/list_user_jobs.rs @@ -7,7 +7,7 @@ use tokens::tokens::users::UserToken; use tokens::tokens::wallet_ledger_entries::WalletLedgerEntryToken; use utoipa::ToSchema; -pub const LIST_USER_JOBS_PATH: &str = "/v1/moderation/user_jobs/{user_token}/list"; +pub const LIST_USER_JOBS_PATH: &str = "/v1/moderation/jobs/user/{user_token}/list"; #[derive(Deserialize, ToSchema)] pub struct ListUserJobsPathInfo { diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user_jobs/mod.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/mod.rs similarity index 100% rename from crates/api_clients/artcraft/artcraft_api_defs/src/moderation/user_jobs/mod.rs rename to crates/api_clients/artcraft/artcraft_api_defs/src/moderation/jobs/user/mod.rs diff --git a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/mod.rs b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/mod.rs index 6b3e24c14f..909c868d7a 100644 --- a/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/mod.rs +++ b/crates/api_clients/artcraft/artcraft_api_defs/src/moderation/mod.rs @@ -1,2 +1,2 @@ +pub mod jobs; pub mod user; -pub mod user_jobs; diff --git a/crates/service/web/storyteller_web/src/docs/api_doc.rs b/crates/service/web/storyteller_web/src/docs/api_doc.rs index 5b6dafeead..1767007848 100644 --- a/crates/service/web/storyteller_web/src/docs/api_doc.rs +++ b/crates/service/web/storyteller_web/src/docs/api_doc.rs @@ -267,7 +267,7 @@ use artcraft_api_defs::media_file::list_batch_generated_media_files::*; use crate::http_server::endpoints::moderation::info::moderator_token_info_handler::*; use artcraft_api_defs::moderation::user::user_lookup::*; use artcraft_api_defs::moderation::user::user_lookup_by_stripe_customer_id::*; -use artcraft_api_defs::moderation::user_jobs::list_user_jobs::*; +use artcraft_api_defs::moderation::jobs::user::list_user_jobs::*; use crate::http_server::endpoints::webhooks::fal_webhook_handler::*; use crate::http_server::endpoints::image_studio::update_gpt_image_job_status_handler::*; use crate::http_server::endpoints::voice_conversion::enqueue_seed_vc_inference_handler::*; @@ -439,7 +439,7 @@ use crate::http_server::endpoints::media_files::list::list_batch_generated_redux crate::http_server::endpoints::moderation::info::moderator_token_info_handler::moderator_get_token_info_handler, crate::http_server::endpoints::moderation::user::moderator_user_lookup_handler::moderator_user_lookup_handler, crate::http_server::endpoints::moderation::user::moderator_user_lookup_by_stripe_customer_id_handler::moderator_user_lookup_by_stripe_customer_id_handler, - crate::http_server::endpoints::moderation::user_jobs::list_user_jobs_handler::list_user_jobs_handler, + crate::http_server::endpoints::moderation::jobs::user::list_user_jobs_handler::list_user_jobs_handler, // Credits crate::http_server::endpoints::credits::get_session_credits_handler::get_session_credits_handler, // Subscriptions diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/mod.rs index 0b81519ead..afe73693d2 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/mod.rs @@ -1,3 +1,4 @@ pub mod get_tts_inference_queue_count; pub mod get_w2l_inference_queue_count; -pub mod kill_tts_inference_jobs; \ No newline at end of file +pub mod kill_tts_inference_jobs; +pub mod user; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_jobs/list_user_jobs_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/user/list_user_jobs_handler.rs similarity index 94% rename from crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_jobs/list_user_jobs_handler.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/user/list_user_jobs_handler.rs index dfb59cfabe..bb08a793bd 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_jobs/list_user_jobs_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/user/list_user_jobs_handler.rs @@ -4,7 +4,7 @@ use actix_web::web::{Json, Path}; use actix_web::{web, HttpRequest}; use log::warn; -use artcraft_api_defs::moderation::user_jobs::list_user_jobs::{ +use artcraft_api_defs::moderation::jobs::user::list_user_jobs::{ ListUserJobsEntry, ListUserJobsPathInfo, ListUserJobsResponse, @@ -19,7 +19,7 @@ use crate::state::server_state::ServerState; #[utoipa::path( get, tag = "Moderation", - path = "/v1/moderation/user_jobs/{user_token}/list", + path = "/v1/moderation/jobs/user/{user_token}/list", responses( (status = 200, description = "Success", body = ListUserJobsResponse), (status = 401, description = "Unauthorized"), diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_jobs/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/user/mod.rs similarity index 100% rename from crates/service/web/storyteller_web/src/http_server/endpoints/moderation/user_jobs/mod.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/moderation/jobs/user/mod.rs diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/mod.rs index 433820ce67..bc228b9207 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/moderation/mod.rs @@ -4,4 +4,3 @@ pub mod jobs; pub mod user; pub mod user_bans; pub mod user_feature_flags; -pub mod user_jobs; \ No newline at end of file diff --git a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/moderation_routes.rs b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/moderation_routes.rs index 28a37d8477..d98792ac46 100644 --- a/crates/service/web/storyteller_web/src/http_server/routes/application_routes/moderation_routes.rs +++ b/crates/service/web/storyteller_web/src/http_server/routes/application_routes/moderation_routes.rs @@ -19,7 +19,7 @@ use crate::http_server::endpoints::moderation::ip_bans::add_ip_ban::add_ip_ban_h use crate::http_server::endpoints::moderation::ip_bans::delete_ip_ban::delete_ip_ban_handler; use crate::http_server::endpoints::moderation::ip_bans::get_ip_ban::get_ip_ban_handler; use crate::http_server::endpoints::moderation::ip_bans::list_ip_bans::list_ip_bans_handler; -use crate::http_server::endpoints::moderation::user_jobs::list_user_jobs_handler::list_user_jobs_handler; +use crate::http_server::endpoints::moderation::jobs::user::list_user_jobs_handler::list_user_jobs_handler; use crate::http_server::endpoints::moderation::jobs::get_tts_inference_queue_count::get_tts_inference_queue_count_handler; use crate::http_server::endpoints::moderation::jobs::get_w2l_inference_queue_count::get_w2l_inference_queue_count_handler; use crate::http_server::endpoints::moderation::jobs::kill_tts_inference_jobs::kill_tts_inference_jobs_handler; @@ -55,8 +55,8 @@ pub fn add_moderator_routes (app: App) -> App .route(web::head().to(|| HttpResponse::Ok())) ) ) - .service(web::scope("/user_jobs") - .service(web::resource("/{user_token}/list") + .service(web::scope("/jobs") + .service(web::resource("/user/{user_token}/list") .route(web::get().to(list_user_jobs_handler)) .route(web::head().to(|| HttpResponse::Ok())) )