diff --git a/src/routes/v2/mod.rs b/src/routes/v2/mod.rs index 97f8b2d54..573b588bd 100644 --- a/src/routes/v2/mod.rs +++ b/src/routes/v2/mod.rs @@ -31,7 +31,6 @@ pub fn config(cfg: &mut actix_web::web::ServiceConfig) { .configure(tags::config) .configure(teams::config) .configure(users::config) - .configure(version_creation::config) .configure(version_file::config) .configure(versions::config), ); diff --git a/src/routes/v2/projects.rs b/src/routes/v2/projects.rs index 65c541c80..740a42028 100644 --- a/src/routes/v2/projects.rs +++ b/src/routes/v2/projects.rs @@ -44,7 +44,11 @@ pub fn config(cfg: &mut web::ServiceConfig) { .service(project_follow) .service(project_unfollow) .service(project_schedule) - .service(web::scope("{project_id}").service(dependency_list)), + .service(super::teams::team_members_get_project) + .service(web::scope("{project_id}") + .service(super::versions::version_list) + .service(super::versions::version_project_get) + .service(dependency_list)), ); } diff --git a/src/routes/v2/teams.rs b/src/routes/v2/teams.rs index 0c18e5f58..c2ce692ca 100644 --- a/src/routes/v2/teams.rs +++ b/src/routes/v2/teams.rs @@ -24,8 +24,6 @@ pub fn config(cfg: &mut web::ServiceConfig) { .service(join_team) .service(remove_team_member), ); - - cfg.service(web::scope("project").service(team_members_get_project)); } #[get("{id}/members")] diff --git a/src/routes/v2/version_creation.rs b/src/routes/v2/version_creation.rs index e720b432e..9d0371406 100644 --- a/src/routes/v2/version_creation.rs +++ b/src/routes/v2/version_creation.rs @@ -26,12 +26,6 @@ use std::collections::HashMap; use std::sync::Arc; use validator::Validate; -pub fn config(cfg: &mut web::ServiceConfig) { - cfg.service(version_create); - - cfg.service(web::scope("version").service(upload_file_to_version)); -} - fn default_requested_status() -> VersionStatus { VersionStatus::Listed } diff --git a/src/routes/v2/versions.rs b/src/routes/v2/versions.rs index ef65a2522..cd58633c2 100644 --- a/src/routes/v2/versions.rs +++ b/src/routes/v2/versions.rs @@ -18,19 +18,15 @@ use validator::Validate; pub fn config(cfg: &mut web::ServiceConfig) { cfg.service(versions_get); + cfg.service(super::version_creation::version_create); cfg.service( web::scope("version") .service(version_get) .service(version_delete) .service(version_edit) - .service(version_schedule), - ); - - cfg.service( - web::scope("project/{project_id}") - .service(version_list) - .service(version_project_get), + .service(version_schedule) + .service(super::version_creation::upload_file_to_version), ); }