move upload endpoints (as we're adding a lot more to go fast)

crates/service/web/storyteller_web/src/http_server/endpoints/engine/process_upload_media_file.rs

@@ -17,8 +17,8 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_
 use mysql_queries::queries::media_files::create::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType};
 use tokens::tokens::media_files::MediaFileToken;
 
-use crate::http_server::endpoints::media_files::upload::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource};
-use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
+use crate::http_server::endpoints::media_files::upload::upload_generic::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource};
+use crate::http_server::endpoints::media_files::upload::upload_generic::upload_error::MediaFileUploadError;
 use crate::server_state::ServerState;
 use crate::validations::validate_idempotency_token_format::validate_idempotency_token_format;
 

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/mod.rs

@@ -5,6 +5,4 @@ pub mod get_media_file;
 pub mod list;
 pub mod rename_media_file_handler;
 pub mod update_media_file;
-pub mod upload;
-pub mod upload_engine_asset;
-pub mod upload_video;
+pub mod upload;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/mod.rs

@@ -1,4 +1,3 @@
-pub mod drain_multipart_request;
-pub mod process_upload_media_file;
-pub mod upload_error;
-pub mod upload_media_file_handler;
+pub mod upload_engine_asset;
+pub mod upload_generic;
+pub mod upload_video;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_engine_asset/upload_engine_asset_media_file_handler.rs

@@ -21,9 +21,8 @@ use mysql_queries::queries::media_files::create::insert_media_file_from_file_upl
 use tokens::tokens::media_files::MediaFileToken;
 use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len};
 
-use crate::http_server::endpoints::media_files::upload::drain_multipart_request::MediaFileUploadSource;
-use crate::http_server::endpoints::media_files::upload_engine_asset::drain_multipart_request::drain_multipart_request;
-use crate::http_server::endpoints::media_files::upload_engine_asset::upload_error::EngineAssetMediaFileUploadError;
+use crate::http_server::endpoints::media_files::upload::upload_engine_asset::drain_multipart_request::drain_multipart_request;
+use crate::http_server::endpoints::media_files::upload::upload_engine_asset::upload_error::EngineAssetMediaFileUploadError;
 use crate::server_state::ServerState;
 use crate::validations::validate_idempotency_token_format::validate_idempotency_token_format;
 

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/mod.rs

@@ -0,0 +1,4 @@
+pub mod drain_multipart_request;
+pub mod process_upload_media_file;
+pub mod upload_error;
+pub mod upload_media_file_handler;

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/process_upload_media_file.rs

@@ -17,8 +17,8 @@ use mysql_queries::queries::idepotency_tokens::insert_idempotency_token::insert_
 use mysql_queries::queries::media_files::create::insert_media_file_from_file_upload::{insert_media_file_from_file_upload, InsertMediaFileFromUploadArgs, UploadType};
 use tokens::tokens::media_files::MediaFileToken;
 
-use crate::http_server::endpoints::media_files::upload::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource};
-use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
+use crate::http_server::endpoints::media_files::upload::upload_generic::drain_multipart_request::{drain_multipart_request, MediaFileUploadSource};
+use crate::http_server::endpoints::media_files::upload::upload_generic::upload_error::MediaFileUploadError;
 use crate::server_state::ServerState;
 use crate::validations::validate_idempotency_token_format::validate_idempotency_token_format;
 

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_generic/upload_media_file_handler.rs

@@ -8,8 +8,8 @@ use utoipa::ToSchema;
 
 use tokens::tokens::media_files::MediaFileToken;
 
-use crate::http_server::endpoints::media_files::upload::process_upload_media_file::process_upload_media_file;
-use crate::http_server::endpoints::media_files::upload::upload_error::MediaFileUploadError;
+use crate::http_server::endpoints::media_files::upload::upload_generic::process_upload_media_file::process_upload_media_file;
+use crate::http_server::endpoints::media_files::upload::upload_generic::upload_error::MediaFileUploadError;
 use crate::server_state::ServerState;
 
 #[derive(Serialize, ToSchema)]

crates/service/web/storyteller_web/src/http_server/endpoints/media_files/upload/upload_video/upload_video_media_file_handler.rs

@@ -21,9 +21,9 @@ use mysql_queries::queries::media_files::create::insert_media_file_from_file_upl
 use tokens::tokens::media_files::MediaFileToken;
 use videos::get_mp4_info::{get_mp4_info, get_mp4_info_for_bytes, get_mp4_info_for_bytes_and_len};
 
-use crate::http_server::endpoints::media_files::upload_video::drain_multipart_request::drain_multipart_request;
-use crate::http_server::endpoints::media_files::upload_video::drain_multipart_request::MediaFileUploadSource;
-use crate::http_server::endpoints::media_files::upload_video::upload_error::VideoMediaFileUploadError;
+use crate::http_server::endpoints::media_files::upload::upload_video::drain_multipart_request::MediaFileUploadSource;
+use crate::http_server::endpoints::media_files::upload::upload_video::drain_multipart_request::drain_multipart_request;
+use crate::http_server::endpoints::media_files::upload::upload_video::upload_error::VideoMediaFileUploadError;
 use crate::server_state::ServerState;
 use crate::validations::validate_idempotency_token_format::validate_idempotency_token_format;
 

crates/service/web/storyteller_web/src/routes/media_files_routes.rs

@@ -13,9 +13,9 @@ use crate::http_server::endpoints::media_files::list::list_media_files_by_batch_
 use crate::http_server::endpoints::media_files::list::list_media_files_for_user::list_media_files_for_user_handler;
 use crate::http_server::endpoints::media_files::rename_media_file_handler::rename_media_file_handler;
 use crate::http_server::endpoints::media_files::update_media_file::update_media_file_handler;
-use crate::http_server::endpoints::media_files::upload::upload_media_file_handler::upload_media_file_handler;
-use crate::http_server::endpoints::media_files::upload_engine_asset::upload_engine_asset_media_file_handler::upload_engine_asset_media_file_handler;
-use crate::http_server::endpoints::media_files::upload_video::upload_video_media_file_handler::upload_video_media_file_handler;
+use crate::http_server::endpoints::media_files::upload::upload_generic::upload_media_file_handler::upload_media_file_handler;
+use crate::http_server::endpoints::media_files::upload::upload_engine_asset::upload_engine_asset_media_file_handler::upload_engine_asset_media_file_handler;
+use crate::http_server::endpoints::media_files::upload::upload_video::upload_video_media_file_handler::upload_video_media_file_handler;
 
 pub fn add_media_file_routes<T, B> (app: App<T>) -> App<T>
   where
@@ -75,5 +75,13 @@ pub fn add_media_file_routes<T, B> (app: App<T>) -> App<T>
           .route(web::post().to(upload_engine_asset_media_file_handler))
           .route(web::head().to(|| HttpResponse::Ok()))
       )
+//      .service(web::resource("/write/engine_asset")
+//          .route(web::post().to(/* todo */))
+//          .route(web::head().to(|| HttpResponse::Ok()))
+//      )
+//      .service(web::resource("/write/scene_file")
+//          .route(web::post().to(/* todo */))
+//          .route(web::head().to(|| HttpResponse::Ok()))
+//      )
   )
 }