From 1583b052d68196cefd65aaf34f369eb6c8c92207 Mon Sep 17 00:00:00 2001 From: Brandon Thomas Date: Tue, 31 Mar 2026 10:09:11 -0400 Subject: [PATCH] refactor --- .../endpoints/webhooks/fal_webhook_handler.rs | 4 ++-- ...se.rs => handle_successful_fal_webhook.rs} | 22 +++++++++---------- .../endpoints/webhooks/process_success/mod.rs | 12 +++++----- ...ge_payload.rs => process_image_payload.rs} | 2 +- ...s_payload.rs => process_images_payload.rs} | 2 +- ...ayload.rs => process_model_glb_payload.rs} | 2 +- ...yload.rs => process_model_mesh_payload.rs} | 2 +- ...eo_payload.rs => process_video_payload.rs} | 2 +- 8 files changed, 24 insertions(+), 24 deletions(-) rename crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/{process_success_case.rs => handle_successful_fal_webhook.rs} (79%) rename crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/{handle_image_payload.rs => process_image_payload.rs} (99%) rename crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/{handle_images_payload.rs => process_images_payload.rs} (99%) rename crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/{handle_model_glb_payload.rs => process_model_glb_payload.rs} (99%) rename crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/{handle_model_mesh_payload.rs => process_model_mesh_payload.rs} (98%) rename crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/{handle_video_payload.rs => process_video_payload.rs} (99%) diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/fal_webhook_handler.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/fal_webhook_handler.rs index 719f358219..372a92a0a0 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/fal_webhook_handler.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/fal_webhook_handler.rs @@ -1,7 +1,7 @@ use std::fmt; use std::sync::Arc; -use crate::http_server::endpoints::webhooks::process_success::process_success_case::process_fal_webhook; +use crate::http_server::endpoints::webhooks::process_success::handle_successful_fal_webhook::handle_sucessful_fal_webhook; use crate::state::server_state::ServerState; use actix_web::error::ResponseError; use actix_web::http::StatusCode; @@ -126,7 +126,7 @@ pub async fn fal_webhook_handler( FalWebhookError::BadInput("Missing payload".to_string()) })?; - let result = process_fal_webhook(&server_state, request_id, payload).await; + let result = handle_sucessful_fal_webhook(&server_state, request_id, payload).await; if let Err(ref err) = result { error!("FAL webhook error for request_id {}: {:?}", request_id, err); diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_success_case.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_successful_fal_webhook.rs similarity index 79% rename from crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_success_case.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_successful_fal_webhook.rs index 6f53c7bf3f..173b5845ae 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_success_case.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_successful_fal_webhook.rs @@ -8,13 +8,13 @@ use serde_json::Value; use crate::http_server::endpoints::webhooks::fal_webhook_handler::FalWebhookError; use crate::state::server_state::ServerState; -use super::handle_image_payload::handle_image_payload; -use super::handle_images_payload::handle_images_payload; -use super::handle_model_glb_payload::handle_model_glb_payload; -use super::handle_model_mesh_payload::handle_model_mesh_payload; -use super::handle_video_payload::handle_video_payload; +use super::process_image_payload::process_image_payload; +use super::process_images_payload::process_images_payload; +use super::process_model_glb_payload::process_model_glb_payload; +use super::process_model_mesh_payload::process_model_mesh_payload; +use super::process_video_payload::process_video_payload; -pub async fn process_fal_webhook( +pub async fn handle_sucessful_fal_webhook( server_state: &ServerState, request_id: &str, payload: &Value, @@ -45,21 +45,21 @@ pub async fn process_fal_webhook( if let Some(payload_obj) = payload.as_object() { if payload_obj.contains_key("image") { info!("Handling image payload for request_id {} / job {:?}", request_id, job.job_token); - let token = handle_image_payload(payload_obj, &job, server_state).await?; + let token = process_image_payload(payload_obj, &job, server_state).await?; maybe_media_token = Some(token); } else if payload_obj.contains_key("images") { - (maybe_media_token, maybe_batch_token) = handle_images_payload(payload_obj, &job, server_state).await?; + (maybe_media_token, maybe_batch_token) = process_images_payload(payload_obj, &job, server_state).await?; } else if payload_obj.contains_key("video") { info!("Handling video payload for request_id {} / job {:?}", request_id, job.job_token); - let token = handle_video_payload(payload_obj, &job, server_state).await?; + let token = process_video_payload(payload_obj, &job, server_state).await?; maybe_media_token = Some(token); } else if payload_obj.contains_key("model_glb") { info!("Handling model_glb payload for request_id {} / job {:?}", request_id, job.job_token); - let token = handle_model_glb_payload(payload_obj, &job, server_state).await?; + let token = process_model_glb_payload(payload_obj, &job, server_state).await?; maybe_media_token = Some(token); } else if payload_obj.contains_key("model_mesh") { info!("Handling model_mesh payload for request_id {} / job {:?}", request_id, job.job_token); - let token = handle_model_mesh_payload(payload_obj, &job, server_state).await?; + let token = process_model_mesh_payload(payload_obj, &job, server_state).await?; maybe_media_token = Some(token); } } diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/mod.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/mod.rs index 844d5800ef..76435c767d 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/mod.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/mod.rs @@ -1,6 +1,6 @@ -pub mod process_success_case; -mod handle_image_payload; -mod handle_images_payload; -mod handle_model_glb_payload; -mod handle_model_mesh_payload; -mod handle_video_payload; +pub mod handle_successful_fal_webhook; +mod process_image_payload; +mod process_images_payload; +mod process_model_glb_payload; +mod process_model_mesh_payload; +mod process_video_payload; diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_image_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_image_payload.rs similarity index 99% rename from crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_image_payload.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_image_payload.rs index 26894b400e..08a163d02e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_image_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_image_payload.rs @@ -29,7 +29,7 @@ pub struct FalWebhookImage { pub url: Option, } -pub async fn handle_image_payload( +pub async fn process_image_payload( payload: &Map, job: &FalJobDetails, server_state: &ServerState, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_images_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_images_payload.rs similarity index 99% rename from crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_images_payload.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_images_payload.rs index e338803b6d..081e762a53 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_images_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_images_payload.rs @@ -30,7 +30,7 @@ pub struct FalWebhookImage { pub url: Option, } -pub async fn handle_images_payload( +pub async fn process_images_payload( payload: &Map, job: &FalJobDetails, server_state: &ServerState, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_model_glb_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_model_glb_payload.rs similarity index 99% rename from crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_model_glb_payload.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_model_glb_payload.rs index 48c9c13a80..755d01cb1e 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_model_glb_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_model_glb_payload.rs @@ -63,7 +63,7 @@ pub struct FalMediaPayload { pub url: Option, } -pub async fn handle_model_glb_payload( +pub async fn process_model_glb_payload( payload: &Map, job: &FalJobDetails, server_state: &ServerState, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_model_mesh_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_model_mesh_payload.rs similarity index 98% rename from crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_model_mesh_payload.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_model_mesh_payload.rs index 977e43299f..4bee953471 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_model_mesh_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_model_mesh_payload.rs @@ -25,7 +25,7 @@ pub struct FalWebhookModelMesh { pub url: Option, } -pub async fn handle_model_mesh_payload( +pub async fn process_model_mesh_payload( payload: &Map, job: &FalJobDetails, server_state: &ServerState, diff --git a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_video_payload.rs b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_video_payload.rs similarity index 99% rename from crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_video_payload.rs rename to crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_video_payload.rs index d1b9dbe71e..124f7ee20c 100644 --- a/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/handle_video_payload.rs +++ b/crates/service/web/storyteller_web/src/http_server/endpoints/webhooks/process_success/process_video_payload.rs @@ -31,7 +31,7 @@ pub struct FalWebhookVideo { pub url: Option, } -pub async fn handle_video_payload( +pub async fn process_video_payload( payload: &Map, job: &FalJobDetails, server_state: &ServerState,